Changeset 24478 for main/trunk/gli

Timestamp:

2011-08-25T20:53:08+12:00 (13 years ago)

Author:

ak19

Message:

Switching back to previous commit. Now EmbeddedMetaPlug is just above the separator in the pipeline, but no longer below it, so that it can be removed and added to the plugin list again. It is like the GreenstoneXMLplugin in that the user can only remove it if in expert mode.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/PluginManager.java (modified) (6 diffs)
• util/StaticStrings.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java

@@ -71 +71 @@
 
   /** The number of plugins that are fixed 'below the line' */
-  private static int NUM_FIXED_PLUGINS = 4; 
+  private static int NUM_FIXED_PLUGINS = 3; 
     /** Constructor.
      */
@@ -119 +119 @@
         if (!plugin.isAbstract()) {
         String plugin_name = plugin.getName();
-        if (!plugin_name.equals(StaticStrings.ARCPLUG_STR) && !plugin_name.equals(StaticStrings.RECPLUG_STR) 
-            && !plugin_name.equals(StaticStrings.METADATAXMLPLUG_STR) && !plugin_name.equals(StaticStrings.EMBEDMETAPLUG_STR)) {
+        if (!plugin_name.equals(StaticStrings.ARCPLUG_STR) && !plugin_name.equals(StaticStrings.RECPLUG_STR) && !plugin_name.equals(StaticStrings.METADATAXMLPLUG_STR)) {
           available.add(plugin);
         }
@@ -194 +193 @@
      */
     private void assignPlugin(Plugin plugin) {
-      if(plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.ARCPLUG_STR) 
-     || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR) || plugin.getName().equals(StaticStrings.EMBEDMETAPLUG_STR)) {
+      if(plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR)) {
         addAfter(plugin, separator_plugin); // Adds after separator
     } else {
@@ -298 +296 @@
         return;
     }
-    if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR) 
-       || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR) || plugin.getName().equals(StaticStrings.EMBEDMETAPLUG_STR)) {
+    if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR)) {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.Fixed"), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
         return;
@@ -364 +361 @@
         Plugin plugin = (Plugin) getElementAt(index);
         String name = plugin.getName();
-        if(name.equals(StaticStrings.RECPLUG_STR) || name.equals(StaticStrings.ARCPLUG_STR) 
-           || name.equals(StaticStrings.METADATAXMLPLUG_STR) || name.equals(StaticStrings.EMBEDMETAPLUG_STR)) {
+        if(name.equals(StaticStrings.RECPLUG_STR) || name.equals(StaticStrings.ARCPLUG_STR) || name.equals(StaticStrings.METADATAXMLPLUG_STR)) {
             found_fixed = true;
             index--;
@@ -724 +720 @@
             String plugin_name = selected_plugin.getName();
             // Some buttons are only available for plugins other than ArcPlug and RecPlug
-            if(plugin_name.equals(StaticStrings.ARCPLUG_STR) || plugin_name.equals(StaticStrings.RECPLUG_STR) 
-           || plugin_name.equals(StaticStrings.METADATAXMLPLUG_STR) || plugin_name.equals(StaticStrings.EMBEDMETAPLUG_STR)) {
+            if(plugin_name.equals(StaticStrings.ARCPLUG_STR) || plugin_name.equals(StaticStrings.RECPLUG_STR) || plugin_name.equals(StaticStrings.METADATAXMLPLUG_STR)) {
               move_up_button.setEnabled(false);
               move_down_button.setEnabled(false);

main/trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -157 +157 @@
     static final public String INT_STR = "int";
     static final public String IMPORT_STR = "import";
-    static final public String[] KEEP_PLUG = { "GreenstoneXMLPlugin", "GreenstoneMETSPlugin" };
+    static final public String[] KEEP_PLUG = { "GreenstoneXMLPlugin", "GreenstoneMETSPlugin", "EmbeddedMetadataPlugin" };
     static final public String LANGUAGE_ARGUMENT = "l=";
     static final public String LANGUAGE_ATTRIBUTE = "language";