Changeset 5775

Timestamp:

Sep 30, 2011, 9:44:07 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1592: Unified installation procedure for plug-ins, extensions and more...

Do not show information about depracted plug-ins that hasn't been registered in the database.

Location:

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

Files:

• manager/processor/PluginInstallationProcessor.java (modified) (3 diffs)
• xml/PluginInfo.java (modified) (2 diffs)

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

@@ -40 +40 @@
 import net.sf.basedb.core.query.Restrictions;
 import net.sf.basedb.util.FileUtil;
+import net.sf.basedb.util.Values;
 import net.sf.basedb.util.extensions.manager.ExtensionsFile.WriteableExtensionsFile;
 import net.sf.basedb.util.extensions.manager.ExtensionsFile;
@@ -134 +135 @@
         for (PluginInfo info : plugins)
         {
+          boolean deprecated = Values.getBoolean(info.getProperty("deprecated"));
           if (dc != null)
           {
@@ -151 +153 @@
           }
           numProcessed++;
-          wFile.registerObject(new PluginInfoKey(info), info);
+          if (!deprecated || !info.isNotFound())
+          {
+            wFile.registerObject(new PluginInfoKey(info), info);
+          }
         }
       }

trunk/src/core/net/sf/basedb/util/extensions/xml/PluginInfo.java

@@ -72 +72 @@
   private int internalId;
   private boolean disabled;
+  private boolean notFound;
   
   /**
@@ -152 +153 @@
   }
   
+  /**
+    Does this plug-in exists on the server or not?
+  */
+  public boolean isNotFound()
+  {
+    return notFound;
+  }
+  
+  public void setNotFound(boolean notFound)
+  {
+    this.notFound = notFound;
+  }
 }