Changeset 24414 for main/trunk/gli

Show
Ignore:
Timestamp:
16.08.2011 21:17:46 (9 years ago)
Author:
ak19
Message:

To do with EmbeddedMetadataPlugin?: 1.mkcol.pl and GLI changes puts the plugin in the bottom four plugins of the plugin pipeline. 2. EmbeddedMetadataPlugin? and PDFPlugin are modified to work together again after the recent changes (introduction of overridable BasePlugin? method can_process_file_for_metadata) which were needed to get the EmbeddedMetadataPlugin? and OAIPlugin to work together.

Location:
main/trunk/gli/src/org/greenstone/gatherer
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java

    r24367 r24414  
    7171 
    7272  /** The number of plugins that are fixed 'below the line' */ 
    73   private static int NUM_FIXED_PLUGINS = 3;  
     73  private static int NUM_FIXED_PLUGINS = 4;  
    7474    /** Constructor. 
    7575     */ 
     
    194194     */ 
    195195    private void assignPlugin(Plugin plugin) { 
    196       if(plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR)) { 
     196      if(plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.ARCPLUG_STR)  
     197     || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR) || plugin.getName().equals(StaticStrings.EMBEDMETAPLUG_STR)) { 
    197198        addAfter(plugin, separator_plugin); // Adds after separator 
    198199    } else { 
     
    297298        return; 
    298299    } 
    299     if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR)) { 
     300    if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR)  
     301       || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR) || plugin.getName().equals(StaticStrings.EMBEDMETAPLUG_STR)) { 
    300302        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.Fixed"), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE); 
    301303        return; 
     
    362364        Plugin plugin = (Plugin) getElementAt(index); 
    363365        String name = plugin.getName(); 
    364         if(name.equals(StaticStrings.RECPLUG_STR) || name.equals(StaticStrings.ARCPLUG_STR) || name.equals(StaticStrings.METADATAXMLPLUG_STR)) { 
     366        if(name.equals(StaticStrings.RECPLUG_STR) || name.equals(StaticStrings.ARCPLUG_STR)  
     367           || name.equals(StaticStrings.METADATAXMLPLUG_STR) || name.equals(StaticStrings.EMBEDMETAPLUG_STR)) { 
    365368            found_fixed = true; 
    366369            index--; 
     
    721724            String plugin_name = selected_plugin.getName(); 
    722725            // Some buttons are only available for plugins other than ArcPlug and RecPlug 
    723             if(plugin_name.equals(StaticStrings.ARCPLUG_STR) || plugin_name.equals(StaticStrings.RECPLUG_STR) || plugin_name.equals(StaticStrings.METADATAXMLPLUG_STR)) { 
     726            if(plugin_name.equals(StaticStrings.ARCPLUG_STR) || plugin_name.equals(StaticStrings.RECPLUG_STR)  
     727           || plugin_name.equals(StaticStrings.METADATAXMLPLUG_STR) || plugin_name.equals(StaticStrings.EMBEDMETAPLUG_STR)) { 
    724728              move_up_button.setEnabled(false); 
    725729              move_down_button.setEnabled(false); 
  • main/trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

    r24367 r24414  
    157157    static final public String INT_STR = "int"; 
    158158    static final public String IMPORT_STR = "import"; 
    159     static final public String[] KEEP_PLUG = { "GreenstoneXMLPlugin", "GreenstoneMETSPlugin", "EmbeddedMetadataPlugin" }; 
     159    static final public String[] KEEP_PLUG = { "GreenstoneXMLPlugin", "GreenstoneMETSPlugin" }; 
    160160    static final public String LANGUAGE_ARGUMENT = "l="; 
    161161    static final public String LANGUAGE_ATTRIBUTE = "language";