Changeset 6602

Timestamp:

Nov 17, 2014, 10:45:49 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1889: Allow extensions to be installed in disabled state

Existing extensions was not properly detected, resulting in updated extensions was installed as new and the "disabled" state was reset.

Location:

trunk/src/core/net/sf/basedb/util/extensions

Files:

• Registry.java (modified) (1 diff)
• manager/processor/RegisterExtensionsProcessor.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/util/extensions/Registry.java

@@ -94 +94 @@
     };
 
-    
+  /**
+    Comparator that sort extensions according to their ids.
+    @since 3.4
+  */
+  public static final Comparator<ExtensionPoint> EXTENSIONPOINT_ID_COMPARATOR = 
+    new Comparator<ExtensionPoint>()
+    {
+      @Override
+      public int compare(ExtensionPoint o1, ExtensionPoint o2)
+      {
+        return o1.getId().compareTo(o2.getId());
+      }
+    };
+
+    
+  /**
+    Comparator that sort extensions according to their ids.
+    @since 3.4
+  */
+  public static final Comparator<Extension> EXTENSION_ID_COMPARATOR = 
+    new Comparator<Extension>()
+    {
+      @Override
+      public int compare(Extension o1, Extension o2)
+      {
+        return o1.getId().compareTo(o2.getId());
+      }
+    };
+
   private final Map<String, RegisteredExtensionPoint<?>> extensionPoints;
   private final Map<String, RegisteredExtension<?>> extensions;

trunk/src/core/net/sf/basedb/util/extensions/manager/processor/RegisterExtensionsProcessor.java

@@ -130 +130 @@
       data.extensionPoints = new ArrayList<ExtensionPoint<?>>(loader.getExtensionPoints());
       data.extensions = new ArrayList<Extension<?>>(loader.getExtensions());
+      Collections.sort(data.extensionPoints, Registry.EXTENSIONPOINT_ID_COMPARATOR);
+      Collections.sort(data.extensions, Registry.EXTENSION_ID_COMPARATOR);
       numFiles++;
       log.info("Loaded " + data.extensionPoints.size() + "/" + data.extensions.size() + 
@@ -440 +442 @@
     ExtensionPointKey key = new ExtensionPointKey(ep);
     data.writeableFile.unregisterObject(key);
-    if (!data.extensionPoints.contains(ep))
+    if (Collections.binarySearch(data.extensionPoints, ep, Registry.EXTENSIONPOINT_ID_COMPARATOR) < 0)
     {
       registry.unregisterExtensionPoint(ep.getId());
@@ -498 +500 @@
     ExtensionKey key = new ExtensionKey(ext);
     data.writeableFile.unregisterObject(key);
-    if (!data.extensions.contains(ext))
+    if (Collections.binarySearch(data.extensions, ext, Registry.EXTENSION_ID_COMPARATOR) < 0)
     {
       registry.unregisterExtension(ext.getId());