Changeset 5527 for trunk


Ignore:
Timestamp:
2003-09-23T14:58:18+12:00 (21 years ago)
Author:
mdewsnip
Message:

Partway through tooltip assignment. Made lots of little changes, registered a whole lot more components, removed dead code, fixed help links (with SimpleMenuBars). Lots more of the same to come.

Location:
trunk/gli/src/org/greenstone/gatherer
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/gli/src/org/greenstone/gatherer/Dictionary.java

    r5497 r5527  
    311311        SwingUtilities.invokeLater(task);
    312312        }
    313                 // Register if necessary
     313        // Register if necessary
    314314        if(!already_registered) {
    315315        put(component, args);
    … …  
    320320    public void register(JDialog component, String[] args, boolean already_registered) {
    321321    if(component != null) {
    322                 // Determine the key
     322        // Determine the key
    323323        String key = "";
    324324        if(!already_registered) {
    … …  
    328328        key = args[args.length - 1];
    329329        }
    330                 // Update the component using the AWTEvent queue
     330        // Update the component using the AWTEvent queue
    331331        String value = get(key, args);
    332332        ChangeTask task = new JDialogChangeTask(component, key, value);
    333333        SwingUtilities.invokeLater(task);
    334                 // Register as necessary
     334        // Register as necessary
    335335        if(!already_registered) {
    336336        args = ArrayTools.add(args, key);
    … …  
    342342    public void register(JFrame component, String[] args, boolean already_registered) {
    343343    if(component != null) {
    344                 // Determine the key
     344        // Determine the key
    345345        String key = "";
    346346        if(!already_registered) {
    … …  
    350350        key = args[args.length - 1];
    351351        }
    352                 // Update the component using the AWTEvent queue
     352        // Update the component using the AWTEvent queue
    353353        String value = get(key, args);
    354354        ChangeTask task = new JFrameChangeTask(component, key, value);
    355355        SwingUtilities.invokeLater(task);
    356                 // Register as necessary
     356        // Register as necessary
    357357        if(!already_registered) {
    358358        args = ArrayTools.add(args, key);
    … …  
    364364    public void register(JLabel component, String[] args, boolean already_registered) {
    365365    if(component != null) {
    366                 // Determine the key
     366        // Determine the key
    367367        String key = "";
    368368        if(!already_registered) {
    … …  
    372372        key = args[args.length - 1];
    373373        }
    374                 // Update the component using the AWTEvent queue
     374        // Update the component using the AWTEvent queue
    375375        String value = get(key, args);
    376376        ChangeTask task = new JLabelChangeTask(component, key, value);
    377377        SwingUtilities.invokeLater(task);
    378                 // Register as necessary
     378        // Register as necessary
    379379        if(!already_registered) {
    380380        args = ArrayTools.add(args, key);
    … …  
    386386    public void register(JTabbedPane component, String[] args, boolean already_registered) {
    387387    if(component != null) {
    388                 // If not already registered then args will be null.
     388        // If not already registered then args will be null.
    389389        if(!already_registered) {
    390390        args = new String[component.getTabCount()];
    391391        }
    392                 // Iterate through the tabbed panes tabs, updating values and recording the original key of each item in args.
     392        // Iterate through the tabbed panes tabs, updating values and recording the original key of each item in args.
    393393        for(int i = 0; i < args.length; i++) {
    394         if(args[i] == null) {
     394        if (args[i] == null) {
    395395            args[i] = component.getTitleAt(i);
    396396        }
    … …  
    400400        SwingUtilities.invokeLater(task);
    401401        }
    402                 // Register if necessary
    403         if(!already_registered) {
    404         put(component, args);
    405         }
    406     }
    407     }
     402        // Register if necessary
     403        if(!already_registered) {
     404        put(component, args);
     405        }
     406    }
     407    }
     408
    408409    /** Register a text component. */
    409     public void register(JTextComponent component, String[] args, boolean already_registered) {
    410     if(component != null) {
    411                 // Determine the key
     410    public void register(JTextComponent component, String[] args, boolean already_registered)
     411    {
     412    if (component != null) {
     413        // Determine the key
    412414        String key = "";
    413         if(!already_registered) {
     415        if (!already_registered) {
    414416        key = component.getText();
    415417        }
    … …  
    417419        key = args[args.length - 1];
    418420        }
    419                 // Update the component using the AWTEvent queue
     421
     422        // Update the component using the AWTEvent queue
    420423        String value = get(key, args);
    421424        String tooltip = get(key + "_Tooltip", (String[])null);
    422425        ChangeTask task = new JTextComponentChangeTask(component, key, value, tooltip);
    423426        SwingUtilities.invokeLater(task);
    424                 // Register as necessary
    425         if(!already_registered) {
     427        // Register as necessary
     428        if (!already_registered) {
    426429        args = ArrayTools.add(args, key);
    427430        put(component, args);
    … …  
    429432    }
    430433    }
     434
    431435    /** Register a tree component. */
    432436    public void register(JTree component, String[] args, boolean already_registered) {
    433437    if(component != null) {
    434                 // Retrieve the tooltip using the components name
     438        // Retrieve the tooltip using the components name
    435439        String key = component.getName();
    436440        String tooltip = get(key + "_Tooltip", (String[])null);
    437441        ChangeTask task = new JTreeChangeTask(component, key, tooltip);
    438442        SwingUtilities.invokeLater(task);
    439                 // A tree can never be previously registered. In otherwords the keys are harvested each time. Thus for a tree to remain consistant its up to the implementer to implement DictionaryTreeNode for the tree nodes!
     443        // A tree can never be previously registered. In otherwords the keys are harvested each time. Thus for a tree to remain consistant its up to the implementer to implement DictionaryTreeNode for the tree nodes!
    440444        ArrayList nodes = new ArrayList();
    441445        nodes.add(component.getModel().getRoot());
    … …  
    456460    public void register(TitledBorder component, String[] args, boolean already_registered) {
    457461    if(component != null) {
    458                 // Determine the key
     462        // Determine the key
    459463        String key = "";
    460464        if(!already_registered) {
    … …  
    464468        key = args[args.length - 1];
    465469        }
    466                 // Update the component using the AWTEvent queue
     470        // Update the component using the AWTEvent queue
    467471        String value = get(key, args);
    468472        ChangeTask task = new TitledBorderChangeTask(component, key, value);
    469473        SwingUtilities.invokeLater(task);
    470                 // Register as necessary
     474        // Register as necessary
    471475        if(!already_registered) {
    472476        args = ArrayTools.add(args, key);

  • trunk/gli/src/org/greenstone/gatherer/Message.java

    r4675 r5527  
    114114        break;
    115115    case BROWSER:
    116         source_str = gatherer.dictionary.get("Source.Browser");
     116        source_str = gatherer.dictionary.get("GUI.Hunt");
    117117        break;
    118118    case MIRRORING:
    119         source_str = gatherer.dictionary.get("Source.Mirroring");
     119        source_str = gatherer.dictionary.get("GUI.Mirror");
    120120        break;
    121121    case COLLECT:
    122         source_str = gatherer.dictionary.get("Source.Collect");
     122        source_str = gatherer.dictionary.get("GUI.Gather");
    123123        break;
    124124    case METAEDIT:
    125         source_str = gatherer.dictionary.get("Source.MetaEdit");
     125        source_str = gatherer.dictionary.get("GUI.Enrich");
    126126        break;
    127127    case BUILDING:

  • trunk/gli/src/org/greenstone/gatherer/cdm/ArgumentConfiguration.java

    r5342 r5527  
    8989    setSize(SIZE);
    9090    setTitle(get("CDM.ArgumentConfiguration.Title"));
    91     setJMenuBar(new SimpleMenuBar("7.0")); // can we tell whether we are doing a classifier or plugin, to make the help more specific??
     91    setJMenuBar(new SimpleMenuBar("designingacollection")); // can we tell whether we are doing a classifier or plugin, to make the help more specific??   
    9292    JPanel button_pane = new JPanel();
    9393    cancel = new JButton(get("General.Cancel"));

  • trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

    r5373 r5527  
    5151import org.greenstone.gatherer.file.FileSystemModel;
    5252import org.greenstone.gatherer.gui.LockFileDialog;
    53 import org.greenstone.gatherer.gui.MetaEditPane;
    5453import org.greenstone.gatherer.gui.NewCollectionMetadataPrompt;
    5554import org.greenstone.gatherer.msm.ElementWrapper;

  • trunk/gli/src/org/greenstone/gatherer/gui/EditorDialog.java

    r4675 r5527  
    8282    setSize(SIZE);
    8383    setTitle(Gatherer.dictionary.get("General.Edit"));
    84     setJMenuBar(new SimpleMenuBar("6.1"));
     84    setJMenuBar(new SimpleMenuBar("theenrichview"));
    8585    // Create
    8686    cancel = new JButton(Gatherer.dictionary.get("General.Cancel"));

  • trunk/gli/src/org/greenstone/gatherer/gui/FileAssociationDialog.java

    r5347 r5527  
    9696    setSize(SIZE);
    9797    setTitle(get("FileAssociationDialog.Title"));
    98     setJMenuBar(new SimpleMenuBar("0"));// need to find an appropriate help page
     98    setJMenuBar(new SimpleMenuBar("fileassociations"));
    9999    JPanel content_pane = (JPanel) getContentPane();
    100100    content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));

  • trunk/gli/src/org/greenstone/gatherer/gui/Filter.java

    r5355 r5527  
    5454    /** The other filters in this run of filters, used to ensure they all show the same thing. */
    5555    private ArrayList others = null;
    56     /** Is this the filter filter of this run of filters created (later filters will share the same information). */
     56    /** Is this the first filter of this run of filters created (later filters will share the same information). */
    5757    private boolean first = true;
    5858    /** Prevent any changes we make in the class from causing events which we then process causing events... */
    … …  
    6060    /** A reference to ourselves so inner classes can refer to us. */
    6161    private Filter this_filter = null;
    62     /** The check box to enabled/diable filter. */
     62    /** The check box to enable/disable filter. */
    6363    private JCheckBox checkbox = null;
    6464    /** The editable combobox where you either choose a predefined filter, or type a new pseudo-regular expression. */
    … …  
    7474    /** Constructor.
    7575     * @param tree A reference to the <strong>JTree</strong> being affected.
    76       */
     76     */
    7777    public Filter(DragTree tree) {
    7878    this(tree, null);
    7979    }
    8080    /** Constructor.
    81       * @param tree A reference to the <strong>JTree</strong> being affected.
    82       * @param others An <strong>ArrayList</strong> of the other Filters already in this run.
    83       */
     81     * @param tree A reference to the <strong>JTree</strong> being affected.
     82     * @param others An <strong>ArrayList</strong> of the other Filters already in this run.
     83     */
    8484    public Filter(DragTree tree, ArrayList others) {
    8585    super();
    … …  
    119119    }
    120120    /** Retrieve the combobox associated with this filter.
    121       * @return A <strong>GComboBox</strong>.
    122       */
     121     * @return A <strong>GComboBox</strong>.
     122     */
    123123    public GComboBox getComboBox() {
    124124    return combobox;
    … …  
    126126
    127127    /** Change the background color of the filter.
    128       * @param color The new background <strong>Color</strong>.
    129       */
     128     * @param color The new background <strong>Color</strong>.
     129     */
    130130    public void setBackground(Color color) {
    131131    super.setBackground(color);
    … …  
    133133
    134134    /** Used to restore the filter state to enabled, the normal state during collection editing.
    135       * @param state The new state for the filter. <i>true</i> for enabled, <i>false</i> otherwise.
    136       */
     135     * @param state The new state for the filter. <i>true</i> for enabled, <i>false</i> otherwise.
     136     */
    137137    public void setEnabled(boolean state) {
    138138    ignore = true;
    … …  
    142142    }
    143143    /** Set the combobox model for this filter.
    144       * @param model The new <strong>ComboBoxModel</strong> to use.
    145       */
     144     * @param model The new <strong>ComboBoxModel</strong> to use.
     145     */
    146146    public void setComboBoxModel(ComboBoxModel model) {
    147147    combobox.setModel(model);
    148148    }
    149149    /** Ensure that a certain entry is selected from the combobox.
    150       * @param selection The <strong>Entry</strong> that should be selected.
    151       */
     150     * @param selection The <strong>Entry</strong> that should be selected.
     151     */
    152152    public void setComboBoxSelection(Entry selection) {
    153153    ignore = true;
    … …  
    156156    }
    157157    /** Set to signify that this filter is the first in a new run of filters.
    158       * @param first <i>true</i> if this is the first filter in a run, <i>false</i> if it will just be added to the current run.
    159       */
     158     * @param first <i>true</i> if this is the first filter in a run, <i>false</i> if it will just be added to the current run.
     159     */
    160160    public void setFirst(boolean first) {
    161161    this.first = first;
    162162    }
    163163    /** Spawn produces a copy of this filter, which has new controls, but shares listeners wih this filter, and vice versa. Thus we can have two synchronized, but differing sets of controls.
    164       * @param tree_spawn The <strong>JTree</strong> this filter will affect.
    165       * @return A new <strong>Filter</strong> which is in the same run as this filter.
    166       */
     164     * @param tree_spawn The <strong>JTree</strong> this filter will affect.
     165     * @return A new <strong>Filter</strong> which is in the same run as this filter.
     166     */
    167167    public Filter spawn(DragTree tree_spawn) {
    168168    Filter filter = new Filter(tree_spawn, others);
    … …  
    173173    }
    174174    /** Retrieve a phrase from the dictionary.
    175       * @param key The unique identification <strong>String</strong> of a phrase from the dictionary.
    176       */
     175     * @param key The unique identification <strong>String</strong> of a phrase from the dictionary.
     176     */
    177177    private String get(String key) {
    178178    return get(key, null);
    179179    }
    180180    /** Retrieve a phrase from the dictionary, augmenting with the given text fragments
    181       * @param key The unique identification <strong>String</strong> of a phrase from the dictionary.
    182       * @param args A <strong>String[]</strong> of arguments to be used to fill out parameter fields in the phrase returned.
    183       * @see org.greenstone.gatherer.Dictionary
    184       * @see org.greenstone.gatherer.Gatherer
    185       */
     181     * @param key The unique identification <strong>String</strong> of a phrase from the dictionary.
     182     * @param args A <strong>String[]</strong> of arguments to be used to fill out parameter fields in the phrase returned.
     183     * @see org.greenstone.gatherer.Dictionary
     184     * @see org.greenstone.gatherer.Gatherer
     185     */
    186186    private String get(String key, String args[]) {
    187187    if(key.indexOf(".") == -1) {
    … …  
    191191    }
    192192    /** Encode an expression in pseudo-regular expression into regular expression.
    193       * @param raw The pseudo-regular expression <strong>String</strong> which includes several characters which differ in meaning from regular expression queries.
    194       * @return A proper regular expression as a <strong>String</strong>.
    195       */
     193     * @param raw The pseudo-regular expression <strong>String</strong> which includes several characters which differ in meaning from regular expression queries.
     194     * @return A proper regular expression as a <strong>String</strong>.
     195     */
    196196    private String encode(String raw) {
    197197    StringBuffer working = new StringBuffer();
    … …  
    234234    private class ComboBoxListener
    235235    implements ActionListener {
    236 /** Called when a new item is selected from the filter combobox, we treat the new entry as a pseudo-regular expression, compile it and then apply it to the tree.
     236    /** Called when a new item is selected from the filter combobox, we treat the new entry as a pseudo-regular expression, compile it and then apply it to the tree.
    237237     * @param event An <strong>ActionEvent</strong> containing more information about the change performed.
    238238     * @see org.greenstone.gatherer.gui.Filter.Entry
    … …  
    297297    }
    298298    /** Constructor.
    299             * @param name The name of this entry as a <strong>String</strong>.
    300             * @param pattern The compiled regular expression as a <strong>Pattern</strong>.
    301             */
     299     * @param name The name of this entry as a <strong>String</strong>.
     300     * @param pattern The compiled regular expression as a <strong>Pattern</strong>.
     301     */
    302302    public Entry(String name, Pattern pattern) {
    303303        this.name = name;
    … …  
    305305    }
    306306    /** Compare two Entrys for ordering.
    307             * @param object The other Entry to compare to, as an <strong>Object</strong>.
    308             * @return An <i>int</i> indicating the respective ordering, as defined in java.lang.String#compareTo
    309             */
     307     * @param object The other Entry to compare to, as an <strong>Object</strong>.
     308     * @return An <i>int</i> indicating the respective ordering, as defined in java.lang.String#compareTo
     309     */
    310310    public int compareTo(Object object) {
    311311        return toString().compareTo(object.toString());
    312312    }
    313313    /** Retrieve the pattern associated with this entry.
    314             * @return The <strong>Pattern</strong>.
    315             */
     314     * @return The <strong>Pattern</strong>.
     315     */
    316316    public Pattern getPattern() {
    317317        return pattern;
    318318    }
    319319    /** Translate this entry into a textual representation.
    320             * @return A <strong>String</strong> containing the representation.
    321             */
     320     * @return A <strong>String</strong> containing the representation.
     321     */
    322322    public String toString() {
    323323        String result = null;

  • trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

    r5522 r5527  
    105105    /** The metaedit pane is used to assign, edit and remove metadata from files within the collection. */
    106106    public MetaEditPane metaedit_pane = null;
    107     /** The mirror pane contains controls for mirroring interent sites. */
     107    /** The mirror pane contains controls for mirroring internet sites. */
    108108    public MirrorPane mirror_pane = null;
    109109    /** The preview pane contains a preview of your build collection. */
    … …  
    413413        browser_pane = new BrowsingPane();
    414414        if(Gatherer.config.get("workflow.browse", true)) {
    415         tab_pane.addTab(get("Browser"), Utility.getImage("browsing.gif"), browser_pane);
     415        tab_pane.addTab("GUI.Hunt", Utility.getImage("browsing.gif"), browser_pane);
    416416        tab_pane.setEnabledAt(tab_pane.indexOfComponent(browser_pane), Gatherer.config.get("workflow.browse", false));
    417417        }
    … …  
    419419        mirror_pane = new MirrorPane();
    420420        if(Gatherer.config.get("workflow.mirror", true)) {
    421         tab_pane.addTab(get("Mirroring"), Utility.getImage("mirroring.gif"), mirror_pane);
     421        tab_pane.addTab("GUI.Mirror", Utility.getImage("mirroring.gif"), mirror_pane);
    422422        tab_pane.setEnabledAt(tab_pane.indexOfComponent(mirror_pane), Gatherer.config.get("workflow.mirror", false));
    423423        }
    … …  
    426426        collection_pane.display();
    427427        if(Gatherer.config.get("workflow.gather", true)) {
    428         tab_pane.addTab(get("Collection"), Utility.getImage("collection.gif"), collection_pane);
     428        tab_pane.addTab("GUI.Gather", Utility.getImage("collection.gif"), collection_pane);
    429429        tab_pane.setEnabledAt(tab_pane.indexOfComponent(collection_pane), Gatherer.config.get("workflow.gather", false));
    430430        }
    … …  
    433433        metaedit_pane.display();
    434434        if(Gatherer.config.get("workflow.enrich", true)) {
    435         tab_pane.addTab(get("MetaEdit"), Utility.getImage("metaedit.gif"), metaedit_pane);
     435        tab_pane.addTab("GUI.Enrich", Utility.getImage("metaedit.gif"), metaedit_pane);
    436436        tab_pane.setEnabledAt(tab_pane.indexOfComponent(metaedit_pane), false);
    437437        }
    … …  
    440440        config_pane.display();
    441441        if(Gatherer.config.get("workflow.design", true)) {
    442         tab_pane.addTab(get("Build"), Utility.getImage("build.gif"), config_pane);
     442        tab_pane.addTab("GUI.Design", Utility.getImage("build.gif"), config_pane);
    443443        tab_pane.setEnabledAt(tab_pane.indexOfComponent(config_pane), false);
    444444        }
    445445
    446446        if(Gatherer.config.get("workflow.export", true)) {
    447         tab_pane.addTab(get("Export"), Utility.getImage("export.gif"), export_pane);
     447        tab_pane.addTab("GUI.Export", Utility.getImage("export.gif"), export_pane);
    448448        tab_pane.setEnabledAt(tab_pane.indexOfComponent(export_pane), false);
    449449        }
    … …  
    452452        create_pane.display();
    453453        if(Gatherer.config.get("workflow.create", true)) {
    454         tab_pane.addTab(get("Create"), Utility.getImage("build session.gif"), create_pane);
     454        tab_pane.addTab("GUI.Create", Utility.getImage("build session.gif"), create_pane);
    455455        tab_pane.setEnabledAt(tab_pane.indexOfComponent(create_pane), false);
    456456        }
    … …  
    459459        preview_pane.display();
    460460        if(Gatherer.config.get("workflow.preview", true)) {
    461         tab_pane.addTab(get("Preview"), Utility.getImage("final.gif"), preview_pane);
     461        tab_pane.addTab("GUI.Preview", Utility.getImage("final.gif"), preview_pane);
    462462        tab_pane.setEnabledAt(tab_pane.indexOfComponent(preview_pane), false);
    463463        }
    … …  
    472472        }
    473473
     474        Gatherer.dictionary.register(tab_pane, null, false);
    474475        content_pane.add(tab_pane, BorderLayout.CENTER);
    475476        // Drive a sessionReady event to update all controls to reflect current collection status.
    … …  
    499500    public Filter getFilter(DragTree tree) {
    500501    Filter filter = (Filter) filters.get(tree.getModel());
    501     if(filter == null) {
     502    if (filter == null) {
    502503        filter = new Filter(tree, null);
    503504        filters.put(tree.getModel(), filter);
    … …  
    534535
    535536    /** Allows the system to programatically set the selected tab.
    536       * @param component The view you wish to make visable in the tab pane as a <strong>Component</strong>.
    537       */
     537     * @param component The view you wish to make visable in the tab pane as a <strong>Component</strong>.
     538     */
    538539    public void setSelectedView(Component component) {
    539540    tab_pane.setSelectedComponent(component);
    … …  
    558559        tab_pane.setEnabledAt(index, state);
    559560        }
    560                 // If this was the currently selected tab and it is now disabled, change the view to the first enabled tab.
     561        // If this was the currently selected tab and it is now disabled, change the view to the first enabled tab.
    561562        if(tab_pane.getSelectedIndex() == index && !state) {
    562563        boolean found = false;
    … …  
    580581
    581582    /** When the edit metadata option is choosen from the menu, this method is called to ensure we only edit the metadata if there is metadata loaded.
    582       */
     583     */
    583584    public void showEditMetadataBox() {
    584585    if(Gatherer.c_man.getCollection() != null) {
    … …  
    587588    }
    588589    /** When the load collection option is choosen this method is called to produce the modal file load prompt.
    589       */
     590     */
    590591    public boolean showLoadCollectionBox() {
    591592    boolean result = false;
    … …  
    638639    }
    639640    /** When called this method causes the Log class in Gatherer to display a nice dialog box which contains the log.
    640       */
     641     */
    641642    public void showLogBox() {
    642643    Gatherer.log.display();
    643644    }
    644645    /** When called this method causes the MetaAuditBox class in CollectionManager to display a nice dialog box which contains all the metadata assigned in the collection.
    645       */
     646     */
    646647    public void showMetaAuditBox() {
    647648    wait(true);
    … …  
    718719
    719720    /** This method is used to open the options box on the screen.
    720       */
     721     */
    721722    public void showOptionsBox() {
    722723    new OptionsBox();
    723724    }
    724725    /** This method is used to open the save collection box/prompt on the screen.
    725       * @return A <i>boolean</i> which is <i>true</i> if the collection was saved successfully, <i>false</i> otherwise.
    726       */
     726     * @return A <i>boolean</i> which is <i>true</i> if the collection was saved successfully, <i>false</i> otherwise.
     727     */
    727728    public boolean showSaveCollectionBox(boolean close_after, boolean exit_after) {
    728729    //SaveCollectionBox save_collection_box = new SaveCollectionBox();
    … …  
    762763    }
    763764    /** Any implementation of ChangeListener must include this method so we can be informed when the state of one of the registered objects changes. In this case we are listening to view changes within the tabbed pane.
    764       * @param event A ChangeEvent containing information about the event that fired this call.
    765       */
     765     * @param event A ChangeEvent containing information about the event that fired this call.
     766     */
    766767    public void stateChanged(ChangeEvent event) {
    767768    if(previous_pane != null) {
    … …  
    825826
    826827    /** Retrieves a phrase from the Dictionary based on the key.
    827       * @param key A <strong>String</strong> uniquely identifying a phrase from the Dictionary.
    828       * @return The desired phrase as a <strong>String</strong>.
    829       * @see org.greenstone.gatherer.Dictionary
    830       */
     828     * @param key A <strong>String</strong> uniquely identifying a phrase from the Dictionary.
     829     * @return The desired phrase as a <strong>String</strong>.
     830     * @see org.greenstone.gatherer.Dictionary
     831     */
    831832    private String get(String key) {
    832833    return get(key, null);
    833834    }
    834835    /** Retrieves a phrase from the Dictionary based on the key and including the arguments.
    835       * @param key A <strong>String</strong> uniquely identifying a phrase from the Dictionary.
    836       * @param args A <strong>String[]</strong> of arguments available to be inserted into the phrase.
    837       * @return The desired phrase as a <strong>String</strong>.
    838       * @see org.greenstone.gatherer.Dictionary
    839       */
     836     * @param key A <strong>String</strong> uniquely identifying a phrase from the Dictionary.
     837     * @param args A <strong>String[]</strong> of arguments available to be inserted into the phrase.
     838     * @return The desired phrase as a <strong>String</strong>.
     839     * @see org.greenstone.gatherer.Dictionary
     840     */
    840841    private String get(String key, String args[]) {
    841842    if(key.indexOf('.') == -1) {
    … …  
    862863
    863864    /**Overridden from JFrame so we can exit safely when window is closed (or destroyed).
    864       * @param event A <strong>WindowEvent</strong> containing information about the event that fred this call.
    865       */
     865     * @param event A <strong>WindowEvent</strong> containing information about the event that fired this call.
     866     */
    866867    protected void processWindowEvent(WindowEvent event) {
    867868    if(event.getID() == WindowEvent.WINDOW_CLOSING) {
    … …  
    870871    }
    871872    /** Listens to actions upon the menu bar, and if it detects a click over the help menu brings the help window to the front if it has become hidden.
    872       */
     873     */
    873874    private class MenuListenerImpl
    874875    implements MenuListener {
    875876    /** Called whenever a popup menu is hidden, but we don't care.
    876877     * @param e Some <strong>MenuEvent</strong> that we could care less about.
    877             */
     878     */
    878879    public void menuCanceled(MenuEvent e) {
    879880    }
    880881    /** Called whenever a menu header (ie button) becomes unselected, but we don't care.
    881             * @param e Some <strong>MenuEvent</strong> that we could care less about.
    882             */
     882     * @param e Some <strong>MenuEvent</strong> that we could care less about.
     883     */
    883884    public void menuDeselected(MenuEvent e) {
    884885    }
    885886    /** This method, when a menu is first opened, is the only one we respond to by bringing the help window to the front if possible, but only if there is a help window and the help menu is the one opening.
    886             * @param e The <strong>MenuEvent</strong> whose source is checked.
    887             */
     887     * @param e The <strong>MenuEvent</strong> whose source is checked.
     888     */
    888889    public void menuSelected(MenuEvent e) {
    889890        if(e.getSource() == menu_bar.help) {

  • trunk/gli/src/org/greenstone/gatherer/gui/LockFileDialog.java

    r5349 r5527  
    3434    super(parent, get("LockFileDialog.Title"), true);
    3535    setSize(SIZE);
    36     setJMenuBar(new SimpleMenuBar("2.3"));
     36    setJMenuBar(new SimpleMenuBar("openingacollection"));
    3737    this.self = this;
    3838    // Parse the lock file, but do so quietly so that if the XML is poorly formed it doesn't show exception.

  • trunk/gli/src/org/greenstone/gatherer/gui/MenuBar.java

    r5356 r5527  
    225225    help_about.addActionListener(Gatherer.g_man);
    226226
    227     help_browse = new JMenuItem(get("GUI.Browser"), Utility.BLANK_ICON);
     227    help_browse = new JMenuItem(get("GUI.Hunt"), Utility.BLANK_ICON);
    228228    help_browse.addActionListener(Gatherer.g_man);
    229229
    … …  
    231231    help_build.addActionListener(Gatherer.g_man);
    232232
    233     help_collect = new JMenuItem(get("GUI.Collection"), Utility.BLANK_ICON);
     233    help_collect = new JMenuItem(get("GUI.Gather"), Utility.BLANK_ICON);
    234234    help_collect.addActionListener(Gatherer.g_man);
    235235
    236     help_design = new JMenuItem(get("GUI.Build"), Utility.BLANK_ICON);
     236    help_design = new JMenuItem(get("GUI.Design"), Utility.BLANK_ICON);
    237237    help_design.addActionListener(Gatherer.g_man);
    238238
    … …  
    243243    help_general.addActionListener(Gatherer.g_man);
    244244
    245     help_metaedit = new JMenuItem(get("GUI.MetaEdit"), Utility.BLANK_ICON);
     245    help_metaedit = new JMenuItem(get("GUI.Enrich"), Utility.BLANK_ICON);
    246246    help_metaedit.addActionListener(Gatherer.g_man);
    247247
    248     help_mirror = new JMenuItem(get("GUI.Mirroring"), Utility.BLANK_ICON);
     248    help_mirror = new JMenuItem(get("GUI.Mirror"), Utility.BLANK_ICON);
    249249    help_mirror.addActionListener(Gatherer.g_man);
    250250
    … …  
    325325
    326326    /** In order to provide context aware help advice we keep track of which
    327       *  tab the user has open, and then highlight that help menu item with
    328       *  separators.
    329       *  @param tab_index The index of the selected tab (0-7).
    330       */
     327     *  tab the user has open, and then highlight that help menu item with
     328     *  separators.
     329     *  @param tab_index The index of the selected tab (0-7).
     330     */
    331331    public void tabSelected(int tab_index) {
    332332    JMenuItem selected;
    … …  
    347347     
    348348    /** Retrieves a key from the Dictionary, using no extra arguments.
    349       * @param key A String which maps to a certain phrase from the Dictionary.
    350       * @return The String the matches the key or an error String if no match
    351       * found.
    352       */
     349     * @param key A String which maps to a certain phrase from the Dictionary.
     350     * @return The String the matches the key or an error String if no match
     351     * found.
     352     */
    353353    private String get(String key) {
    354     return get(key, null);
     354    // return get(key, null);
     355    return Gatherer.dictionary.get(key, (String[]) null);
    355356    }
    356357
    357358    /** Retrieves a key from the Dictionary, providing extra arguments to
    358       * be inserted using a String array.
    359       * @param key A String which maps to a certain phrase from the Dictionary.
    360       * @param args A String array containing further arguments (such as
    361       * formatting instructions and variable values) to be taken into account
    362       * when Dictionary creates the return String.
    363       * @return The String the matches the key or an error String if no match
    364       * found.
    365       */
    366     private String get(String key, String args[]) {
     359     * be inserted using a String array.
     360     * @param key A String which maps to a certain phrase from the Dictionary.
     361     * @param args A String array containing further arguments (such as
     362     * formatting instructions and variable values) to be taken into account
     363     * when Dictionary creates the return String.
     364     * @return The String the matches the key or an error String if no match
     365     * found.
     366     */
     367    /* private String get(String key, String args[]) {
    367368    if(key.indexOf('.') == -1) {
    368369        key = "Menu." + key;
    369370    }
    370371    return Gatherer.dictionary.get(key, args);
    371     }
     372    } */
    372373
    373374    public class MagicMenuItem

  • trunk/gli/src/org/greenstone/gatherer/gui/MetaEditPane.java

    r5372 r5527  
    128128
    129129    /** Constructor.
    130      * @param tree_sync The <strong>TreeSynchronizer</strong> to be used on the collection tree.
     130     * @param tree_sync The <strong>TreeSynchronizer</strong> to be used on the collection tree
    131131     * @see org.greenstone.gatherer.Configuration
    132132     * @see org.greenstone.gatherer.gui.table.GTable
    133133     * @see org.greenstone.gatherer.valuetree.GValueTree
    134134     */
    135     public MetaEditPane(TreeSynchronizer tree_sync) {
     135    public MetaEditPane(TreeSynchronizer tree_sync)
     136    {
    136137    this.tree = null;
    137138    this.tree_sync = tree_sync;
    138          
    139     add = new JButton(get("MetaEditPrompt.Accumulate"));
     139
     140    add = new JButton("MetaEdit.Accumulate");
    140141    add.addActionListener(this);
    141142    add.setEnabled(false);
    … …  
    143144    add.setPreferredSize(BUTTON_SIZE);
    144145
    145     update = new JButton(get("MetaEditPrompt.Overwrite"));
     146    update = new JButton("MetaEdit.Overwrite");
    146147    update.addActionListener(this);
    147148    update.setEnabled(false);
    … …  
    149150    update.setPreferredSize(BUTTON_SIZE);
    150151
    151     remove = new JButton(get("MetaEditPrompt.Remove"));
     152    remove = new JButton("MetaEdit.Remove");
    152153    remove.addActionListener(this);
    153154    remove.setEnabled(false);
    … …  
    155156    remove.setPreferredSize(BUTTON_SIZE);
    156157
    157     expand = new JButton(get("General.Expand"));
     158    expand = new JButton("MetaEdit.Expand");
    158159    expand.addActionListener(this);
    159160    expand.setEnabled(true);
    … …  
    162163
    163164    tree = new GValueTree(CONTROL_SIZE.width, CONTROL_SIZE.height);
    164     }
     165
     166    // Dictionary registration
     167    Gatherer.dictionary.register(add, null, false);
     168    Gatherer.dictionary.register(update, null, false);
     169    Gatherer.dictionary.register(remove, null, false);
     170    Gatherer.dictionary.register(expand, null, false);
     171    }
     172
    165173
    166174    /** Called whenever an action occurs on one of our registered buttons.
    … …  
    175183    public void actionPerformed(ActionEvent event) {
    176184    Object esrc = event.getSource();
    177     if(esrc == add) {
     185    if (esrc == add) {
    178186        (new AppendMetadataTask()).start();
    179187    }
    180     else if(esrc == update) {
     188    else if (esrc == update) {
    181189        (new UpdateMetadataTask()).start();
    182190    }
    183     else if(esrc == remove) {
     191    else if (esrc == remove) {
    184192        (new RemoveMetadataTask()).start();
    185193    }
    186     else if(esrc == expand) {
     194    else if (esrc == expand) {
    187195        EditorDialog ed = new EditorDialog();
    188196        String temp = ed.display(tree.getSelectedValue());
    189         if(temp != null) {
     197        if (temp != null) {
    190198        tree.setSelectedValue(temp);
    191199        }
    … …  
    408416    JPanel table_title_pane = new JPanel();
    409417
    410     ///atherer.println("\tCreating metadata_label");
    411     table_label = new JTextField(get("MetaEdit.No_File"));
     418    table_label = new JTextField("MetaEdit.No_File");
    412419    table_label.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    413420    table_label.setEditable(false);
    … …  
    419426    JPanel table_pane_zero = new JPanel();
    420427    table_pane_zero.setOpaque(false);
    421    
     428
    422429    JPanel table_pane_two = new JPanel();
    423430    table_pane_two.setOpaque(false);
    424431
    425     JLabel no_file_message = new JLabel(get("MetaEdit.No_File"));
     432    JLabel no_file_message = new JLabel("MetaEdit.No_File");
    426433    no_file_message.setHorizontalAlignment(JLabel.CENTER);
    427434    no_file_message.setOpaque(false);
    428435    no_file_message.setVerticalAlignment(JLabel.CENTER);
    429    
    430     JLabel no_metadata_message = new JLabel(get("MetaEdit.No_Metadata"));
     436
     437    JLabel no_metadata_message = new JLabel("MetaEdit.No_Metadata");
    431438    no_metadata_message.setHorizontalAlignment(JLabel.CENTER);
    432439    no_metadata_message.setOpaque(false);
    … …  
    476483    JPanel tools_off_pane = new JPanel();
    477484
    478     JLabel tools_off_label = new JLabel(get("MetaEdit.No_Metadata_Element"));
     485    JLabel tools_off_label = new JLabel("MetaEdit.No_Metadata_Element");
    479486    tools_off_label.setHorizontalAlignment(JLabel.CENTER);
    480487    tools_off_label.setOpaque(false);
    … …  
    531538    this.setLayout(new BorderLayout());
    532539    this.add(external_split, BorderLayout.CENTER);
     540
     541    // Dictionary registration
     542    Gatherer.dictionary.register(table_label, null, false);
     543    Gatherer.dictionary.register(no_file_message, null, false);
     544    Gatherer.dictionary.register(no_metadata_message, null, false);
     545    Gatherer.dictionary.register(tools_off_label, null, false);
    533546    }
    534547
    … …  
    10061019
    10071020
    1008     public GValueTree(int width, int height) {
     1021    public GValueTree(int width, int height)
     1022    {
    10091023        super();
    10101024
    … …  
    10151029
    10161030        JPanel value_pane = new JPanel();
    1017         JLabel value_label = new JLabel(get("MetaEdit.Value"));
     1031        JLabel value_label = new JLabel("MetaEdit.Value");
    10181032        value_label.setPreferredSize(VALUE_LABEL_SIZE);
    10191033
    10201034        JPanel value_field_pane = new JPanel();
    1021         value = new JTextField();
     1035        value = new JTextField("MetaEdit.Value_Field");
    10221036        value.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
    10231037        value.setForeground(Gatherer.config.getColor("coloring.editable_foreground", false));
    … …  
    10301044
    10311045        JPanel tree_pane = new JPanel();
    1032         JLabel tree_label = new JLabel(get("MetaEdit.Tree"));
     1046        JLabel tree_label = new JLabel("MetaEdit.Tree");
    10331047
    10341048        tree = new JTree(new GValueModel());
    … …  
    10481062
    10491063        // Layout
    1050 
    10511064        value_field_pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
    10521065        value_field_pane.setLayout(new BorderLayout(0, 0));
    … …  
    10831096        this.add(extracted_pane, NONE);
    10841097        card_showing = TREE;
     1098
     1099        // Dictionary registration
     1100        Gatherer.dictionary.register(value_label, null, false);
     1101        Gatherer.dictionary.register(value, null, false);
     1102        Gatherer.dictionary.register(tree_label, null, false);
    10851103    }
    10861104
    … …  
    11741192
    11751193
    1176     private String get(String key) {
    1177         return get(key, null);
    1178     }
    1179 
    11801194    private String get(String key, String args[]) {
    1181         if (key.indexOf('.') == -1) {
    1182         key = "MetaEdit." + key;
    1183         }
    11841195        return Gatherer.dictionary.get(key, args);
    11851196    }

  • trunk/gli/src/org/greenstone/gatherer/gui/MetaEditPrompt.java

    r5359 r5527  
    3030import java.io.File;
    3131import javax.swing.*;
    32 import org.greenstone.gatherer.Configuration;
    3332import org.greenstone.gatherer.Gatherer;
    3433import org.greenstone.gatherer.gui.TextFieldLabel;
    35 import org.greenstone.gatherer.util.Utility;
    3634import org.greenstone.gatherer.gui.SimpleMenuBar;
    3735import org.greenstone.gatherer.gui.ModalDialog;
     36import org.greenstone.gatherer.util.Utility;
    3837
    3938/** Displays a dynamic prompt to allow the user to choose how metadata is to be added, updated or removed from target FileNodes. The prompt changes depending on the action requested, the file nodes encountered and the number of file nodes in the selection. */
    … …  
    7574    public MetaEditPrompt(String type, boolean multiple_selection, File file, String element, String current_value, String new_value) {
    7675    super(Gatherer.g_man, true); // Needed for modal response!
    77          
     76
    7877    // Setup
    7978    this.setSize(SIZE);
    80     this.setTitle(get("MetaEditPrompt.Title"));
    81     this.setJMenuBar(new SimpleMenuBar("6.3"));
     79    this.setTitle("MetaEditPrompt.Title");
     80
     81    if (type.equals(ADD_PROMPT)) {
     82        this.setJMenuBar(new SimpleMenuBar("appendingmetadata"));
     83    }
     84    else if (type.equals(UPDATE_PROMPT)) {
     85        this.setJMenuBar(new SimpleMenuBar("updatingmetadata"));
     86    }
     87    else if (type.equals(REMOVE_PROMPT)) {
     88        this.setJMenuBar(new SimpleMenuBar("removingmetadata"));
     89    }
     90
    8291    // Creation
    8392    JPanel content_pane = (JPanel)this.getContentPane();
    84     JLabel title_label = new JLabel(get("MetaEditPrompt." + type));
     93    JLabel title_label = new JLabel(type);
    8594
    8695    JPanel details_pane = new JPanel();
    8796    JPanel filename_panel = new JPanel();
    88     JLabel filename_label = new JLabel(get("MetaEditPrompt.File"));
     97    JLabel filename_label = new JLabel("MetaEditPrompt.File");
    8998    filename_label.setPreferredSize(LABEL_SIZE);
    9099    TextFieldLabel filename_field = new TextFieldLabel(Utility.trimCenter(file.getAbsolutePath(), 120));
    … …  
    92101    filename_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    93102    JPanel element_panel = new JPanel();
    94     JLabel element_label = new JLabel(get("MetaEditPrompt.Element"));
     103    JLabel element_label = new JLabel("MetaEditPrompt.Element");
    95104    element_label.setPreferredSize(LABEL_SIZE);
    96105    TextFieldLabel element_field = new TextFieldLabel(element);
    97106    element_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    98107    JPanel current_value_panel = new JPanel();
    99     JLabel current_value_label = new JLabel(get("MetaEditPrompt.Current_Value"));
     108    JLabel current_value_label = new JLabel("MetaEditPrompt.Current_Value");
    100109    current_value_label.setPreferredSize(LABEL_SIZE);
    101110    TextFieldLabel current_value_field = new TextFieldLabel(current_value);
    102111    current_value_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    103112    JPanel new_value_panel = new JPanel();
    104     JLabel new_value_label = new JLabel(get("MetaEditPrompt.New_Value"));
     113    JLabel new_value_label = new JLabel("MetaEditPrompt.New_Value");
    105114    new_value_label.setPreferredSize(LABEL_SIZE);
    106115    TextFieldLabel new_value_field = new TextFieldLabel(new_value, (type == ADD_PROMPT || type == UPDATE_PROMPT));
    107116    new_value_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    108117    JPanel buttons_pane = new JPanel();
    109     accumulate = new JButton(get("MetaEditPrompt.Accumulate"));
     118
     119    accumulate = new JButton("MetaEditPrompt.Accumulate");
    110120    accumulate.setEnabled(type == ADD_PROMPT);
    111121    accumulate.setMnemonic(KeyEvent.VK_A);
    112     accumulate_all = new JButton(get("MetaEditPrompt.Accumulate_All"));
     122
     123    accumulate_all = new JButton("MetaEditPrompt.Accumulate_All");
    113124    accumulate_all.setEnabled(type == ADD_PROMPT && multiple_selection);
    114125    accumulate_all.setMnemonic(KeyEvent.VK_L);
    115     cancel = new JButton(get("MetaEditPrompt.Cancel"));
    116     cancel.setMnemonic(KeyEvent.VK_C);
    117     skip = new JButton(get("MetaEditPrompt.Skip"));
     126
     127    overwrite = new JButton("MetaEditPrompt.Overwrite");
     128    overwrite.setEnabled(type == UPDATE_PROMPT);
     129    overwrite.setMnemonic(KeyEvent.VK_R);
     130
     131    overwrite_all = new JButton("MetaEditPrompt.Overwrite_All");
     132    overwrite_all.setEnabled(type == UPDATE_PROMPT && multiple_selection);
     133    overwrite_all.setMnemonic(KeyEvent.VK_P);
     134
     135    remove = new JButton("MetaEditPrompt.Remove");
     136    remove.setEnabled(type == REMOVE_PROMPT);
     137    remove.setMnemonic(KeyEvent.VK_R);
     138
     139    remove_all = new JButton("MetaEditPrompt.Remove_All");
     140    remove_all.setEnabled(type == REMOVE_PROMPT && multiple_selection);
     141    remove_all.setMnemonic(KeyEvent.VK_A);
     142
     143    skip = new JButton("MetaEditPrompt.Skip");
    118144    skip.setEnabled(multiple_selection);
    119145    skip.setMnemonic(KeyEvent.VK_S);
    120     overwrite = new JButton(get("MetaEditPrompt.Overwrite"));
    121     overwrite.setEnabled(type == UPDATE_PROMPT);
    122     overwrite.setMnemonic(KeyEvent.VK_R);
    123     overwrite_all = new JButton(get("MetaEditPrompt.Overwrite_All"));
    124     overwrite_all.setEnabled(type == UPDATE_PROMPT && multiple_selection);
    125     overwrite_all.setMnemonic(KeyEvent.VK_P);
    126     remove = new JButton(get("MetaEditPrompt.Remove"));
    127     remove.setEnabled(type == REMOVE_PROMPT);
    128     remove.setMnemonic(KeyEvent.VK_R);
    129     remove_all = new JButton(get("MetaEditPrompt.Remove_All"));
    130     remove_all.setEnabled(type == REMOVE_PROMPT && multiple_selection);
    131     remove_all.setMnemonic(KeyEvent.VK_A);
     146
     147    cancel = new JButton("MetaEditPrompt.Cancel");
     148    cancel.setMnemonic(KeyEvent.VK_C);
    132149
    133150    // Connection
    … …  
    187204    Rectangle frame_bounds = Gatherer.g_man.getBounds();
    188205    this.setLocation(frame_bounds.x + ((frame_bounds.width - SIZE.width) / 2), frame_bounds.y + ((frame_bounds.height - SIZE.height) / 2));
     206
     207    // Dictionary registration
     208    Gatherer.dictionary.register(title_label, null, false);
     209    Gatherer.dictionary.register(filename_label, null, false);
     210    Gatherer.dictionary.register(element_label, null, false);
     211    Gatherer.dictionary.register(current_value_label, null, false);
     212    Gatherer.dictionary.register(new_value_label, null, false);
     213
     214    Gatherer.dictionary.register(accumulate, null, false);
     215    Gatherer.dictionary.register(accumulate_all, null, false);
     216    Gatherer.dictionary.register(cancel, null, false);
     217    Gatherer.dictionary.register(skip, null, false);
     218    Gatherer.dictionary.register(overwrite, null, false);
     219    Gatherer.dictionary.register(overwrite_all, null, false);
     220    Gatherer.dictionary.register(remove, null, false);
     221    Gatherer.dictionary.register(remove_all, null, false);
    189222    }
    190223
    … …  
    222255    return value;
    223256    }
    224 
    225     private String get(String key) {
    226     return Gatherer.dictionary.get(key);
    227     }
    228257}

  • trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

    r5349 r5527  
    4343    this.self = this;
    4444    // Setup
    45     setJMenuBar(new SimpleMenuBar("2.1"));
     45    setJMenuBar(new SimpleMenuBar("creatingacollection"));
    4646    setSize(size);
    4747    setTitle(get("NewCollectionPrompt.Title"));

  • trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionMetadataPrompt.java

    r5355 r5527  
    3232    super(Gatherer.g_man, true);
    3333    this.self = this;
    34     setJMenuBar(new SimpleMenuBar("2.1"));
     34    setJMenuBar(new SimpleMenuBar("creatingacollection"));
    3535    setModal(true);
    3636    setSize(size);

  • trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

    r5370 r5527  
    6262    setSize(SIZE);
    6363    setTitle("Preferences");
    64     setJMenuBar(new SimpleMenuBar("10.2"));
     64    setJMenuBar(new SimpleMenuBar("preferences"));
    6565    // Creation
    6666    JPanel content_pane = (JPanel) getContentPane();

  • trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/AutofilterDialog.java

    r5348 r5527  
    106106    setSize(SIZE);
    107107    setTitle(get("Autofilter.Title"));
    108     setJMenuBar(new SimpleMenuBar("6.7"));
     108    setJMenuBar(new SimpleMenuBar("reviewingmetadata"));
    109109    // Creation
    110110    JPanel content_pane = (JPanel) getContentPane();

  • trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/MetaAuditFrame.java

    r5363 r5527  
    108108    setSize(SIZE);
    109109    setTitle(get("MetaAudit.Title"));
    110     setJMenuBar(new SimpleMenuBar("6.7"));
     110    setJMenuBar(new SimpleMenuBar("reviewingmetadata"));
    111111    JPanel content_pane = (JPanel) getContentPane();
    112112    JPanel button_pane = new JPanel();

  • trunk/gli/src/org/greenstone/gatherer/mem/MetadataEditorManager.java

    r5349 r5527  
    149149    setSize(SIZE);
    150150    setTitle(get("MEM.Title"));
    151     setJMenuBar(new SimpleMenuBar("11.1"));
     151    setJMenuBar(new SimpleMenuBar("editingmetadatasets"));
    152152    JPanel content_pane = (JPanel) getContentPane();
    153153    content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));

  • trunk/gli/src/org/greenstone/gatherer/msm/MSMPrompt.java

    r5349 r5527  
    195195     * @return An object, which is either an Integer specifying what further action should be undertaken, if any, or if the action was replace, returns an Element, which is the attribute Element to replace with the new one
    196196     */
    197     public Object mDEPrompt(Element mde_cur, Element []atts_cur, Element mde_new, Element att_new) {
     197    public Object mDEPrompt(Element mde_cur, Element[] atts_cur, Element mde_new, Element att_new) {
    198198    action = Declarations.NO_ACTION;
    199199    // Construction and configuration
    … …  
    202202    dialog.setSize(MDE_SIZE);
    203203    dialog.setTitle(get("MSMPrompt.Merge_MDE"));
    204     dialog.setJMenuBar(new SimpleMenuBar("6.8"));
     204    dialog.setJMenuBar(new SimpleMenuBar("importingpreviouslyassignedmetadata"));
    205205    JPanel content_pane = (JPanel)dialog.getContentPane();
    206206
    … …  
    305305    dialog.setSize(MDS_SIZE);
    306306    dialog.setTitle(get("MSMPrompt.Merge_MDS"));
    307     dialog.setJMenuBar(new SimpleMenuBar("6.8"));
     307    dialog.setJMenuBar(new SimpleMenuBar("importingpreviouslyassignedmetadata"));
    308308    JPanel content_pane = (JPanel)dialog.getContentPane();
    309309    if(mde_cur != null) {
    … …  
    440440    dialog.setSize(RENAME_SIZE);
    441441    dialog.setTitle(get("MSMPrompt.Rename"));
    442     dialog.setJMenuBar(new SimpleMenuBar("6.8"));
     442    dialog.setJMenuBar(new SimpleMenuBar("importingpreviouslyassignedmetadata"));
    443443    JLabel old_name_label = new JLabel(get("MSMPrompt.Old_Name"));
    444444    old_name_label.setPreferredSize(RENAME_LABEL_SIZE);
    … …  
    551551    dialog.setSize(SELECT_SIZE);
    552552    dialog.setTitle(get("MSMPrompt.Select"));
    553     dialog.setJMenuBar(new SimpleMenuBar("6.8"));
     553    dialog.setJMenuBar(new SimpleMenuBar("importingpreviouslyassignedmetadata"));
    554554
    555555    JButton ok = new JButton(get("General.OK"));
    … …  
    627627    dialog.setSize(SELECT_ELEMENT_SIZE);
    628628    dialog.setTitle(get("MSMPrompt.Select_Element_Title"));
    629     dialog.setJMenuBar(new SimpleMenuBar("6.8"));
     629    dialog.setJMenuBar(new SimpleMenuBar("importingpreviouslyassignedmetadata"));
    630630    JPanel content_pane = (JPanel) dialog.getContentPane();
    631631    JPanel control_pane = new JPanel();
    … …  
    812812    dialog.setSize(SELECT_SET_SIZE);
    813813    dialog.setTitle(get("MSMPrompt.Select_Set_Title"));
    814     dialog.setJMenuBar(new SimpleMenuBar("6.8"));
     814    dialog.setJMenuBar(new SimpleMenuBar("importingpreviouslyassignedmetadata"));
    815815    JPanel content_pane = (JPanel) dialog.getContentPane();
    816816    JPanel control_pane = new JPanel();

  • trunk/gli/src/org/greenstone/gatherer/sarm/SearchAndReplace.java

    r5354 r5527  
    5454import org.greenstone.gatherer.valuetree.GValueModel;
    5555import org.greenstone.gatherer.valuetree.GValueNode;
    56 import org.greenstone.gatherer.gui.SimpleMenuBar;
    5756import org.greenstone.gatherer.gui.ModalDialog;
    5857/** Provides a convenient class which searches through all of the various data attached to a collection, globally searching and replacing values as necessary, and firing the relevant events to have the gui update properly.
    … …  
    138137    setSize(SIZE);
    139138    setTitle(get("SearchAndReplace.Title"));
    140     setJMenuBar(new SimpleMenuBar("10.1")); 
    141139    JPanel content_pane = (JPanel) getContentPane();
    142140
Note: See TracChangeset for help on using the changeset viewer.