Changeset 5593 for trunk/gli/src/org/greenstone/gatherer/cdm
- Timestamp:
- 2003-10-07T15:35:23+13:00 (21 years ago)
- Location:
- trunk/gli/src/org/greenstone/gatherer/cdm
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/cdm/ArgumentConfiguration.java
r5590 r5593 540 540 String args[] = new String[1]; 541 541 args[0] = argument.getName(); 542 JOptionPane.showMessageDialog(self, Dictionary. newget("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.newget("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);542 JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE); 543 543 args = null; 544 544 return false; … … 563 563 args[0] = argument.getName(); 564 564 args[1] = result; 565 JOptionPane.showMessageDialog(self, Dictionary. newget("CDM.ArgumentConfiguration.Bad_Integer", args), Dictionary.newget("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);565 JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Bad_Integer", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE); 566 566 args = null; 567 567 return false; … … 573 573 String args[] = new String[1]; 574 574 args[0] = argument.getName(); 575 JOptionPane.showMessageDialog(self, Dictionary. newget("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.newget("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);575 JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE); 576 576 args = null; 577 577 return false; … … 612 612 String args[] = new String[1]; 613 613 args[0] = argument.getName(); 614 JOptionPane.showMessageDialog(self, Dictionary. newget("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.newget("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);614 JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE); 615 615 return false; 616 616 } -
trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java
r5590 r5593 200 200 if(index < 0) { 201 201 String args[] = new String[2]; 202 args[0] = Dictionary. newget("CDM.ClassifierManager.Classifier");202 args[0] = Dictionary.get("CDM.ClassifierManager.Classifier"); 203 203 args[1] = classifier.getName(); 204 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary. newget("CDM.Move.At_Top", args), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);204 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.At_Top", args), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE); 205 205 return; 206 206 } … … 213 213 if(index >= getSize()) { 214 214 String args[] = new String[2]; 215 args[0] = Dictionary. newget("CDM.ClassifierManager.Classifier_Str");215 args[0] = Dictionary.get("CDM.ClassifierManager.Classifier_Str"); 216 216 args[1] = classifier.getName(); 217 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary. newget("CDM.Move.At_Bottom", args), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);217 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.At_Bottom", args), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE); 218 218 return; 219 219 } … … 337 337 String classifier_name = getClassifierName(classifier); 338 338 Gatherer.println("Zero length argument xml detected for: " + classifier_name); 339 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary. newget("CDM.ClassifierManager.Classifier_XML_Parse_Failed", classifier_name), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);339 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.ClassifierManager.Classifier_XML_Parse_Failed", classifier_name), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 340 340 classifier_name = null; 341 341 } … … 370 370 if(files != null) { 371 371 // Create a progress indicator. 372 ParsingProgress progress = new ParsingProgress(Dictionary. newget("CDM.ClassifierManager.Parsing.Title"), Dictionary.newget("CDM.ClassifierManager.Parsing.Message"), files.length);372 ParsingProgress progress = new ParsingProgress(Dictionary.get("CDM.ClassifierManager.Parsing.Title"), Dictionary.get("CDM.ClassifierManager.Parsing.Message"), files.length); 373 373 for(int i = 0; i < files.length; i++) { 374 374 // We only want to check Perl Modules. … … 516 516 // Create 517 517 add = new JButton(); 518 Dictionary. setBoth(add, "CDM.ClassifierManager.Add", "CDM.ClassifierManager.Add_Tooltip");518 Dictionary.registerBoth(add, "CDM.ClassifierManager.Add", "CDM.ClassifierManager.Add_Tooltip"); 519 519 JPanel button_pane = new JPanel(); 520 520 JPanel central_pane = new JPanel(); 521 521 configure = new JButton(); 522 522 configure.setEnabled(false); 523 Dictionary. setBoth(configure, "CDM.ClassifierManager.Configure", "CDM.ClassifierManager.Configure_Tooltip");523 Dictionary.registerBoth(configure, "CDM.ClassifierManager.Configure", "CDM.ClassifierManager.Configure_Tooltip"); 524 524 JPanel header_pane = new JPanel(); 525 525 instructions = new JTextArea(); … … 528 528 instructions.setRows(6); 529 529 instructions.setWrapStyleWord(true); 530 Dictionary. setText(instructions, "CDM.ClassifierManager.Instructions");530 Dictionary.registerText(instructions, "CDM.ClassifierManager.Instructions"); 531 531 532 532 classifier = new GComboBox(getAvailable()); … … 537 537 classifier.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false)); 538 538 classifier.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false)); 539 Dictionary. setTooltip(classifier, "CDM.ClassifierManager.Classifier_Tooltip");539 Dictionary.registerTooltip(classifier, "CDM.ClassifierManager.Classifier_Tooltip"); 540 540 541 541 JLabel classifier_label = new JLabel(); 542 Dictionary. setText(classifier_label, "CDM.ClassifierManager.Classifier");542 Dictionary.registerText(classifier_label, "CDM.ClassifierManager.Classifier"); 543 543 classifier_list = new JList(model); 544 544 classifier_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); … … 546 546 classifier_list_label.setHorizontalAlignment(JLabel.CENTER); 547 547 classifier_list_label.setOpaque(true); 548 Dictionary. setText(classifier_list_label, "CDM.ClassifierManager.Assigned");548 Dictionary.registerText(classifier_list_label, "CDM.ClassifierManager.Assigned"); 549 549 JPanel classifier_list_pane = new JPanel(); 550 550 JPanel classifier_pane = new JPanel(); 551 551 remove = new JButton(); 552 552 remove.setEnabled(false); 553 Dictionary. setBoth(remove, "CDM.ClassifierManager.Remove", "CDM.ClassifierManager.Remove_Tooltip");553 Dictionary.registerBoth(remove, "CDM.ClassifierManager.Remove", "CDM.ClassifierManager.Remove_Tooltip"); 554 554 555 555 JLabel title = new JLabel(); 556 556 title.setHorizontalAlignment(JLabel.CENTER); 557 557 title.setOpaque(true); 558 Dictionary. setText(title, "CDM.ClassifierManager.Title");558 Dictionary.registerText(title, "CDM.ClassifierManager.Title"); 559 559 560 560 JPanel temp = new JPanel(new BorderLayout()); … … 635 635 636 636 // Scope these mad bordering skillz. 637 temp.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,0,5,0), BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary. newget("CDM.ClassifierManager.Controls")), BorderFactory.createEmptyBorder(2,2,2,2))));637 temp.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,0,5,0), BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("CDM.ClassifierManager.Controls")), BorderFactory.createEmptyBorder(2,2,2,2)))); 638 638 temp.add(classifier_pane, BorderLayout.NORTH); 639 639 temp.add(button_pane, BorderLayout.SOUTH); … … 712 712 } 713 713 else { 714 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary. newget("CDM.ClassifierManager.Classifier_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);714 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.ClassifierManager.Classifier_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 715 715 } 716 716 } -
trunk/gli/src/org/greenstone/gatherer/cdm/FormatManager.java
r5590 r5593 369 369 button_pane.add(remove_button); 370 370 371 center_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary. newget("CDM.FormatManager.Editing_Controls")), BorderFactory.createEmptyBorder(2,2,2,2)));371 center_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("CDM.FormatManager.Editing_Controls")), BorderFactory.createEmptyBorder(2,2,2,2))); 372 372 center_pane.setLayout(new BorderLayout()); 373 373 center_pane.add(selection_pane, BorderLayout.NORTH); -
trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java
r5536 r5593 356 356 */ 357 357 public void setSelectedView(String type) { 358 type = Dictionary. newget(type);358 type = Dictionary.get(type); 359 359 for(int i = 0; i < root.getChildCount(); i++) { 360 360 DesignNode child = (DesignNode) root.getChildAt(i); … … 379 379 */ 380 380 public String toString() { 381 return Dictionary. newget("CDM.GUI." + (String)getUserObject());381 return Dictionary.get("CDM.GUI." + (String)getUserObject()); 382 382 } 383 383 } -
trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java
r5590 r5593 107 107 } 108 108 else { 109 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary. newget("CDM.IndexManager.Index_Exists"), Dictionary.newget("General.Warning"), JOptionPane.WARNING_MESSAGE);109 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.IndexManager.Index_Exists"), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE); 110 110 } 111 111 } … … 125 125 } 126 126 else { 127 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary. newget("CDM.IndexManager.Level_Exists"), Dictionary.newget("General.Warning"), JOptionPane.WARNING_MESSAGE);127 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.IndexManager.Level_Exists"), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE); 128 128 } 129 129 } … … 587 587 Dictionary.registerText(level_label, "CDM.IndexManager.Level"); 588 588 level_combobox = new JComboBox(); 589 level_combobox.addItem(Dictionary. newget("CDM.IndexManager.Document"));590 level_combobox.addItem(Dictionary. newget("CDM.IndexManager.Paragraph"));591 level_combobox.addItem(Dictionary. newget("CDM.IndexManager.Section"));589 level_combobox.addItem(Dictionary.get("CDM.IndexManager.Document")); 590 level_combobox.addItem(Dictionary.get("CDM.IndexManager.Paragraph")); 591 level_combobox.addItem(Dictionary.get("CDM.IndexManager.Section")); 592 592 level_combobox.setEditable(false); 593 593 Dictionary.registerTooltip(level_combobox, "CDM.IndexManager.Level_Tooltip"); … … 800 800 JLabel component = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); 801 801 if(default_index != null && default_index.equals(value)) { 802 component.setText(component.getText() + " " + Dictionary. newget("CDM.IndexManager.Default_Index_Indicator"));802 component.setText(component.getText() + " " + Dictionary.get("CDM.IndexManager.Default_Index_Indicator")); 803 803 } 804 804 return component; … … 1199 1199 header_panel.add(new JScrollPane(instructions_textarea), BorderLayout.CENTER); 1200 1200 1201 tabbed_pane.add(Dictionary. newget("CDM.IndexManager.MGPP.Indexes"), indexes_panel);1202 tabbed_pane.add(Dictionary. newget("CDM.IndexManager.MGPP.Levels"), levels_panel);1201 tabbed_pane.add(Dictionary.get("CDM.IndexManager.MGPP.Indexes"), indexes_panel); 1202 tabbed_pane.add(Dictionary.get("CDM.IndexManager.MGPP.Levels"), levels_panel); 1203 1203 1204 1204 setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); -
trunk/gli/src/org/greenstone/gatherer/cdm/MetadataSetView.java
r5590 r5593 195 195 element_label.setHorizontalAlignment(JLabel.CENTER); 196 196 element_label.setOpaque(true); 197 Dictionary. setText(element_label, "CDM.MetadataSetManager.Elements");197 Dictionary.registerText(element_label, "CDM.MetadataSetManager.Elements"); 198 198 element_list = new JList(); 199 199 element_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); -
trunk/gli/src/org/greenstone/gatherer/cdm/PlugInManager.java
r5590 r5593 146 146 } 147 147 if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR)) { 148 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary. newget("CDM.Move.Fixed"), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);148 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.Fixed"), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE); 149 149 return; 150 150 } … … 183 183 if(index < 0) { 184 184 String args[] = new String[2]; 185 args[0] = Dictionary. newget("CDM.PlugInManager.PlugIn_Str");185 args[0] = Dictionary.get("CDM.PlugInManager.PlugIn_Str"); 186 186 args[1] = plugin.getName(); 187 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary. newget("CDM.Move.At_Top", args), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);187 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.At_Top", args), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE); 188 188 return; 189 189 } … … 198 198 String args[] = new String[1]; 199 199 args[0] = plugin.getName(); 200 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary. newget("CDM.Move.Cannot", args), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);200 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.Cannot", args), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE); 201 201 // Still not going to move RecPlug or ArcPlug. 202 202 return; … … 376 376 String[] margs = new String[1]; 377 377 margs[0] = plugin_name; 378 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary. newget("CDM.PlugInManager.PlugIn_XML_Parse_Failed", margs), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);378 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", margs), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 379 379 } 380 380 } … … 413 413 if(files != null) { 414 414 // Create a progress indicator. 415 ParsingProgress progress = new ParsingProgress(Dictionary. newget("CDM.PlugInManager.Parsing.Title"), Dictionary.newget("CDM.PlugInManager.Parsing.Message"), files.length);415 ParsingProgress progress = new ParsingProgress(Dictionary.get("CDM.PlugInManager.Parsing.Title"), Dictionary.get("CDM.PlugInManager.Parsing.Message"), files.length); 416 416 for(int i = 0; i < files.length; i++) { 417 417 // We only want to check Perl Modules. … … 696 696 (BorderFactory.createEmptyBorder(5,0,5,0), 697 697 BorderFactory.createCompoundBorder 698 (BorderFactory.createTitledBorder(Dictionary. newget("CDM.PlugInManager.Controls")),698 (BorderFactory.createTitledBorder(Dictionary.get("CDM.PlugInManager.Controls")), 699 699 BorderFactory.createEmptyBorder(2,2,2,2)))); 700 700 … … 771 771 } 772 772 else { 773 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary. newget("CDM.PlugInManager.PlugIn_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);773 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 774 774 } 775 775 base_plugin = null; -
trunk/gli/src/org/greenstone/gatherer/cdm/SearchTypeManager.java
r5590 r5593 102 102 if((direction && index < 0) || (!direction && index >= getSize())) { 103 103 String args[] = new String[2]; 104 args[0] = Dictionary. newget("CDM.SearchTypeManager.SearchType");104 args[0] = Dictionary.get("CDM.SearchTypeManager.SearchType"); 105 105 args[1] = search_type.toString(); 106 106 String message = null; 107 107 if (direction) { 108 message = Dictionary. newget("CDM.Move.At_Top", args);108 message = Dictionary.get("CDM.Move.At_Top", args); 109 109 } 110 110 else { 111 message = Dictionary. newget("CDM.Move.At_Bottom", args);112 } 113 JOptionPane.showMessageDialog(Gatherer.g_man, message, Dictionary. newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);111 message = Dictionary.get("CDM.Move.At_Bottom", args); 112 } 113 JOptionPane.showMessageDialog(Gatherer.g_man, message, Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE); 114 114 return; 115 115 } -
trunk/gli/src/org/greenstone/gatherer/cdm/SubcollectionManager.java
r5590 r5593 311 311 subcollection_pane.add(button_pane, BorderLayout.SOUTH); 312 312 313 tabbed_pane.addTab(Dictionary. newget("CDM.SubcollectionManager.Subcollection_Controls"), subcollection_pane);314 tabbed_pane.addTab(Dictionary. newget("CDM.SubcollectionManager.Subindex_Controls"), (JPanel) CollectionDesignManager.subcollectionindex_manager.getControls());315 tabbed_pane.addTab(Dictionary. newget("CDM.SubcollectionManager.Language_Controls"), (JPanel) CollectionDesignManager.language_manager.getControls());313 tabbed_pane.addTab(Dictionary.get("CDM.SubcollectionManager.Subcollection_Controls"), subcollection_pane); 314 tabbed_pane.addTab(Dictionary.get("CDM.SubcollectionManager.Subindex_Controls"), (JPanel) CollectionDesignManager.subcollectionindex_manager.getControls()); 315 tabbed_pane.addTab(Dictionary.get("CDM.SubcollectionManager.Language_Controls"), (JPanel) CollectionDesignManager.language_manager.getControls()); 316 316 317 317 border_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5)); -
trunk/gli/src/org/greenstone/gatherer/cdm/TranslationView.java
r5590 r5593 520 520 } 521 521 public String getColumnName(int column) { 522 return Dictionary. newget("CDM.TranslationManager.Column_Name_" + column);522 return Dictionary.get("CDM.TranslationManager.Column_Name_" + column); 523 523 } 524 524
Note:
See TracChangeset
for help on using the changeset viewer.