Changeset 4933
- Timestamp:
- 2003-07-15T14:17:08+12:00 (21 years ago)
- Location:
- trunk/gli
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/classes/dictionary.properties
r4804 r4933 118 118 CDM.ClassifierManager.Assigned:Currently Assigned Classifiers 119 119 CDM.ClassifierManager.Classifier:Select classifier to add: 120 CDM.ClassifierManager.Classifier_Exists:That classifier has already been assigned for this collection. 121 CDM.ClassifierManager.Classifier_Str:classifier 120 122 CDM.ClassifierManager.Classifier_XML_Parse_Failed:GLI has been unable to determine the arguments for the {0}\nclassifier. Please ensure that the classifier in question\nprovides the -xml flag by running the classinfo.pl script\nsimilar to the description of the pluginfo.pl script in\nsection 2.1 of the Greenstone Developers Guide. 121 123 CDM.ClassifierManager.Configure:Configure Selected Classifier … … 195 197 CDM.MetadataSetManager.Sets:Available Metadata Sets 196 198 CDM.MetadataSetManager.Title:{39}{46}Metadata Set Review{47}{34} 197 CDM.Move.At_Bottom:Cannot move the plugin {0} lower as it is already at the bottom of the list.198 CDM.Move.At_Top:Cannot move the plugin {0} higher as it is already at the top of the list.199 CDM.Move.At_Bottom:Cannot move the {0} {1} lower as it is already at the bottom of the list. 200 CDM.Move.At_Top:Cannot move the {0} {1} higher as it is already at the top of the list. 199 201 CDM.Move.Cannot:Cannot move the plugin {0} any lower as RecPlug and ArcPlug must be at the bottom of the list. 200 202 CDM.Move.Fixed:<html>RecPlug and ArcPlug are generally required to be last and so are fixed in place.<br>If you really must move them please hand edit the collect.cfg file.</html> 203 CDM.Move.Move_Bottom:Move To Bottom 204 CDM.Move.Move_Down:Move Down 205 CDM.Move.Move_Top:Move To Top 206 CDM.Move.Move_Up:Move Up 201 207 CDM.Move.Title:Error - Cannot Move 202 208 CDM.PlugInManager.Add:Add Specified Plugin … … 205 211 CDM.PlugInManager.Controls:Editing Controls 206 212 CDM.PlugInManager.Instructions:Use this view to add, configure or remove plugins from your collection. To add one choose it from the combobox and click 'Add Specified Plugin'.\nTo configure or remove one, select it from the list of assigned plugins then:\ni) Change its position in the plugin order by clicking on the arrow buttons. (Note: The position of RecPlug and ArcPlug are fixed).\nii) Configure it by clicking 'Configure Selected Plugin',\niii) Remove it by clicking 'Remove Selected Plugin'.\n\nPlugins are configured using a pop-up design area with a scrollable list of arguments. Enable arguments and enter or select values as necessary. 207 CDM.PlugInManager.Move_Bottom:Move To Bottom208 CDM.PlugInManager.Move_Down:Move Down209 CDM.PlugInManager.Move_Top:Move To Top210 CDM.PlugInManager.Move_Up:Move Up211 213 CDM.PlugInManager.PlugIn:Select plugin to add: 214 CDM.PlugInManager.PlugIn_Exists:That plugin has already been assigned for this collection. 215 CDM.PlugInManager.PlugIn_Str:plugin 212 216 CDM.PlugInManager.PlugIn_XML_Parse_Failed:GLI has been unable to determine the arguments for the {0}\nplugin. Please ensure that the plugin in question provides\nthe -xml flag by running the pluginfo.pl script described\nin section 2.1 of the Greenstone Developers Guide. 213 217 CDM.PlugInManager.Remove:Remove Selected Plugin … … 215 219 CDM.PlugInManager.Parsing.Message:Design tool is loading plugin information. 216 220 CDM.PlugInManager.Parsing.Title:Loading PlugIns 217 CDM.SubcollectionManager.Add:Add New Filter Definition 218 CDM.SubcollectionManager.Add_Subindex:Add New Subcollection Partition 221 CDM.SubcollectionManager.Add:Add 219 222 CDM.SubcollectionManager.Assigned:Defined Subcollection Filters 220 CDM.SubcollectionManager.Clear_Default_Subindex:Clear Default Subcollection Partition221 CDM.SubcollectionManager.Default_Subindex:Default Subcollection Partition:222 223 CDM.SubcollectionManager.Exclude:Exclude 223 224 CDM.SubcollectionManager.Flags:Flags to set when matching. … … 228 229 CDM.SubcollectionManager.Match:Regular expression to match with: 229 230 CDM.SubcollectionManager.Name:Name the subcollection filter: 230 CDM.SubcollectionManager.PartitionName:Name the subcollection partition: 231 CDM.SubcollectionManager.Remove:Remove Selected Filter Definition 232 CDM.SubcollectionManager.Remove_Subindex:Remove Subcollection Partition 233 CDM.SubcollectionManager.Set_Default_Subindex:Set Default Subcollection Partition 231 CDM.SubcollectionManager.Remove:Remove 234 232 CDM.SubcollectionManager.Source:Document attribute to match against: 235 CDM.SubcollectionManager.Subcollection:Defined Subcollection Filters236 233 CDM.SubcollectionManager.Subcollection_Controls:Define Filters 237 CDM.SubcollectionManager.Subindexes:Assigned Subcollection Partitions238 234 CDM.SubcollectionManager.Subindex_Controls:Assign Partitions 239 235 CDM.SubcollectionManager.Title:{39}{46}Partition Indexes{47}{34} 236 CDM.SubcollectionManager.Update:Update 237 CDM.SubcollectionIndexManager.Add_Subindex:Add New Subcollection Partition 238 CDM.SubcollectionIndexManager.Clear_Default_Subindex:Clear Default Subcollection Partition 239 CDM.SubcollectionIndexManager.Default_Subindex:Default: 240 CDM.SubcollectionIndexManager.PartitionName:Partition Name: 241 CDM.SubcollectionIndexManager.Remove_Subindex:Remove Subcollection Partition 242 CDM.SubcollectionIndexManager.Set_Default_Subindex:Set Default Subcollection Partition 243 CDM.SubcollectionIndexManager.Subcollection:Defined Subcollection Filters 244 CDM.SubcollectionIndexManager.Subindexes:Assigned Subcollection Partitions 240 245 CDM.SuperCollectionManager.Instructions:A supercollection is one where a single search is performed over several collections, as if all the collections were one. Specify the collections to include in the supercollection by clicking on the appropriate collection's name in the list below. The current collection will automatically be included. \nWARNING: If the individual collections do not have the same indexes (including subcollection partitions and language partitions) as each other, cross-collection searching will not work properly. The user will only be able to search using indexes common to all collections. 241 246 CDM.SuperCollectionManager.Title:{39}{46}Super-Collection Selection{47}{34} -
trunk/gli/languages.dat
r4293 r4933 1 1 ENGLISH EN GERMANIC 2 2 MAORI MI OCEANIC/INDONESIAN 3 #AFAR AA HAMITIC4 #ABKHAZIAN AB IBERO-CAUCASIAN5 #AFRIKAANS AF GERMANIC6 #AMHARIC AM SEMITIC7 3 ARABIC AR SEMITIC 8 #ASSAMESE AS INDIAN 9 #AYMARA AY AMERINDIAN 10 #AZERBAIJANI AZ TURKIC/ALTAIC 11 #BASHKIR BA TURKIC/ALTAIC 12 #BYELORUSSIAN BE SLAVIC 13 #BULGARIAN BG SLAVIC 14 #BIHARI BH INDIAN 15 #BISLAMA BI [not given] 16 #BENGALI(BANGLA) BN INDIAN 17 #TIBETAN BO ASIAN 18 #BRETON BR CELTIC 19 #CATALAN CA ROMANCE 20 #CORSICAN CO ROMANCE 21 #CZECH CS SLAVIC 22 #WELSH CY CELTIC 23 #DANISH DA GERMANIC 4 CHINESE ZH ASIAN 5 DUTCH NL GERMANIC 6 FRENCH FR ROMANCE 24 7 GERMAN DE GERMANIC 25 #BHUTANI DZ ASIAN 26 #GREEK EL LATIN/GREEK 27 #ESPERANTO EO INTERNATIONAL AUX. 8 HEBREW IW SEMITIC [*Changed back from HE in 2003 by us. Not valid iso639, HE] 9 INDONESIAN ID OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN] 10 ITALIAN IT ROMANCE 11 KAZAKH KZ TURKIC/ALTAIC [*Changed 2003 by us. Not valid iso639, KK] 12 PORTUGUESE PT ROMANCE 13 RUSSIAN RU SLAVIC 28 14 SPANISH ES ROMANCE 29 #ESTONIAN ET FINNO-UGRIC 30 #BASQUE EU BASQUE 31 #PERSIAN(FARSI) FA IRANIAN 32 #FINNISH FI FINNO-UGRIC 33 #FIJI FJ OCEANIC/INDONESIAN 34 #FAROESE FO GERMANIC 35 FRENCH FR ROMANCE 36 #FRISIAN FY GERMANIC 37 #IRISH GA CELTIC 38 #SCOTS(GAELIC) GD CELTIC 39 #GALICIAN GL ROMANCE 40 #GUARANI GN AMERINDIAN 41 #GUJARATI GU INDIAN 42 #HAUSA HA NEGRO-AFRICAN 43 HEBREW HE SEMITIC [*Changed 1989 from original ISO 639:1988, IW] 44 #HINDI HI INDIAN 45 #CROATIAN HR SLAVIC 46 #HUNGARIAN HU FINNO-UGRIC 47 #ARMENIAN HY INDO-EUROPEAN (OTHER) 48 #INTERLINGUA IA INTERNATIONAL AUX. 49 #INTERLINGUE IE INTERNATIONAL AUX. 50 #INUPIAK IK ESKIMO 51 INDONESIAN ID OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN] 52 #ICELANDIC IS GERMANIC 53 ITALIAN IT ROMANCE 54 #INUKTITUT IU [ ] 55 #JAPANESE JA ASIAN 56 #JAVANESE JV OCEANIC/INDONESIAN 57 #GEORGIAN KA IBERO-CAUCASIAN 58 #KAZAKH KK TURKIC/ALTAIC 59 #GREENLANDIC KL ESKIMO 60 #CAMBODIAN KM ASIAN 61 #KANNADA KN DRAVIDIAN 62 #KOREAN KO ASIAN 63 #KASHMIRI KS INDIAN 64 #KURDISH KU IRANIAN 65 #KIRGHIZ KY TURKIC/ALTAIC 66 #LATIN LA LATIN/GREEK 67 #LINGALA LN NEGRO-AFRICAN 68 #LAOTHIAN LO ASIAN 69 #LITHUANIAN LT BALTIC 70 #LATVIAN(LETTISH) LV BALTIC 71 #MALAGASY MG OCEANIC/INDONESIAN 72 #MACEDONIAN MK SLAVIC 73 #MALAYALAM ML DRAVIDIAN 74 #MONGOLIAN MN [not given] 75 #MOLDAVIAN MO ROMANCE 76 #MARATHI MR INDIAN 77 #MALAY MS OCEANIC/INDONESIAN 78 #MALTESE MT SEMITIC 79 #BURMESE MY ASIAN 80 #NAURU NA [not given] 81 #NEPALI NE INDIAN 82 DUTCH NL GERMANIC 83 #NORWEGIAN NO GERMANIC 84 #OCCITAN OC ROMANCE 85 #AFAN(OROMO) OM HAMITIC 86 #ORIYA OR INDIAN 87 #PUNJABI PA INDIAN 88 #POLISH PL SLAVIC 89 #PASHTO(PUSHTO) PS IRANIAN 90 #PORTUGUESE PT ROMANCE 91 #QUECHUA QU AMERINDIAN 92 #RHAETO-ROMANCE RM ROMANCE 93 #KURUNDI RN NEGRO-AFRICAN 94 #ROMANIAN RO ROMANCE 95 RUSSIAN RU SLAVIC 96 #KINYARWANDA RW NEGRO-AFRICAN 97 #SANSKRIT SA INDIAN 98 #SINDHI SD INDIAN 99 #SANGHO SG NEGRO-AFRICAN 100 #SERBO-CROATIAN SH SLAVIC 101 #SINGHALESE SI INDIAN 102 #SLOVAK SK SLAVIC 103 #SLOVENIAN SL SLAVIC 104 #SAMOAN SM OCEANIC/INDONESIAN 105 #SHONA SN NEGRO-AFRICAN 106 #SOMALI SO HAMITIC 107 #ALBANIAN SQ INDO-EUROPEAN (OTHER) 108 #SERBIAN SR SLAVIC 109 #SISWATI SS NEGRO-AFRICAN 110 #SESOTHO ST NEGRO-AFRICAN 111 #SUNDANESE SU OCEANIC/INDONESIAN 112 #SWEDISH SV GERMANIC 113 #SWAHILI SW NEGRO-AFRICAN 114 #TAMIL TA DRAVIDIAN 115 #TELUGU TE DRAVIDIAN 116 #TAJIK TG IRANIAN 117 #THAI TH ASIAN 118 #TIGRINYA TI SEMITIC 119 #TURKMEN TK TURKIC/ALTAIC 120 #TAGALOG TL OCEANIC/INDONESIAN 121 #SETSWANA TN NEGRO-AFRICAN 122 #TONGA TO OCEANIC/INDONESIAN 123 #TURKISH TR TURKIC/ALTAIC 124 #TSONGA TS NEGRO-AFRICAN 125 #TATAR TT TURKIC/ALTAIC 126 #TWI TW NEGRO-AFRICAN 127 #UIGUR UG [ ] 128 #UKRAINIAN UK SLAVIC 129 #URDU UR INDIAN 130 #UZBEK UZ TURKIC/ALTAIC 131 #VIETNAMESE VI ASIAN 132 #VOLAPUK VO INTERNATIONAL AUX. 133 #WOLOF WO NEGRO-AFRICAN 134 #XHOSA XH NEGRO-AFRICAN 135 #YIDDISH YI GERMANIC [*Changed 1989 from original ISO 639:1988, JI] 136 #YORUBA YO NEGRO-AFRICAN 137 #ZHUANG ZA [ ] 138 #CHINESE ZH ASIAN 139 #ZULU ZU NEGRO-AFRICAN 15 16 #Languages we don't actually have interfaces for 17 18 AFAR AA HAMITIC 19 ABKHAZIAN AB IBERO-CAUCASIAN 20 AFRIKAANS AF GERMANIC 21 AMHARIC AM SEMITIC 22 ASSAMESE AS INDIAN 23 AYMARA AY AMERINDIAN 24 AZERBAIJANI AZ TURKIC/ALTAIC 25 BASHKIR BA TURKIC/ALTAIC 26 BYELORUSSIAN BE SLAVIC 27 BULGARIAN BG SLAVIC 28 BIHARI BH INDIAN 29 BISLAMA BI [not given] 30 BENGALI(BANGLA) BN INDIAN 31 TIBETAN BO ASIAN 32 BRETON BR CELTIC 33 CATALAN CA ROMANCE 34 CORSICAN CO ROMANCE 35 CZECH CS SLAVIC 36 WELSH CY CELTIC 37 DANISH DA GERMANIC 38 BHUTANI DZ ASIAN 39 GREEK EL LATIN/GREEK 40 ESPERANTO EO INTERNATIONAL AUX. 41 ESTONIAN ET FINNO-UGRIC 42 BASQUE EU BASQUE 43 PERSIAN(FARSI) FA IRANIAN 44 FINNISH FI FINNO-UGRIC 45 FIJI FJ OCEANIC/INDONESIAN 46 FAROESE FO GERMANIC 47 FRISIAN FY GERMANIC 48 IRISH GA CELTIC 49 SCOTS(GAELIC) GD CELTIC 50 GALICIAN GL ROMANCE 51 GUARANI GN AMERINDIAN 52 GUJARATI GU INDIAN 53 HAUSA HA NEGRO-AFRICAN 54 HINDI HI INDIAN 55 CROATIAN HR SLAVIC 56 HUNGARIAN HU FINNO-UGRIC 57 ARMENIAN HY INDO-EUROPEAN (OTHER) 58 INTERLINGUA IA INTERNATIONAL AUX. 59 INTERLINGUE IE INTERNATIONAL AUX. 60 INUPIAK IK ESKIMO 61 ICELANDIC IS GERMANIC 62 INUKTITUT IU [ ] 63 JAPANESE JA ASIAN 64 JAVANESE JV OCEANIC/INDONESIAN 65 GEORGIAN KA IBERO-CAUCASIAN 66 GREENLANDIC KL ESKIMO 67 CAMBODIAN KM ASIAN 68 KANNADA KN DRAVIDIAN 69 KOREAN KO ASIAN 70 KASHMIRI KS INDIAN 71 KURDISH KU IRANIAN 72 KIRGHIZ KY TURKIC/ALTAIC 73 LATIN LA LATIN/GREEK 74 LINGALA LN NEGRO-AFRICAN 75 LAOTHIAN LO ASIAN 76 LITHUANIAN LT BALTIC 77 LATVIAN(LETTISH) LV BALTIC 78 MALAGASY MG OCEANIC/INDONESIAN 79 MACEDONIAN MK SLAVIC 80 MALAYALAM ML DRAVIDIAN 81 MONGOLIAN MN [not given] 82 MOLDAVIAN MO ROMANCE 83 MARATHI MR INDIAN 84 MALAY MS OCEANIC/INDONESIAN 85 MALTESE MT SEMITIC 86 BURMESE MY ASIAN 87 NAURU NA [not given] 88 NEPALI NE INDIAN 89 NORWEGIAN NO GERMANIC 90 OCCITAN OC ROMANCE 91 AFAN(OROMO) OM HAMITIC 92 ORIYA OR INDIAN 93 PUNJABI PA INDIAN 94 POLISH PL SLAVIC 95 PASHTO(PUSHTO) PS IRANIAN 96 QUECHUA QU AMERINDIAN 97 RHAETO-ROMANCE RM ROMANCE 98 KURUNDI RN NEGRO-AFRICAN 99 ROMANIAN RO ROMANCE 100 KINYARWANDA RW NEGRO-AFRICAN 101 SANSKRIT SA INDIAN 102 SINDHI SD INDIAN 103 SANGHO SG NEGRO-AFRICAN 104 SERBO-CROATIAN SH SLAVIC 105 SINGHALESE SI INDIAN 106 SLOVAK SK SLAVIC 107 SLOVENIAN SL SLAVIC 108 SAMOAN SM OCEANIC/INDONESIAN 109 SHONA SN NEGRO-AFRICAN 110 SOMALI SO HAMITIC 111 ALBANIAN SQ INDO-EUROPEAN (OTHER) 112 SERBIAN SR SLAVIC 113 SISWATI SS NEGRO-AFRICAN 114 SESOTHO ST NEGRO-AFRICAN 115 SUNDANESE SU OCEANIC/INDONESIAN 116 SWEDISH SV GERMANIC 117 SWAHILI SW NEGRO-AFRICAN 118 TAMIL TA DRAVIDIAN 119 TELUGU TE DRAVIDIAN 120 TAJIK TG IRANIAN 121 THAI TH ASIAN 122 TIGRINYA TI SEMITIC 123 TURKMEN TK TURKIC/ALTAIC 124 TAGALOG TL OCEANIC/INDONESIAN 125 SETSWANA TN NEGRO-AFRICAN 126 TONGA TO OCEANIC/INDONESIAN 127 TURKISH TR TURKIC/ALTAIC 128 TSONGA TS NEGRO-AFRICAN 129 TATAR TT TURKIC/ALTAIC 130 TWI TW NEGRO-AFRICAN 131 UIGUR UG [ ] 132 UKRAINIAN UK SLAVIC 133 URDU UR INDIAN 134 UZBEK UZ TURKIC/ALTAIC 135 VIETNAMESE VI ASIAN 136 VOLAPUK VO INTERNATIONAL AUX. 137 WOLOF WO NEGRO-AFRICAN 138 XHOSA XH NEGRO-AFRICAN 139 YIDDISH YI GERMANIC [*Changed 1989 from original ISO 639:1988, JI] 140 YORUBA YO NEGRO-AFRICAN 141 ZHUANG ZA [ ] 142 ZULU ZU NEGRO-AFRICAN -
trunk/gli/src/org/greenstone/gatherer/collection/BuildOptions.java
r4675 r4933 213 213 } 214 214 else if(node_name.equals("Desc")) { 215 argument.setDesc (MSMUtils.getValue(node));215 argument.setDescription(MSMUtils.getValue(node)); 216 216 } 217 217 else if(node_name.equals("Type")) { … … 219 219 } 220 220 else if(node_name.equals("Default")) { 221 argument.setDefault (MSMUtils.getValue(node));221 argument.setDefaultValue(MSMUtils.getValue(node)); 222 222 } 223 223 else if(node_name.equals("List")) { -
trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java
r4805 r4933 376 376 } 377 377 378 collection.cdm = new CollectionDesignManager( );378 collection.cdm = new CollectionDesignManager(new File(getCollectionConfig())); 379 379 collection.gdm = new GDMManager(); 380 380 … … 783 783 msm = collection.msm; // Legacy 784 784 collection.msm.load(); 785 collection.cdm = new CollectionDesignManager( );785 collection.cdm = new CollectionDesignManager(new File(collection_file.getParent(), Utility.CONFIG_DIR)); 786 786 collection.gdm = new GDMManager(); 787 787 // Tell everyone that it worked. … … 933 933 } 934 934 /** Determine if the manager is ready for actions apon its collection. 935 936 937 938 939 940 941 942 943 944 945 946 935 * @return A <i>boolean</i> which is <i>true</i> to indicate a collection has been loaded and thus the collection is ready for editing, <i>false</i> otherwise. 936 */ 937 938 public synchronized boolean ready() { 939 if(collection != null) { 940 return true; 941 } 942 else { 943 return false; 944 } 945 } 946 947 947 public synchronized boolean reallyReady() { 948 if(collection == null) {949 Gatherer.println("Called reallyReady() when collection was null.");950 Gatherer.println("Closing thread = " + closing_thread);951 Gatherer.println("This thread = " + Thread.currentThread());952 Gatherer.println("Thus we return: " + (closing_thread == null || closing_thread == Thread.currentThread() ? "not ready" : "ready"));953 }954 948 // If the closing thread is non-null we should only allow that thread to see the collection as closed. 955 949 if(closing_thread != null) { 956 957 958 959 960 961 962 963 950 // Only the closing thread sees the truth 951 if(Thread.currentThread() == closing_thread) { 952 return (collection == null); 953 } 954 // All other threads are told a lie. 955 else { 956 return true; 957 } 964 958 } 965 959 else { 966 967 968 969 970 971 972 } 973 960 if(collection != null) { 961 return true; 962 } 963 else { 964 return false; 965 } 966 } 967 } 974 968 /** Called to refresh the models upon which the trees are based. 975 976 969 * @see org.greenstone.gatherer.collection.Collection 970 */ 977 971 public void refreshTrees() { 978 972 } -
trunk/gli/src/org/greenstone/gatherer/gui/GConfigPane.java
r4675 r4933 63 63 ///atherer.println("CollectionChanged(" + ready + ")"); 64 64 if(ready) { 65 String filename = Gatherer.c_man.getCollectionConfig(); 66 if(cdm != null && cdm.getFilename().equals(filename)) { 67 return; 68 } 69 else { 70 if(cdm != null) { 71 cdm.destroy(); 72 cdm = null; 73 } 74 // Create a new config manager. 75 cdm = new CollectionDesignManager(); 76 // Parse the configuration file. 77 cdm.parse(filename); 78 // Display it. 79 cdm.display(this); 80 } 65 // Retrieve the new config manager. 66 cdm = Gatherer.c_man.getCollection().cdm; 67 // Display it. 68 cdm.display(this); 81 69 } 82 70 else { … … 96 84 cdm.gainFocus(); 97 85 } 98 public ArrayList getIndexes() {99 return cdm.getIndexes();100 }101 86 102 87 public ArrayList getLanguageCodes() { 103 return cdm.language s.getLanguageCodes();88 return cdm.language_manager.getLanguageCodes(); 104 89 } 105 90 -
trunk/gli/src/org/greenstone/gatherer/gui/OptionsPane.java
r4686 r4933 137 137 int total_height = PANE_SIZE.height; 138 138 for(int i = 0; i < build_argument_count; i++) { 139 139 // Retrieve the argument so we know how to format the control. 140 140 Argument argument = build_options.getBuildArgument(i); 141 141 // Now attempt to retrieve any existing value for this argument. 142 142 boolean enabled = build_options.getBuildValueEnabled(argument.getName()); 143 143 String value = build_options.getBuildValue(argument.getName()); … … 165 165 int total_height = PANE_SIZE.height; 166 166 for(int i = 0; i < import_argument_count; i++) { 167 167 // Retrieve the argument so we know how to format the control. 168 168 Argument argument = build_options.getImportArgument(i); 169 169 // Now attempt to retrieve any existing value for this argument. 170 170 boolean enabled = build_options.getImportValueEnabled(argument.getName()); 171 171 String value = build_options.getImportValue(argument.getName()); … … 372 372 this.argument = argument; 373 373 this.type = type; 374 String tooltip = Utility.formatHTMLWidth("<html>" + argument.getDesc () + "</html>", 60);375 374 String tooltip = Utility.formatHTMLWidth("<html>" + argument.getDescription() + "</html>", 60); 375 // Because of the dynamic order of component creation/connection/layout, we can't really follow that pattern here. 376 376 setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false)); 377 377 setBorder(BorderFactory.createEmptyBorder(2,0,2,0)); … … 379 379 setPreferredSize(ROW_SIZE); 380 380 381 382 383 384 385 386 381 /* 382 JPanel inner_pane = new JPanel(); 383 inner_pane.setOpaque(false); 384 */ 385 386 // Try to determine what the value_controls value should be. 387 387 if(value == null) { 388 388 value = argument.getDefaultValue(); 389 389 } 390 390 // Create a correct value control based on the argument provided. 391 391 switch(argument.getType()) { 392 392 case Argument.ENUM: … … 402 402 } 403 403 // Build an option model, wrapping each entry of the list table. 404 HashMap arg_list = argument.get List();404 HashMap arg_list = argument.getOptions(); 405 405 Iterator it = arg_list.keySet().iterator(); 406 406 while(it.hasNext()) { -
trunk/gli/src/org/greenstone/gatherer/mem/MetadataEditorManager.java
r4882 r4933 44 44 import javax.swing.tree.*; 45 45 import org.greenstone.gatherer.Gatherer; 46 import org.greenstone.gatherer.cdm.Language; 46 import org.greenstone.gatherer.cdm.LanguageListCellRenderer; 47 import org.greenstone.gatherer.cdm.LanguageManager; 47 48 import org.greenstone.gatherer.gui.ComboArea; 48 49 import org.greenstone.gatherer.gui.GComboBox; … … 581 582 language_label.setPreferredSize(LABEL_SIZE); 582 583 language_box = new JComboBox(Gatherer.g_man.config_pane.getLanguageCodes().toArray()); 584 language_box.setRenderer(new LanguageListCellRenderer()); 583 585 584 586 JPanel center_pane = new JPanel(); … … 906 908 // Add the attribute, even if one of the same name already exists. Maybe one day someone would like to enforce the occurance rules but not me and not today. 907 909 String name_str = name.getSelectedItem().toString(); 908 String language_code = ( (Language)language_box.getSelectedItem()).getCode();910 String language_code = (String) language_box.getSelectedItem(); 909 911 String value_str = value.getText(); 910 912 … … 1023 1025 if(!current_set.containsElement(name_str)) { 1024 1026 // Add it, 1025 String language_code = Gatherer.config.interface_language .getCode();1027 String language_code = Gatherer.config.interface_language; 1026 1028 ElementWrapper element = current_set.addElement(name_str, language_code); 1027 1029 // Then update the tree -
trunk/gli/src/org/greenstone/gatherer/msm/MSMUtils.java
r4674 r4933 146 146 return false; 147 147 } 148 149 /** Remove all of the child nodes from a certain node. */ 150 static final public void clear(Node parent) { 151 while(parent.hasChildNodes()) { 152 parent.removeChild(parent.getFirstChild()); 153 } 154 } 155 148 156 /** Method to determine if a certain path of elements can be found in another tree. This method tests by comparing node names, and finally the #text node past the leaf end of the path. 149 157 * @param tree The root <strong>Node</strong> of the tree to be searched. … … 719 727 static final public void setValue(Element element, String value) { 720 728 // Remove any existing child node(s) 721 while(element.hasChildNodes()) { 722 element.removeChild(element.getFirstChild()); 723 } 729 clear(element); 724 730 // Add new text node. 725 731 element.appendChild(element.getOwnerDocument().createTextNode(value)); -
trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java
r4837 r4933 1283 1283 } 1284 1284 } 1285 -
trunk/gli/src/org/greenstone/gatherer/shell/GBuildProgressMonitor.java
r4364 r4933 316 316 public void start() { 317 317 progress_bar.setValue(MIN); 318 num_indexes = Gatherer. g_man.config_pane.getIndexes().size();318 num_indexes = Gatherer.c_man.getCollection().cdm.index_manager.getSize(); 319 319 num_docs = import_progress.getNumberOfDocuments(); 320 320 } -
trunk/gli/src/org/greenstone/gatherer/util/EmailAddress.java
r4674 r4933 6 6 * University of Waikato, New Zealand. 7 7 * 8 * <BR><BR>9 *10 8 * Author: John Thompson, Greenstone Digital Library, University of Waikato 11 9 * 12 * <BR><BR>13 *14 10 * Copyright (C) 1999 New Zealand Digital Library Project 15 *16 * <BR><BR>17 11 * 18 12 * This program is free software; you can redistribute it and/or modify … … 21 15 * (at your option) any later version. 22 16 * 23 * <BR><BR>24 *25 17 * This program is distributed in the hope that it will be useful, 26 18 * but WITHOUT ANY WARRANTY; without even the implied warranty of 27 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 28 20 * GNU General Public License for more details. 29 *30 * <BR><BR>31 21 * 32 22 * You should have received a copy of the GNU General Public License … … 35 25 *######################################################################## 36 26 */ 37 38 39 40 41 42 43 /* GPL_HEADER */44 27 package org.greenstone.gatherer.util; 45 /************************************************************************************** 46 * Title: Gatherer 47 * Description: The Gatherer: a tool for gathering and enriching a digital collection. 48 * Company: The University of Waikato 49 * Written: 03/05/02 50 * Revised: 04/10/02 - Commented 51 **************************************************************************************/ 28 52 29 import java.awt.BorderLayout; 53 30 import java.awt.Color; … … 62 39 import org.greenstone.gatherer.Gatherer; 63 40 /** This class wraps an email address, separating address and host, and providing a pretty printer. 64 * @author John Thompson 65 * @version 2.3 41 * @author John Thompson, Greenstone Digital Library, University of Waikato 42 * @version 2.3d 66 43 */ 67 44 public class EmailAddress { -
trunk/gli/src/org/greenstone/gatherer/util/Utility.java
r4806 r4933 280 280 OutputFormat f = new OutputFormat(document); 281 281 f.setIndenting(true); 282 f.setLineWidth( 256);282 f.setLineWidth(0); 283 283 f.setPreserveSpace(false); 284 284 // Create the necessary writer stream for serialization. … … 792 792 catch (Exception error) { 793 793 if(noisey) { 794 error.printStackTrace(); 794 795 Gatherer.printStackTrace(error); 795 796 }
Note:
See TracChangeset
for help on using the changeset viewer.