Changeset 6340

Timestamp:

Oct 31, 2013, 1:54:35 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1777: Error messages for extensions that fail to install are forgotten after installing other extensions

The old installation results are now copied over to the new ProcessResults instance. Uninstalling an extension should remove the old results, but a weak hash map is used just in case something forgotten...

Location:

branches/3.2-stable

Files:

• src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/extensions/UninstalledFileProcessor.java (modified) (1 diff)
• src/core/net/sf/basedb/util/extensions/manager/ProcessResults.java (modified) (10 diffs)
• www/admin/extensions/details.jsp (modified) (6 diffs)

branches/3.2-stable/src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java

@@ -197 +197 @@
 
     // Collect the results from this scan
-    ProcessResults results = new ProcessResults();
+    ProcessResults results = new ProcessResults(lastScanResults);
     
     // File statistics

branches/3.2-stable/src/clients/web/net/sf/basedb/clients/web/extensions/UninstalledFileProcessor.java

@@ -66 +66 @@
     ExtensionsFile xtFile = wFile.getExtensionsFile();
     results.setStatus(xtFile, "Uninstalled");
+    results.forgetOldResults(xtFile);
     wFile.setUninstalled();
     numFiles++;

branches/3.2-stable/src/core/net/sf/basedb/util/extensions/manager/ProcessResults.java

@@ -27 +27 @@
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.WeakHashMap;
 
 /**
@@ -42 +43 @@
 
   private Map<ExtensionsFile, FileResults> fileResults;
+  private Map<ExtensionsFile, FileResults> oldFileResults;
+  
   private boolean hasError;
   private int numErrorFiles;
@@ -52 +55 @@
   public ProcessResults()
   {
+    this(null);
+  }
+  
+  /**
+    Create a new process results object, keeping information about
+    previous results.
+    @since 3.2.4
+  */
+  public ProcessResults(ProcessResults oldResults)
+  {
     this.fileResults = new TreeMap<ExtensionsFile, FileResults>();
+    this.oldFileResults = new WeakHashMap<ExtensionsFile, FileResults>();
+    if (oldResults != null)
+    {
+      oldFileResults.putAll(oldResults.oldFileResults);
+    }
     this.hasError = false;
     this.numErrorFiles = 0;
@@ -127 +145 @@
   
   /**
-    Get the results for a specific extensions file.
+    Get the results for a specific extensions file. If
+    no current results exists, old results are searched.
     @param xtFile The extensions file to get the results for
     @return A {@link FileResults} object or null if the
@@ -134 +153 @@
   public FileResults getResults(ExtensionsFile xtFile)
   {
-    return fileResults.get(xtFile);
-  }
-
+    FileResults results = fileResults.get(xtFile);
+    if (results == null) results = oldFileResults.get(xtFile);
+    return results;
+  }
+
+  /**
+    Forget old processing results for the given file.
+    Should be called when an extension has been uninstalled,
+    @param xtFile The extensions file to forget
+    @since 3.2.4
+  */
+  public void forgetOldResults(ExtensionsFile xtFile)
+  {
+    oldFileResults.remove(xtFile);
+  }
+  
   /**
     Sets a short overall status message for an entire file. Example:
@@ -152 +184 @@
       m = new FileResults(xtFile);
       fileResults.put(xtFile, m);
+      oldFileResults.put(xtFile, m);
     }
     m.status = status;
@@ -186 +219 @@
       m = new FileResults(xtFile);
       fileResults.put(xtFile, m);
+      oldFileResults.put(xtFile, m);
     }
     m.messages.add(message);
@@ -205 +239 @@
     
     private final ExtensionsFile xtFile;
+    private final long time;
     List<String> messages;
     boolean hasError = false;
@@ -212 +247 @@
     {
       this.xtFile = xtFile;
+      this.time = System.currentTimeMillis();
       this.messages = new LinkedList<String>();
     }
@@ -218 +254 @@
     {
       return xtFile;
+    }
+    
+    /**
+      Get the time of the results as a millisecond value.
+      @since 3.2.4
+    */
+    public long getTime()
+    {
+      return time;
     }
     

branches/3.2-stable/www/admin/extensions/details.jsp

@@ -87 +87 @@
   final ExtensionsControl ec = ExtensionsControl.get(dc);
   final boolean writePermission = ec.hasPermission(Permission.WRITE);
+  Formatter dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
   
   Extension<?> ext = null;
@@ -443 +444 @@
       About about = file.getAbout();
       if (about == null) about = new AboutBean();
+      ProcessResults results = ec.getLastScanResults();
+      FileResults fileResults = results.getResults(file);
       %>
       <tbody>
@@ -456 +459 @@
         <th>Up to date</th>
         <td><%=file.checkModified() ? "No" : "Yes"%></td>
+      </tr>
+      <tr>
+        <th>Last installed</th>
+        <td><%=fileResults == null ? "unknown" : dateTimeFormatter.format(new Date(fileResults.getTime())) %></td>
       </tr>
       <tr class="big">
@@ -463 +470 @@
           if (file.hasError())
           {
-            ProcessResults results = ec.getLastScanResults();
-            FileResults fileResults = results.getResults(file);
-            List<String> messages = fileResults.getMessages();
+            List<String> messages = fileResults == null ? null : fileResults.getMessages();
             Throwable validationError = file.getValidationError();
             %>
@@ -477 +482 @@
               <%
             }
-            for (String msg : messages)
+            if (messages != null)
             {
-              %>
-              <li><%=HTML.niceFormat(msg)%>
-              <%
+              for (String msg : messages)
+              {
+                %>
+                <li><%=HTML.niceFormat(msg)%>
+                <%
+              }
             }
             %>
@@ -533 +541 @@
     {
       ProcessResults results = ec.getLastScanResults();
-      Formatter dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
       %>
       <tbody>