Changeset 25635
- Timestamp:
- 2012-05-22T13:01:04+12:00 (12 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone
- Files:
-
- 94 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/admin/gui/ConfPane.java
r25163 r25635 81 81 82 82 protected JPanel main_contentPane = null; 83 public Hashtable conf_table;83 public Hashtable<Object, Object> conf_table; 84 84 85 85 /** The panel that contains a Conf_list */ … … 158 158 159 159 //An array to store all the details in the build.properties file 160 private ArrayList conf_array;160 private ArrayList<String> conf_array; 161 161 162 162 //Site configuration … … 172 172 public ConfPane() 173 173 { 174 conf_table = new Hashtable ();174 conf_table = new Hashtable<Object, Object>(); 175 175 // create all the control button panes 176 176 inner_control_pane = new JPanel(); … … 652 652 { 653 653 String new_string; 654 Enumeration keys = conf_table.keys();654 Enumeration<Object> keys = conf_table.keys(); 655 655 String key; 656 656 String value; … … 662 662 for (int j = 0; j < conf_array.size(); j++) 663 663 { 664 if ( ((String) conf_array.get(j)).startsWith(key.toLowerCase()))664 if (conf_array.get(j).startsWith(key.toLowerCase())) 665 665 { 666 666 new_string = key + "=" + value; … … 719 719 * store all the details from the build.properties 720 720 */ 721 conf_array = new ArrayList ();721 conf_array = new ArrayList<String>(); 722 722 conf_setting = new Object[rowLength][colLength]; 723 723 try -
main/trunk/greenstone3/src/java/org/greenstone/admin/gui/LogPane.java
r24408 r25635 93 93 private JPanel control_pane = null; 94 94 95 private ArrayList logFiles = new ArrayList();95 private ArrayList<File> logFiles = new ArrayList<File>(); 96 96 private File currentlySelectedFile = null; 97 97 … … 387 387 //no selection 388 388 } else if (log_list.getSelectedIndex () == 0 ) { 389 File log_file = (File)logFiles.get(0);389 File log_file = logFiles.get(0); 390 390 currentlySelectedFile = log_file; 391 391 String filename = log_file.getPath(); … … 394 394 clear_button.setEnabled(true); 395 395 } else if (log_list.getSelectedIndex () == 1) { 396 File log_file = (File)logFiles.get(1);396 File log_file = logFiles.get(1); 397 397 currentlySelectedFile = log_file; 398 398 String filename = log_file.getPath(); -
main/trunk/greenstone3/src/java/org/greenstone/admin/gui/SetServerPane.java
r24408 r25635 84 84 ServerSettingTableModel server_setting_table_model = null; 85 85 private boolean setting_confirm = false; 86 private ArrayList conf_array;86 private ArrayList<String> conf_array; 87 87 private boolean success = false; 88 88 private boolean file_saved = true; … … 251 251 if (!server_setting_table_model.getValueAt(i,1).toString().matches("^\\s*$")){ 252 252 for (int j=0; j < conf_array.size(); j++){ 253 if ( ((String)conf_array.get(j)).startsWith(server_setting_table_model.getValueAt(i,0).toString().toLowerCase())){253 if (conf_array.get(j).startsWith(server_setting_table_model.getValueAt(i,0).toString().toLowerCase())){ 254 254 //System.err.println("What is the value in conf_array:" + conf_array.get(j)); 255 255 new_string = server_setting_table_model.getValueAt(i,0).toString()+"="+server_setting_table_model.getValueAt(i,1).toString(); … … 265 265 String fileLine; 266 266 /*conf_array[] store all the details from the build.properties*/ 267 conf_array = new ArrayList ();267 conf_array = new ArrayList<String>(); 268 268 try { 269 269 BufferedReader conf_in = new BufferedReader(new FileReader(filename)); -
main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/Command.java
r22185 r25635 15 15 public class Command implements Runnable 16 16 { 17 HashMap _osCommands = new HashMap();17 HashMap<String, String> _osCommands = new HashMap<String, String>(); 18 18 CommandStep _parent = null; 19 19 … … 133 133 String currentos = System.getProperty("os.name"); 134 134 135 String command = (String)_osCommands.get(currentos);135 String command = _osCommands.get(currentos); 136 136 if(command != null){ 137 137 return command; … … 139 139 140 140 if(currentos.contains("Windows")){ 141 command = (String)_osCommands.get("Windows");141 command = _osCommands.get("Windows"); 142 142 143 143 if(command != null){ … … 145 145 } 146 146 } 147 return (String)_osCommands.get("default");147 return _osCommands.get("default"); 148 148 } 149 149 -
main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/CommandStep.java
r21919 r25635 27 27 public class CommandStep extends Step 28 28 { 29 protected ArrayList _commandsAndCallbacks = new ArrayList();29 protected ArrayList<Runnable> _commandsAndCallbacks = new ArrayList<Runnable>(); 30 30 protected LoggedMessageArea _messageArea = new LoggedMessageArea(this.getClass()); 31 31 protected int _threadCount = -1; … … 85 85 86 86 _threadCount = 0; 87 Thread newThread = new Thread( (Runnable)_commandsAndCallbacks.get(0));87 Thread newThread = new Thread(_commandsAndCallbacks.get(0)); 88 88 newThread.start(); 89 89 } … … 106 106 107 107 if(_threadCount < _commandsAndCallbacks.size()){ 108 Thread newThread = new Thread( (Runnable)_commandsAndCallbacks.get(_threadCount));108 Thread newThread = new Thread(_commandsAndCallbacks.get(_threadCount)); 109 109 newThread.start(); 110 110 } -
main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/DownloadStep.java
r23582 r25635 123 123 String defaultDownloadLocation = GAI.getGSDL3ExtensionHome() + System.getProperty("file.separator") + fileStem; 124 124 125 ArrayList sourceElements = new ArrayList();125 ArrayList<Source> sourceElements = new ArrayList<Source>(); 126 126 sourceElements.add(_mainSource); 127 127 … … 134 134 for(int i = 0; i < sourceElements.size(); i++){ 135 135 136 Source currentSource = (Source)sourceElements.get(i);136 Source currentSource = sourceElements.get(i); 137 137 String destinationFolder = null; 138 138 -
main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/ExtPane.java
r22085 r25635 79 79 protected DefaultMutableTreeNode top = new DefaultMutableTreeNode("Extension List"); 80 80 81 protected HashMap extensionInformation = null;81 protected HashMap<String, ArrayList> extensionInformation = null; 82 82 83 83 protected JPanel extensionContentHeaderPane = null; … … 97 97 98 98 protected Element extFileRootElement = null; 99 protected HashMap extensions = null;99 protected HashMap<String, ExtensionInformation> extensions = null; 100 100 protected HashMap extClasses = null; 101 101 protected Properties dependencies = new Properties(); … … 119 119 current_description_pane = new JPanel(); 120 120 extensionContentHeaderPane = new JPanel(); 121 extensionInformation = new HashMap ();121 extensionInformation = new HashMap<String, ArrayList>(); 122 122 123 123 // Extension_Pane … … 137 137 Element[] extensionElements = ExtXMLHelper.getMultipleChildElements(extFileRootElement, ExtXMLHelper.EXTENSION, true); 138 138 if(extensionElements != null){ 139 extensions = new HashMap ();139 extensions = new HashMap<String, ExtensionInformation>(); 140 140 141 141 for(int i = 0; i < extensionElements.length; i++){ … … 153 153 154 154 load_Admin_UI(); 155 HashMap projectNameMap = getProjectList();156 Set s = projectNameMap.keySet();157 Iterator it = s.iterator();155 HashMap<String, ArrayList<String>> projectNameMap = getProjectList(); 156 Set<String> s = projectNameMap.keySet(); 157 Iterator<String> it = s.iterator(); 158 158 int i = 0; 159 159 160 160 while(it.hasNext()){ 161 String projectNameGroup = (String)it.next();162 ArrayList alist = (ArrayList)projectNameMap.get(projectNameGroup);161 String projectNameGroup = it.next(); 162 ArrayList alist = projectNameMap.get(projectNameGroup); 163 163 DefaultMutableTreeNode projecti = new DefaultMutableTreeNode (projectNameGroup); 164 164 … … 243 243 } 244 244 245 protected HashMap getProjectList(){246 247 HashMap projectGroupMap = new HashMap();245 protected HashMap<String, ArrayList<String>> getProjectList(){ 246 247 HashMap<String, ArrayList<String>> projectGroupMap = new HashMap<String, ArrayList<String>>(); 248 248 Element rootNode = extFileRootElement; 249 249 NodeList projectList = rootNode.getElementsByTagName(ExtXMLHelper.EXTENSION); … … 259 259 260 260 if(projectGroupMap.containsKey(group)){ 261 ArrayList alist = (ArrayList)projectGroupMap.get(group);261 ArrayList<String> alist = projectGroupMap.get(group); 262 262 alist.add(name); 263 263 projectGroupMap.put(group, alist); 264 264 } 265 265 else{ 266 ArrayList alist = new ArrayList();266 ArrayList<String> alist = new ArrayList<String>(); 267 267 alist.add(name); 268 268 projectGroupMap.put(group, alist); … … 286 286 } 287 287 288 ExtensionInformation info = (ExtensionInformation)extensions.get(option);288 ExtensionInformation info = extensions.get(option); 289 289 290 290 if(info != null){ … … 488 488 JPanel buttonPane = new JPanel(); 489 489 490 ExtensionInformation extension = (ExtensionInformation)extensions.get(projectName);490 ExtensionInformation extension = extensions.get(projectName); 491 491 492 492 String gsdl3ExtHome = GAI.getGSDL3ExtensionHome(); -
main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/ExtensionInformation.java
r21990 r25635 78 78 //Load the dynamic jar loader 79 79 URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader(); 80 Class sysclass = URLClassLoader.class;80 Class<URLClassLoader> sysclass = URLClassLoader.class; 81 81 final Class[] parameters = new Class[]{URL.class}; 82 82 Method method = null; -
main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/PropertiesStep.java
r22185 r25635 60 60 OptionList[] _modifiedOptionLists = null; 61 61 62 HashMap _optionListTableMap = new HashMap();62 HashMap<OptionList, PropertyTable> _optionListTableMap = new HashMap<OptionList, PropertyTable>(); 63 63 64 64 public PropertiesStep(Element propertiesStepElement, SequenceList parent) … … 106 106 public JTable getTableFromOptionList(OptionList list) 107 107 { 108 return ((JTable)_optionListTableMap.get(list));108 return _optionListTableMap.get(list); 109 109 } 110 110 … … 565 565 566 566 567 public Class getColumnClass(int c) {567 public Class<? extends Object> getColumnClass(int c) { 568 568 return getValueAt(0, c).getClass(); 569 569 } -
main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/SequenceList.java
r22185 r25635 16 16 public class SequenceList 17 17 { 18 protected ArrayList _steps = new ArrayList();18 protected ArrayList<Step> _steps = new ArrayList<Step>(); 19 19 protected ExtensionInformation _parent = null; 20 20 protected Properties _dependencies = null; … … 77 77 public Step[] getSteps() 78 78 { 79 return ( Step[])(_steps.toArray(new Step[0]));79 return (_steps.toArray(new Step[0])); 80 80 } 81 81 … … 89 89 JButton[] buttons = new JButton[_steps.size()]; 90 90 for(int i = 0; i < _steps.size(); i++){ 91 buttons[i] = ((Step)_steps.get(i)).getButton();91 buttons[i] = _steps.get(i).getButton(); 92 92 } 93 93 … … 152 152 { 153 153 Step rollbackStep = null; 154 ArrayList dependsSteps = new ArrayList();155 for(int i = 0; i < _steps.size(); i++){ 156 if(( (Step)(_steps.get(i))).getId().equals(id)){157 rollbackStep = (Step)_steps.get(i);154 ArrayList<String> dependsSteps = new ArrayList<String>(); 155 for(int i = 0; i < _steps.size(); i++){ 156 if((_steps.get(i)).getId().equals(id)){ 157 rollbackStep = _steps.get(i); 158 158 } 159 159 160 String[] depends = ((Step)_steps.get(i)).getDependsOn().split(",");160 String[] depends = _steps.get(i).getDependsOn().split(","); 161 161 162 162 for(int j = 0; j < depends.length; j++){ 163 163 if(depends[j].equals(id)){ 164 dependsSteps.add( ((Step)_steps.get(i)).getId());164 dependsSteps.add(_steps.get(i).getId()); 165 165 } 166 166 } … … 170 170 171 171 for(int i = 0; i < dependsSteps.size(); i++){ 172 rollbackToRecursive( (String)dependsSteps.get(i));172 rollbackToRecursive(dependsSteps.get(i)); 173 173 } 174 174 } … … 177 177 { 178 178 for(int i = 0; i < _steps.size(); i++){ 179 Step currentStep = (Step)_steps.get(i);179 Step currentStep = _steps.get(i); 180 180 if(currentStep instanceof PropertiesStep){ 181 181 ((PropertiesStep)currentStep).setPropertiesToDefaults(); … … 211 211 212 212 for(int i = 0; i < _steps.size(); i++){ 213 Step currentStep = (Step)_steps.get(i);213 Step currentStep = _steps.get(i); 214 214 JButton currentButton = currentStep.getButton(); 215 215 -
main/trunk/greenstone3/src/java/org/greenstone/applet/phind/ResultCanvas.java
r3658 r25635 76 76 int firstItemDisplayed; 77 77 int itemSelected; 78 Vector items;78 Vector<ResultItem> items; 79 79 80 80 // the background image … … 95 95 lineSpacing = phind.fontSize + 2; 96 96 97 items = new Vector ();97 items = new Vector<ResultItem>(); 98 98 numberOfItems = 0; 99 99 firstItemDisplayed = 0; … … 132 132 int index = 0; 133 133 while ((index < numberOfItems) && 134 ((item.sort < ((ResultItem) items.elementAt(index)).sort) ||135 ((item.sort == ((ResultItem) items.elementAt(index)).sort) &&136 (item.frequency <= ((ResultItem) items.elementAt(index)).frequency)))) {134 ((item.sort < items.elementAt(index).sort) || 135 ((item.sort == items.elementAt(index).sort) && 136 (item.frequency <= items.elementAt(index).frequency)))) { 137 137 index++; 138 138 } … … 160 160 int index = 0; 161 161 while (!found && (index < numberOfItems)) { 162 if ( ((ResultItem) items.elementAt(index)).isMorePhrases()) {162 if (items.elementAt(index).isMorePhrases()) { 163 163 found = true; 164 164 } else { … … 192 192 int index = 0; 193 193 while (!found && (index < numberOfItems)) { 194 if ( ((ResultItem) items.elementAt(index)).isMoreDocuments()) {194 if (items.elementAt(index).isMoreDocuments()) { 195 195 found = true; 196 196 } else { … … 225 225 int index = 0; 226 226 while (!found && (index < numberOfItems)) { 227 if ( ((ResultItem) items.elementAt(index)).isMoreLinks()) {227 if (items.elementAt(index).isMoreLinks()) { 228 228 found = true; 229 229 } else { … … 332 332 333 333 // Get the resultItem to output 334 result = (ResultItem)items.elementAt(i);334 result = items.elementAt(i); 335 335 336 336 // Graphics settings for drawing this line … … 436 436 437 437 // Get the resultItem to output 438 result = (ResultItem)items.elementAt(i);438 result = items.elementAt(i); 439 439 docsText = result.docsText(); 440 440 freqText = result.freqText(); … … 495 495 int rowSelected = event.getY() / lineSpacing; 496 496 itemSelected = rowSelected + firstItemDisplayed; 497 ResultItem item = (ResultItem)items.elementAt(itemSelected);497 ResultItem item = items.elementAt(itemSelected); 498 498 499 499 if (itemSelected <= numberOfItems) { -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/Library2.java
r24993 r25635 47 47 protected Document doc = null; 48 48 49 protected HashMap saved_args = null;49 protected HashMap<String, String> saved_args = null; 50 50 protected GSParams params = null; 51 51 protected DefaultReceptionist recept = null; … … 55 55 this.converter = new XMLConverter(); 56 56 this.doc = converter.newDOM(); 57 this.saved_args = new HashMap ();57 this.saved_args = new HashMap<String, String>(); 58 58 this.params = new GSParams(); 59 59 this.recept = new DefaultReceptionist(); … … 63 63 { 64 64 65 HashMap config_params = new HashMap();65 HashMap<String, Comparable> config_params = new HashMap<String, Comparable>(); 66 66 //config_params.put(GSConstants.GSDL3_HOME, gsdl_home); 67 67 config_params.put(GSConstants.SITE_NAME, site_name); … … 140 140 String action = "p"; 141 141 String subaction = "home"; 142 String lang = (String)saved_args.get(GSParams.LANGUAGE);142 String lang = saved_args.get(GSParams.LANGUAGE); 143 143 if (lang == null) 144 144 { … … 193 193 194 194 // put in all the params from the session cache 195 Set params = saved_args.keySet();196 Iterator i = params.iterator();195 Set<String> params = saved_args.keySet(); 196 Iterator<String> i = params.iterator(); 197 197 while (i.hasNext()) 198 198 { 199 String name = (String)i.next();199 String name = i.next(); 200 200 if (name.equals(GSParams.LANGUAGE)) 201 201 continue; 202 202 Element param = this.doc.createElement(GSXML.PARAM_ELEM); 203 203 param.setAttribute(GSXML.NAME_ATT, name); 204 param.setAttribute(GSXML.VALUE_ATT, GSXML.xmlSafe( (String)saved_args.get(name)));204 param.setAttribute(GSXML.VALUE_ATT, GSXML.xmlSafe(saved_args.get(name))); 205 205 xml_param_list.appendChild(param); 206 206 } -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java
r25425 r25635 11 11 import org.w3c.dom.NodeList; 12 12 import java.io.*; 13 13 14 import javax.servlet.*; 14 15 import javax.servlet.http.*; … … 90 91 * form: sid -> (UserSessionCache object) 91 92 */ 92 protected Hashtable session_ids_table = new Hashtable();93 protected Hashtable<String, UserSessionCache> session_ids_table = new Hashtable<String, UserSessionCache>(); 93 94 94 95 /** … … 156 157 } 157 158 158 HashMap config_params = new HashMap();159 HashMap<String, Comparable> config_params = new HashMap<String, Comparable>(); 159 160 160 161 config_params.put(GSConstants.LIBRARY_NAME, library_name); … … 310 311 * param_value) 311 312 */ 312 protected Hashtable coll_name_params_table = null;313 314 public UserSessionCache(String id, Hashtable table)313 protected Hashtable<String, Hashtable<String, String>> coll_name_params_table = null; 314 315 public UserSessionCache(String id, Hashtable<String, Hashtable<String, String>> table) 315 316 { 316 317 session_id = id; … … 326 327 } 327 328 328 protected Hashtable getParamsTable()329 protected Hashtable<String, Hashtable<String, String>> getParamsTable() 329 330 { 330 331 return coll_name_params_table; … … 517 518 if (clean_all) 518 519 { 519 session_ids_table = new Hashtable ();520 session_ids_table = new Hashtable<String, UserSessionCache>(); 520 521 session.removeAttribute(GSXML.USER_SESSION_CACHE_ATT); 521 522 } … … 523 524 { 524 525 // just clean up info for clean_collection 525 ArrayList cache_list = new ArrayList(session_ids_table.values());526 ArrayList<UserSessionCache> cache_list = new ArrayList<UserSessionCache>(session_ids_table.values()); 526 527 for (int i = 0; i < cache_list.size(); i++) 527 528 { 528 UserSessionCache cache = (UserSessionCache)cache_list.get(i);529 UserSessionCache cache = cache_list.get(i); 529 530 cache.cleanupCache(clean_collection); 530 531 } … … 555 556 556 557 UserSessionCache session_cache = null; 557 Hashtable param_table = null;558 Hashtable table = null;558 Hashtable<String, Hashtable<String, String>> param_table = null; 559 Hashtable<String, String> table = null; 559 560 String sid = session.getId(); 560 561 if (should_cache == true && cache_key != null && !cache_key.equals("")) … … 562 563 if (session_ids_table.containsKey(sid)) 563 564 { 564 session_cache = (UserSessionCache)session_ids_table.get(sid);565 session_cache = session_ids_table.get(sid); 565 566 param_table = session_cache.getParamsTable(); 566 567 logger.info("collections in table: " + tableToString(param_table)); … … 568 569 { 569 570 //logger.info("existing table: " + collection); 570 table = (Hashtable)param_table.get(cache_key);571 table = param_table.get(cache_key); 571 572 } 572 573 else 573 574 { 574 table = new Hashtable ();575 table = new Hashtable<String, String>(); 575 576 param_table.put(cache_key, table); 576 577 //logger.info("new table: " + collection); … … 579 580 else 580 581 { 581 param_table = new Hashtable ();582 table = new Hashtable ();582 param_table = new Hashtable<String, Hashtable<String, String>>(); 583 table = new Hashtable<String, String>(); 583 584 param_table.put(cache_key, table); 584 585 session_cache = new UserSessionCache(sid, param_table); … … 642 643 if (table != null) 643 644 { 644 Enumeration keys = table.keys();645 Enumeration<String> keys = table.keys(); 645 646 while (keys.hasMoreElements()) 646 647 { 647 String name = (String)keys.nextElement();648 session.setAttribute(name, (String)table.get(name));648 String name = keys.nextElement(); 649 session.setAttribute(name, table.get(name)); 649 650 } 650 651 } … … 691 692 for (int j = 0; j < httpHeaders.size(); j++) 692 693 { 693 Map nameValueMap = (Map)httpHeaders.get(j);694 Map nameValueMap = httpHeaders.get(j); 694 695 String name = (String) nameValueMap.get("name"); 695 696 String value = (String) nameValueMap.get("value"); … … 825 826 else 826 827 { 827 HashMap responseParams = GSXML.extractParams(responseParamList, true);828 HashMap<String, Serializable> responseParams = GSXML.extractParams(responseParamList, true); 828 829 String groups = (String) responseParams.get(GSXML.GROUPS_ATT); 829 830 … … 910 911 911 912 //a debugging method 912 private void displaySize(Hashtable table)913 private void displaySize(Hashtable<String, UserSessionCache> table) 913 914 { 914 915 if (table == null) … … 923 924 } 924 925 int num_cached_coll = 0; 925 ArrayList cache_list = new ArrayList(table.values());926 ArrayList<UserSessionCache> cache_list = new ArrayList<UserSessionCache>(table.values()); 926 927 for (int i = 0; i < cache_list.size(); i++) 927 928 { 928 num_cached_coll += ((UserSessionCache) cache_list.get(i)).tableSize();929 num_cached_coll += cache_list.get(i).tableSize(); 929 930 } 930 931 logger.info("Number of sessions : total number of cached collection info = " + table.size() + " : " + num_cached_coll); … … 932 933 933 934 /** merely a debugging method! */ 934 private String tableToString(Hashtable table)935 private String tableToString(Hashtable<String, Hashtable<String, String>> table) 935 936 { 936 937 String str = ""; 937 Enumeration keys = table.keys();938 Enumeration<String> keys = table.keys(); 938 939 while (keys.hasMoreElements()) 939 940 { 940 String name = (String)keys.nextElement();941 String name = keys.nextElement(); 941 942 str += name + ", "; 942 943 } -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/OAIServer.java
r23922 r25635 71 71 72 72 /** A HashSet which contains all the legal verbs. */ 73 protected HashSet verb_set = null;73 protected HashSet<String> verb_set = null; 74 74 /** A HashSet which contains all the legal oai keys in the key/value argument pair. */ 75 protected HashSet param_set = null;75 protected HashSet<String> param_set = null; 76 76 /** The name of the site with which we will finally be dealing, whether it is a local site or a remote site through a communicator.*/ 77 77 protected String site = ""; … … 209 209 } 210 210 private void initVerbs() { 211 verb_set = new HashSet ();211 verb_set = new HashSet<String>(); 212 212 verb_set.add(OAIXML.GET_RECORD); 213 213 verb_set.add(OAIXML.LIST_RECORDS); … … 219 219 220 220 private void initParams() { 221 param_set = new HashSet ();221 param_set = new HashSet<String>(); 222 222 param_set.add(OAIXML.METADATA_PREFIX); 223 223 param_set.add(OAIXML.FROM); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java
r25302 r25635 23 23 24 24 /** the system set up variables */ 25 protected HashMap config_params = null;25 protected HashMap<String, Comparable> config_params = null; 26 26 /** container Document to create XML Nodes */ 27 27 protected Document doc = null; … … 43 43 44 44 /** the config variables must be set before configure is called */ 45 public void setConfigParams(HashMap params)45 public void setConfigParams(HashMap<String, Comparable> params) 46 46 { 47 47 this.config_params = params; … … 92 92 } 93 93 94 protected void getRequiredMetadataNames(Element format, HashSet meta_names)94 protected void getRequiredMetadataNames(Element format, HashSet<String> meta_names) 95 95 { 96 96 extractMetadataNames(format, meta_names); … … 98 98 } 99 99 100 protected void extractMetadataNames(Element format, HashSet meta_names)100 protected void extractMetadataNames(Element format, HashSet<String> meta_names) 101 101 { 102 102 //NodeList nodes = format.getElementsByTagNameNS("metadata", "http://www.greenstone.org/configformat"); … … 133 133 } 134 134 135 protected void addLinkMetadataNames(Element format, HashSet meta_names)135 protected void addLinkMetadataNames(Element format, HashSet<String> meta_names) 136 136 { 137 137 // The XSL tranform for … … 187 187 } 188 188 189 protected Element createMetadataParamList(HashSet metadata_names)189 protected Element createMetadataParamList(HashSet<String> metadata_names) 190 190 { 191 191 Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 192 192 193 193 Element param = null; 194 Iterator i = metadata_names.iterator();194 Iterator<String> i = metadata_names.iterator(); 195 195 while (i.hasNext()) 196 196 { 197 String name = (String)i.next();197 String name = i.next(); 198 198 param = this.doc.createElement(GSXML.PARAM_ELEM); 199 199 param_list.appendChild(param); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/AppletAction.java
r24993 r25635 11 11 import java.util.HashMap; 12 12 import java.io.File; 13 import java.io.Serializable; 13 14 14 15 import org.apache.log4j.*; … … 32 33 // get the collection and service params 33 34 Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 34 HashMap params = GSXML.extractParams(cgi_param_list, false);35 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 35 36 36 37 // request_type is display (d) or request (r) -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/BrowseAction.java
r25128 r25635 13 13 import java.util.Vector; 14 14 import java.io.File; 15 import java.io.Serializable; 15 16 16 17 import org.apache.log4j.*; … … 47 48 // extract the params from the cgi-request, and check that we have a coll specified 48 49 Element cgi_paramList = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER); 49 HashMap params = GSXML.extractParams(cgi_paramList, false);50 HashMap<String, Serializable> params = GSXML.extractParams(cgi_paramList, false); 50 51 51 52 String service_name = (String)params.get(GSParams.SERVICE); … … 112 113 String top_id = OID.getTop(classifier_node); 113 114 114 HashSet metadata_names = new HashSet();115 HashSet<String> metadata_names = new HashSet<String>(); 115 116 116 117 // add the format info into the response -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java
r25355 r25635 35 35 import java.util.HashSet; 36 36 import java.io.File; 37 import java.io.Serializable; 37 38 38 39 import org.apache.log4j.*; … … 90 91 Element request = (Element) GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM); 91 92 Element cgi_paramList = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 92 HashMap params = GSXML.extractParams(cgi_paramList, false);93 HashMap<String, Serializable> params = GSXML.extractParams(cgi_paramList, false); 93 94 94 95 // just in case there are some that need to get passed to the services … … 360 361 // Create a parameter list to specify the required metadata information 361 362 362 HashSet meta_names = new HashSet();363 HashSet<String> meta_names = new HashSet<String>(); 363 364 meta_names.add("Title"); // the default 364 365 if (format_elem != null) … … 722 723 // do the query again to get term info 723 724 Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 724 HashMap params = GSXML.extractParams(cgi_param_list, false);725 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 725 726 726 727 HashMap previous_params = (HashMap) params.get("p"); … … 767 768 Element metadata_list = (Element) GSXML.getNodeByPath(mr_query_response, metadata_path); 768 769 769 HashSet query_term_variants = new HashSet();770 HashSet<String> query_term_variants = new HashSet<String>(); 770 771 NodeList equivalent_terms_nodelist = query_term_list_element.getElementsByTagName("equivTermList"); 771 772 if (equivalent_terms_nodelist == null || equivalent_terms_nodelist.getLength() == 0) … … 809 810 } 810 811 811 ArrayList phrase_query_term_variants_hierarchy = new ArrayList();812 ArrayList<ArrayList<HashSet<String>>> phrase_query_term_variants_hierarchy = new ArrayList<ArrayList<HashSet<String>>>(); 812 813 813 814 Element query_element = GSXML.getNamedElement(metadata_list, GSXML.METADATA_ELEM, GSXML.NAME_ATT, "query"); 814 815 String performed_query = GSXML.getNodeText(query_element) + " "; 815 816 816 ArrayList phrase_query_p_term_variants_list = new ArrayList();817 ArrayList<HashSet<String>> phrase_query_p_term_variants_list = new ArrayList<HashSet<String>>(); 817 818 int term_start = 0; 818 819 boolean in_term = false; … … 840 841 { 841 842 842 HashSet phrase_query_p_term_x_variants = new HashSet();843 HashSet<String> phrase_query_p_term_x_variants = new HashSet<String>(); 843 844 844 845 NodeList term_equivalent_terms_nodelist = term_element.getElementsByTagName("equivTermList"); … … 879 880 { 880 881 phrase_query_term_variants_hierarchy.add(phrase_query_p_term_variants_list); 881 phrase_query_p_term_variants_list = new ArrayList ();882 phrase_query_p_term_variants_list = new ArrayList<HashSet<String>>(); 882 883 } 883 884 } … … 898 899 } 899 900 900 phrase_query_p_term_variants_list = new ArrayList ();901 phrase_query_p_term_variants_list = new ArrayList<HashSet<String>>(); 901 902 } 902 903 } … … 908 909 * Highlights query terms in a piece of text. 909 910 */ 910 private Element highlightQueryTermsInternal(String content, HashSet query_term_variants, ArrayListphrase_query_term_variants_hierarchy)911 private Element highlightQueryTermsInternal(String content, HashSet<String> query_term_variants, ArrayList<ArrayList<HashSet<String>>> phrase_query_term_variants_hierarchy) 911 912 { 912 913 // Convert the content string to an array of characters for speed … … 915 916 916 917 // Now skim through the content, identifying word matches 917 ArrayList word_matches = new ArrayList();918 ArrayList<WordMatch> word_matches = new ArrayList<WordMatch>(); 918 919 int word_start = 0; 919 920 boolean in_word = false; … … 978 979 } 979 980 980 ArrayList highlight_start_positions = new ArrayList();981 ArrayList highlight_end_positions = new ArrayList();981 ArrayList<Integer> highlight_start_positions = new ArrayList<Integer>(); 982 ArrayList<Integer> highlight_end_positions = new ArrayList<Integer>(); 982 983 983 984 // Deal with phrases now 984 ArrayList partial_phrase_matches = new ArrayList();985 ArrayList<PartialPhraseMatch> partial_phrase_matches = new ArrayList<PartialPhraseMatch>(); 985 986 for (int i = 0; i < word_matches.size(); i++) 986 987 { 987 WordMatch word_match = (WordMatch)word_matches.get(i);988 WordMatch word_match = word_matches.get(i); 988 989 989 990 // See if any partial phrase matches are extended by this word … … 992 993 for (int j = partial_phrase_matches.size() - 1; j >= 0; j--) 993 994 { 994 PartialPhraseMatch partial_phrase_match = (PartialPhraseMatch)partial_phrase_matches.remove(j);995 ArrayList phrase_query_p_term_variants_list = (ArrayList)phrase_query_term_variants_hierarchy.get(partial_phrase_match.query_phrase_number);995 PartialPhraseMatch partial_phrase_match = partial_phrase_matches.remove(j); 996 ArrayList phrase_query_p_term_variants_list = phrase_query_term_variants_hierarchy.get(partial_phrase_match.query_phrase_number); 996 997 HashSet phrase_query_p_term_x_variants = (HashSet) phrase_query_p_term_variants_list.get(partial_phrase_match.num_words_matched); 997 998 if (phrase_query_p_term_x_variants.contains(word_match.word)) … … 1006 1007 { 1007 1008 int last_highlight_index = highlight_end_positions.size() - 1; 1008 int last_highlight_end = ((Integer) highlight_end_positions.get(last_highlight_index)).intValue();1009 int last_highlight_end = highlight_end_positions.get(last_highlight_index).intValue(); 1009 1010 if (last_highlight_end > partial_phrase_match.start_position) 1010 1011 { 1011 1012 // There is an overlap, so remove the previous phrase match 1012 int last_highlight_start = ((Integer) highlight_start_positions.remove(last_highlight_index)).intValue();1013 int last_highlight_start = highlight_start_positions.remove(last_highlight_index).intValue(); 1013 1014 highlight_end_positions.remove(last_highlight_index); 1014 1015 partial_phrase_match.start_position = last_highlight_start; … … 1035 1036 for (int p = 0; p < phrase_query_term_variants_hierarchy.size(); p++) 1036 1037 { 1037 ArrayList phrase_query_p_term_variants_list = (ArrayList)phrase_query_term_variants_hierarchy.get(p);1038 ArrayList phrase_query_p_term_variants_list = phrase_query_term_variants_hierarchy.get(p); 1038 1039 HashSet phrase_query_p_term_1_variants = (HashSet) phrase_query_p_term_variants_list.get(0); 1039 1040 if (phrase_query_p_term_1_variants.contains(word_match.word)) … … 1060 1061 for (int i = 0; i < highlight_start_positions.size(); i++) 1061 1062 { 1062 int highlight_start = ((Integer) highlight_start_positions.get(i)).intValue();1063 int highlight_end = ((Integer) highlight_end_positions.get(i)).intValue();1063 int highlight_start = highlight_start_positions.get(i).intValue(); 1064 int highlight_end = highlight_end_positions.get(i).intValue(); 1064 1065 1065 1066 // Print anything before the highlight range -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/FormatAction.java
r24993 r25635 25 25 26 26 import java.io.PrintWriter; 27 import java.io.Serializable; 27 28 import java.io.StringWriter; 28 29 … … 48 49 // get the param list 49 50 Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER); 50 HashMap params = GSXML.extractParams(cgi_param_list, false);51 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 51 52 52 53 Element result = this.doc.createElement(GSXML.MESSAGE_ELEM); … … 75 76 Element page_response = this.doc.createElement(GSXML.RESPONSE_ELEM); 76 77 77 Iterator it = params.keySet().iterator();78 Iterator<String> it = params.keySet().iterator(); 78 79 79 80 if(subaction.equals("saveDocument")) -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/GS2BrowseAction.java
r25128 r25635 13 13 import java.util.Vector; 14 14 import java.io.File; 15 import java.io.Serializable; 15 16 16 17 import org.apache.log4j.*; … … 47 48 // extract the params from the cgi-request, and check that we have a coll specified 48 49 Element cgi_paramList = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 49 HashMap params = GSXML.extractParams(cgi_paramList, false);50 HashMap<String, Serializable> params = GSXML.extractParams(cgi_paramList, false); 50 51 51 52 String service_name = (String) params.get(GSParams.SERVICE); … … 107 108 // the id of the classifier is the top id of the selected node 108 109 String top_id = OID.getTop(classifier_node); 109 HashSet doc_meta_names = new HashSet();110 HashSet class_meta_names = new HashSet();110 HashSet<String> doc_meta_names = new HashSet<String>(); 111 HashSet<String> class_meta_names = new HashSet<String>(); 111 112 // add in the defaults 112 113 doc_meta_names.add("Title"); … … 358 359 } 359 360 360 protected void extractMetadataNames(Element new_format, HashSet doc_meta_names, HashSetclass_meta_names)361 protected void extractMetadataNames(Element new_format, HashSet<String> doc_meta_names, HashSet<String> class_meta_names) 361 362 { 362 363 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/GeneralAction.java
r25260 r25635 10 10 11 11 import java.io.File; 12 import java.io.Serializable; 12 13 import java.util.HashMap; 13 14 … … 41 42 // get the param list 42 43 Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 43 HashMap params = GSXML.extractParams(cgi_param_list, false);44 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 44 45 45 46 if (params.get("configChangeName") != null && params.get("configChangeValue") != null) -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/NoCollQueryAction.java
r24993 r25635 16 16 import java.util.Iterator; 17 17 import java.io.File; 18 import java.io.Serializable; 18 19 19 20 import org.apache.log4j.*; … … 62 63 // extract the params from the cgi-request, and check that we have a coll specified 63 64 Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 64 HashMap params = GSXML.extractParams(cgi_param_list, false);65 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 65 66 66 67 String request_type = (String) params.get(GSParams.REQUEST_TYPE); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java
r25128 r25635 12 12 import java.util.HashMap; 13 13 import java.io.File; 14 import java.io.Serializable; 14 15 15 16 import org.apache.log4j.*; … … 130 131 // extract the params from the cgi-request, 131 132 Element cgi_paramList = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 132 HashMap params = GSXML.extractParams(cgi_paramList, false);133 HashMap<String, Serializable> params = GSXML.extractParams(cgi_paramList, false); 133 134 134 135 String coll_name = (String) params.get(GSParams.COLLECTION); … … 214 215 // extract the params from the cgi-request, 215 216 Element cgi_paramList = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 216 HashMap params = GSXML.extractParams(cgi_paramList, false);217 HashMap<String, Serializable> params = GSXML.extractParams(cgi_paramList, false); 217 218 218 219 String coll_name = (String) params.get(GSParams.COLLECTION); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/ProcessAction.java
r24993 r25635 13 13 import java.util.Iterator; 14 14 import java.io.File; 15 import java.io.Serializable; 15 16 16 17 public class ProcessAction extends Action … … 33 34 // get the param list 34 35 Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 35 HashMap params = GSXML.extractParams(cgi_param_list, false);36 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 36 37 String service_name = (String) params.get(GSParams.SERVICE); 37 38 String cluster_name = (String) params.get(GSParams.CLUSTER); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java
r25128 r25635 16 16 import java.util.Iterator; 17 17 import java.io.File; 18 import java.io.Serializable; 18 19 19 20 import org.apache.log4j.*; … … 56 57 // extract the params from the cgi-request, and check that we have a coll specified 57 58 Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 58 HashMap params = GSXML.extractParams(cgi_param_list, false);59 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 59 60 60 61 String request_type = (String) params.get(GSParams.REQUEST_TYPE); … … 189 190 190 191 // get the metadata elements needed from the format statement if any 191 HashSet metadata_names = new HashSet();192 HashSet<String> metadata_names = new HashSet<String>(); 192 193 metadata_names.add("Title"); 193 194 // add in the format info to the stylesheet if there is any … … 246 247 247 248 /** this filters out some of the doc results for result paging */ 248 protected Element filterDocList(HashMap params, HashMap service_params, Element orig_doc_list)249 protected Element filterDocList(HashMap<String, Serializable> params, HashMap service_params, Element orig_doc_list) 249 250 { 250 251 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/SystemAction.java
r25580 r25635 24 24 25 25 import java.io.PrintWriter; 26 import java.io.Serializable; 26 27 import java.io.StringWriter; 27 28 … … 48 49 // get the param list 49 50 Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 50 HashMap params = GSXML.extractParams(cgi_param_list, false);51 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 51 52 52 53 Element result = this.doc.createElement(GSXML.MESSAGE_ELEM); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/XMLDocumentAction.java
r25490 r25635 17 17 import java.util.Iterator; 18 18 import java.io.File; 19 import java.io.Serializable; 19 20 20 21 /** action class for retrieving parts of XML documents */ … … 44 45 // extract the params from the cgi-request, and check that we have a coll specified 45 46 Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 46 HashMap params = GSXML.extractParams(cgi_param_list, false);47 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 47 48 48 49 String collection = (String) params.get(GSParams.COLLECTION); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java
r25609 r25635 124 124 { 125 125 sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection construction: new collection.")); 126 Vector command = new Vector();126 Vector<String> command = new Vector<String>(); 127 127 command.add("gs2_mkcol.pl"); 128 128 command.add("-site"); … … 133 133 command.add(this.collection_name); 134 134 String[] command_str = {}; 135 command_str = (String[])command.toArray(command_str);135 command_str = command.toArray(command_str); 136 136 if (runPerlCommand(command_str)) 137 137 { … … 162 162 command.add(this.collection_name); 163 163 String[] command_str = {}; 164 command_str = (String[])command.toArray(command_str);164 command_str = command.toArray(command_str); 165 165 166 166 if (runPerlCommand(command_str)) … … 186 186 187 187 String[] command_str = {}; 188 command_str = (String[])command.toArray(command_str);188 command_str = command.toArray(command_str); 189 189 190 190 if (runPerlCommand(command_str)) … … 231 231 232 232 /** extracts all the args from the xml and returns them in a Vector */ 233 protected Vector extractParameters(Element param_list)234 { 235 236 Vector args = new Vector();233 protected Vector<String> extractParameters(Element param_list) 234 { 235 236 Vector<String> args = new Vector<String>(); 237 237 if (param_list == null) 238 238 { -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java
r24993 r25635 32 32 33 33 import java.io.*; 34 import java.io.File;35 import java.io.RandomAccessFile;36 34 import java.util.HashMap; 37 35 import java.util.Iterator; … … 76 74 * 77 75 */ 78 protected HashMap service_map = null;76 protected HashMap<String, ServiceRack> service_map = null; 79 77 /** 80 78 * maps pseudo service names to real service names - needed if we have two 81 79 * services with the same name for one collection 82 80 */ 83 protected HashMap service_name_map = null;81 protected HashMap<String, String> service_name_map = null; 84 82 85 83 /** XML converter for String to DOM and vice versa */ … … 113 111 public void cleanUp() 114 112 { 115 Iterator i = this.service_map.values().iterator();113 Iterator<ServiceRack> i = this.service_map.values().iterator(); 116 114 while (i.hasNext()) 117 115 { 118 ServiceRack s = (ServiceRack)i.next();116 ServiceRack s = i.next(); 119 117 s.cleanUp(); 120 118 } … … 134 132 public ServiceCluster() 135 133 { 136 this.service_map = new HashMap ();137 this.service_name_map = new HashMap ();134 this.service_map = new HashMap<String, ServiceRack>(); 135 this.service_name_map = new HashMap<String, String>(); 138 136 this.converter = new XMLConverter(); 139 137 this.doc = this.converter.newDOM(); … … 491 489 if (this.service_name_map.containsKey(service)) 492 490 { 493 real_service = (String)this.service_name_map.get(service);491 real_service = this.service_name_map.get(service); 494 492 // need to change the to att in the request - give the real service name 495 493 to = request.getAttribute(GSXML.TO_ATT); … … 501 499 Element single_message = mess_doc.createElement(GSXML.MESSAGE_ELEM); 502 500 single_message.appendChild(request); 503 Node response_message = ((ModuleInterface) this.service_map.get(service)).process(single_message);501 Node response_message = this.service_map.get(service).process(single_message); 504 502 if (response_message != null) 505 503 { … … 884 882 } 885 883 886 public HashMap getServiceMap()884 public HashMap<String, ServiceRack> getServiceMap() 887 885 { 888 886 return service_map; -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java
r25580 r25635 84 84 85 85 /** map of names to Module objects */ 86 protected HashMap module_map=null;86 protected HashMap<String, ModuleInterface> module_map=null; 87 87 88 88 /** container Document to create XML Nodes */ … … 193 193 } 194 194 195 this.module_map = new HashMap ();195 this.module_map = new HashMap<String, ModuleInterface>(); 196 196 197 197 // This stuff may be done at a reconfigure also … … 291 291 if (this.module_map.containsKey(obj)) { 292 292 copied_request.setAttribute(GSXML.TO_ATT, this_mod); 293 result = ((ModuleInterface)this.module_map.get(obj)).process(mess);293 result = this.module_map.get(obj).process(mess); 294 294 if (result !=null ) { 295 295 // append the contents of the message to the mainResult - there will only be one response at this stage … … 326 326 return private_collection_list; 327 327 } 328 public HashMap getModuleMap() {328 public HashMap<String, ModuleInterface> getModuleMap() { 329 329 return module_map; 330 330 } … … 337 337 protected void cleanUpModuleMapEntire() { 338 338 if (this.module_map != null) { 339 Iterator i = this.module_map.values().iterator();339 Iterator<ModuleInterface> i = this.module_map.values().iterator(); 340 340 while (i.hasNext()) { 341 ((ModuleInterface)i.next()).cleanUp();341 i.next().cleanUp(); 342 342 i.remove(); 343 343 } … … 364 364 if (name.equals(potential_site_name)) {// there was no site 365 365 list.removeChild(item); 366 ModuleInterface m = (ModuleInterface)this.module_map.remove(name);366 ModuleInterface m = this.module_map.remove(name); 367 367 m.cleanUp(); // clean up any open files/connections etc 368 368 m=null; … … 851 851 852 852 logger.info("found the module"); 853 ModuleInterface m = (ModuleInterface)this.module_map.remove(name);853 ModuleInterface m = this.module_map.remove(name); 854 854 // also remove the xml bit from description list 855 855 if (type.equals(GSXML.COLLECTION_ELEM)) { -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java
r24440 r25635 321 321 * otherwise true. 322 322 */ 323 private boolean isValidParam(HashMap param_map, HashSetvalid_strs) {324 ArrayList param_list = new ArrayList(param_map.keySet());323 private boolean isValidParam(HashMap<String, String> param_map, HashSet<String> valid_strs) { 324 ArrayList<String> param_list = new ArrayList<String>(param_map.keySet()); 325 325 for(int i=0; i<param_list.size(); i++) { 326 if (valid_strs.contains( (String)param_list.get(i)) == false) {326 if (valid_strs.contains(param_list.get(i)) == false) { 327 327 return false; 328 328 } … … 333 333 // option: from, until, set, metadataPrefix, resumptionToken 334 334 // exceptions: badArgument, badResumptionToken, cannotDisseminateFormat, noRecordMatch, and noSetHierarchy 335 HashSet valid_strs = new HashSet();335 HashSet<String> valid_strs = new HashSet<String>(); 336 336 valid_strs.add(OAIXML.FROM); 337 337 valid_strs.add(OAIXML.UNTIL); … … 347 347 String token = ""; 348 348 349 HashMap param_map = OAIXML.getParamMap(params);349 HashMap<String, String> param_map = OAIXML.getParamMap(params); 350 350 if (!isValidParam(param_map, valid_strs)) { 351 351 logger.error("One of the params is invalid"); … … 353 353 } 354 354 // param keys are valid, but if there are any date params, check they're of the right format 355 String from = (String)param_map.get(OAIXML.FROM);355 String from = param_map.get(OAIXML.FROM); 356 356 if(from != null) { 357 357 Date from_date = OAIXML.getDate(from); … … 361 361 } 362 362 } 363 String until = (String)param_map.get(OAIXML.UNTIL);363 String until = param_map.get(OAIXML.UNTIL); 364 364 if(until != null) { 365 365 Date until_date = OAIXML.getDate(until); … … 389 389 if(request_set == true) { 390 390 boolean set_supported = false; 391 String set_spec_str = (String)param_map.get(OAIXML.SET);391 String set_spec_str = param_map.get(OAIXML.SET); 392 392 // get the collection name 393 393 //if setSpec is supported by this repository, it must be in the form: site_name:coll_name … … 409 409 if(param_map.containsKey(OAIXML.RESUMPTION_TOKEN)) { 410 410 // validate resumptionToken 411 token = (String)param_map.get(OAIXML.RESUMPTION_TOKEN);411 token = param_map.get(OAIXML.RESUMPTION_TOKEN); 412 412 logger.info("has resumptionToken" + token); 413 413 if(OAIXML.containsToken(token) == false) { … … 424 424 425 425 //Now that we got a prefix, check and see if it's supported by this repository 426 String prefix_value = (String)param_map.get(OAIXML.METADATA_PREFIX);426 String prefix_value = param_map.get(OAIXML.METADATA_PREFIX); 427 427 if (containsMetadataPrefix(prefix_value) == false) { 428 428 logger.error("requested prefix is not found in OAIConfig.xml"); … … 434 434 String verb = req.getAttribute(OAIXML.TO); 435 435 NodeList param_list = req.getElementsByTagName(OAIXML.PARAM); 436 ArrayList retain_param_list = new ArrayList();436 ArrayList<Element> retain_param_list = new ArrayList<Element>(); 437 437 for (int j=0; j<param_list.getLength(); j++) { 438 438 Element e = OAIXML.duplicateElement(msg.getOwnerDocument(), (Element)param_list.item(j), true); … … 449 449 msg.appendChild(req); 450 450 for (int j=0; j<retain_param_list.size(); j++) { 451 req.appendChild( (Element)retain_param_list.get(j));451 req.appendChild(retain_param_list.get(j)); 452 452 } 453 453 } … … 538 538 // option: from, until, set, metadataPrefix, and resumptionToken 539 539 // exceptions: badArgument, badResumptionToken, cannotDisseminateFormat, noRecordMatch, and noSetHierarchy 540 HashSet valid_strs = new HashSet();540 HashSet<String> valid_strs = new HashSet<String>(); 541 541 valid_strs.add(OAIXML.FROM); 542 542 valid_strs.add(OAIXML.UNTIL); … … 558 558 } 559 559 560 HashMap param_map = OAIXML.getParamMap(params);560 HashMap<String, String> param_map = OAIXML.getParamMap(params); 561 561 if (!isValidParam(param_map, valid_strs)) { 562 562 logger.error("One of the params is invalid"); … … 564 564 } 565 565 // param keys are valid, but if there are any date params, check they're of the right format 566 String from = (String)param_map.get(OAIXML.FROM);566 String from = param_map.get(OAIXML.FROM); 567 567 if(from != null) { 568 568 Date from_date = OAIXML.getDate(from); … … 572 572 } 573 573 } 574 String until = (String)param_map.get(OAIXML.UNTIL);574 String until = param_map.get(OAIXML.UNTIL); 575 575 Date until_date = null; 576 576 if(until != null) { … … 601 601 if(request_set == true) { 602 602 boolean set_supported = false; 603 String set_spec_str = (String)param_map.get(OAIXML.SET);603 String set_spec_str = param_map.get(OAIXML.SET); 604 604 // get the collection name 605 605 //if setSpec is supported by this repository, it must be in the form: site_name:coll_name … … 630 630 // store a new token if necessary. 631 631 //} 632 token = (String)param_map.get(OAIXML.RESUMPTION_TOKEN);632 token = param_map.get(OAIXML.RESUMPTION_TOKEN); 633 633 logger.info("has resumptionToken: " + token); 634 634 if(OAIXML.containsToken(token) == false) { … … 671 671 672 672 //Now that we got a prefix, check and see if it's supported by this repository 673 String prefix_value = (String)param_map.get(OAIXML.METADATA_PREFIX);673 String prefix_value = param_map.get(OAIXML.METADATA_PREFIX); 674 674 if (containsMetadataPrefix(prefix_value) == false) { 675 675 logger.error("requested prefix is not found in OAIConfig.xml"); … … 682 682 String verb = req.getAttribute(OAIXML.TO); 683 683 NodeList param_list = req.getElementsByTagName(OAIXML.PARAM); 684 ArrayList retain_param_list = new ArrayList();684 ArrayList<Element> retain_param_list = new ArrayList<Element>(); 685 685 for (int j=0; j<param_list.getLength(); j++) { 686 686 Element e = OAIXML.duplicateElement(msg.getOwnerDocument(), (Element)param_list.item(j), true); … … 698 698 msg.appendChild(req); 699 699 for (int j=0; j<retain_param_list.size(); j++) { 700 req.appendChild( (Element)retain_param_list.get(j));700 req.appendChild(retain_param_list.get(j)); 701 701 } 702 702 } … … 747 747 getRecords(list_records, record_list, 0, resume_after); 748 748 //An incomplete list is sent; append a resumptionToken element 749 Element token_elem = createResumptionTokenElement(num_records, 0, resume_after, true, (String)param_map.get(OAIXML.METADATA_PREFIX));749 Element token_elem = createResumptionTokenElement(num_records, 0, resume_after, true, param_map.get(OAIXML.METADATA_PREFIX)); 750 750 //store this token 751 751 OAIXML.addToken(token_elem); … … 768 768 getRecords(list_records, record_list, cursor, num_records); 769 769 //An incomplete list is sent; append a resumptionToken element 770 token_elem = createResumptionTokenElement(num_records, cursor, -1, false, (String)param_map.get(OAIXML.METADATA_PREFIX));770 token_elem = createResumptionTokenElement(num_records, cursor, -1, false, param_map.get(OAIXML.METADATA_PREFIX)); 771 771 list_records.appendChild(token_elem); 772 772 … … 775 775 //append required records to list_records (list is incomplete) 776 776 getRecords(list_records, record_list, cursor, cursor + resume_after); 777 token_elem = createResumptionTokenElement(num_records, cursor, cursor + resume_after, true, (String)param_map.get(OAIXML.METADATA_PREFIX));777 token_elem = createResumptionTokenElement(num_records, cursor, cursor + resume_after, true, param_map.get(OAIXML.METADATA_PREFIX)); 778 778 //store this token 779 779 OAIXML.addToken(token_elem); … … 1013 1013 Element get_record = OAIXML.createElement(OAIXML.GET_RECORD); 1014 1014 1015 HashSet valid_strs = new HashSet();1015 HashSet<String> valid_strs = new HashSet<String>(); 1016 1016 valid_strs.add(OAIXML.IDENTIFIER); 1017 1017 valid_strs.add(OAIXML.METADATA_PREFIX); … … 1019 1019 Element req = (Element)GSXML.getChildByTagName(msg, GSXML.REQUEST_ELEM); 1020 1020 NodeList params = GSXML.getChildrenByTagName(req, OAIXML.PARAM); 1021 HashMap param_map = OAIXML.getParamMap(params);1021 HashMap<String, String> param_map = OAIXML.getParamMap(params); 1022 1022 1023 1023 if(!isValidParam(param_map, valid_strs) || … … 1029 1029 } 1030 1030 1031 String prefix = (String)param_map.get(OAIXML.METADATA_PREFIX);1032 String identifier = (String)param_map.get(OAIXML.IDENTIFIER);1031 String prefix = param_map.get(OAIXML.METADATA_PREFIX); 1032 String identifier = param_map.get(OAIXML.IDENTIFIER); 1033 1033 1034 1034 // verify the metadata prefix -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/Page.java
r22085 r25635 2 2 3 3 import java.io.File; 4 import java.io.Serializable; 4 5 import java.util.HashMap; 5 6 … … 127 128 Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER); 128 129 if (cgi_param_list != null) { 129 HashMap params = GSXML.extractParams(cgi_param_list, false);130 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 130 131 collection = (String)params.get(GSParams.COLLECTION); 131 132 if (collection == null) collection = ""; -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/Receptionist.java
r25301 r25635 31 31 32 32 /** the set up variables */ 33 protected HashMap config_params = null;33 protected HashMap<String, Comparable> config_params = null; 34 34 /** container Document to create XML Nodes */ 35 35 protected Document doc = null; … … 42 42 43 43 /** the list of actions */ 44 protected HashMap action_map = null;44 protected HashMap<String, Action> action_map = null; 45 45 46 46 /** the list of params */ … … 49 49 50 50 /** the list of interfaces this is based on */ 51 protected ArrayList base_interfaces = null;51 protected ArrayList<String> base_interfaces = null; 52 52 53 53 public Receptionist() … … 55 55 this.converter = new XMLConverter(); 56 56 this.doc = this.converter.newDOM(); 57 this.action_map = new HashMap ();57 this.action_map = new HashMap<String, Action>(); 58 58 } 59 59 … … 67 67 } 68 68 69 public void setConfigParams(HashMap params)69 public void setConfigParams(HashMap<String, Comparable> params) 70 70 { 71 71 this.config_params = params; 72 72 } 73 73 74 public HashMap getConfigParams()74 public HashMap<String, Comparable> getConfigParams() 75 75 { 76 76 return this.config_params; … … 211 211 212 212 // find the appropriate action 213 Action a = (Action)this.action_map.get(action);213 Action a = this.action_map.get(action); 214 214 215 215 String action_name = null; … … 313 313 if (base_interfaces == null) 314 314 { 315 base_interfaces = new ArrayList ();315 base_interfaces = new ArrayList<String>(); 316 316 } 317 317 base_interfaces.add(base_interface); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java
r25445 r25635 17 17 import java.io.ByteArrayInputStream; 18 18 import java.io.File; 19 import java.io.Serializable; 19 20 import java.io.StringReader; 20 21 import java.io.StringWriter; … … 53 54 54 55 /** the list of xslt to use for actions */ 55 protected HashMap xslt_map = null;56 protected HashMap<String, String> xslt_map = null; 56 57 57 58 /** a transformer class to transform xml using xslt */ … … 64 65 { 65 66 super(); 66 this.xslt_map = new HashMap ();67 this.xslt_map = new HashMap<String, String>(); 67 68 this.transformer = new XMLTransformer(); 68 69 try … … 197 198 if (cgi_param_list != null) 198 199 { 199 HashMap params = GSXML.extractParams(cgi_param_list, false);200 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 200 201 if ((excerptID = (String) params.get(GSParams.EXCERPT_ID)) != null) 201 202 { … … 461 462 { 462 463 // Don't waste time getting all the parameters 463 HashMap params = GSXML.extractParams(cgi_param_list, false);464 HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false); 464 465 collection = (String) params.get(GSParams.COLLECTION); 465 466 if (collection == null) … … 883 884 { 884 885 String key = action + ":" + subaction; 885 name = (String)this.xslt_map.get(key);886 name = this.xslt_map.get(key); 886 887 } 887 888 // try the action by itself 888 889 if (name == null) 889 890 { 890 name = (String)this.xslt_map.get(action);891 name = this.xslt_map.get(action); 891 892 } 892 893 // now find the absolute path -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/selfContained/FilesDocumentStream.java
r3615 r25635 54 54 implements DocumentStream { 55 55 /** the files we've found so far */ 56 Vector files = new Vector();56 Vector<String> files = new Vector<String>(); 57 57 /** the directories we've found so far */ 58 Vector directories = new Vector();58 Vector<String> directories = new Vector<String>(); 59 59 60 60 /** … … 111 111 protected void expandIfNecessary() { 112 112 while (directories.size() > 0) { 113 String dirname = (String)directories.elementAt(0);113 String dirname = directories.elementAt(0); 114 114 directories.removeElement(dirname); 115 115 File dir = new File(dirname); … … 144 144 if (!hasNextDocument()) throw new Error("Doesn't have another Document"); 145 145 146 String filename = (String)files.elementAt(files.size() - 1);146 String filename = files.elementAt(files.size() - 1); 147 147 files.removeElementAt(files.size() - 1); 148 148 File file = new File(filename); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java
r25303 r25635 340 340 boolean want_info = false; 341 341 342 ArrayList info_types=new ArrayList();342 ArrayList<String> info_types=new ArrayList<String>(); 343 343 // The document structure information desired 344 344 boolean want_ancestors = false; … … 416 416 417 417 for (int j=0; j<info_types.size(); j++) { 418 String info_type = (String)info_types.get(j);418 String info_type = info_types.get(j); 419 419 String info_value = getStructureInfo(node_id, info_type); 420 420 if (info_value != null) { … … 511 511 512 512 // The metadata information required 513 ArrayList metadata_names_list = new ArrayList();513 ArrayList<String> metadata_names_list = new ArrayList<String>(); 514 514 boolean all_metadata = false; 515 515 // Process the request parameters … … 619 619 boolean recursive) 620 620 { 621 ArrayList child_ids = getChildrenIds(node_id);621 ArrayList<String> child_ids = getChildrenIds(node_id); 622 622 if (child_ids==null) return; 623 623 for (int i=0; i< child_ids.size(); i++) { 624 String child_id = (String)child_ids.get(i);624 String child_id = child_ids.get(i); 625 625 Element child_elem; 626 626 if (isDocumentId(child_id)) { … … 675 675 676 676 /** returns the list of sibling ids, including the specified node_id */ 677 protected ArrayList getSiblingIds(String node_id) {677 protected ArrayList<String> getSiblingIds(String node_id) { 678 678 String parent_id = getParentId(node_id); 679 679 if (parent_id == null) { … … 698 698 abstract protected String getRootId(String node_id); 699 699 /** returns a list of the child ids in order, null if no children */ 700 abstract protected ArrayList getChildrenIds(String node_id);700 abstract protected ArrayList<String> getChildrenIds(String node_id); 701 701 /** returns the node id of the parent node, null if no parent */ 702 702 abstract protected String getParentId(String node_id); … … 715 715 abstract protected Element getMetadataList(String node_id, 716 716 boolean all_metadata, 717 ArrayList metadata_names);717 ArrayList<String> metadata_names); 718 718 719 719 /** get the particular metadata (identified by the metadata name) for the classifier node node_id -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java
r25429 r25635 205 205 206 206 // The metadata information required 207 ArrayList metadata_names_list = new ArrayList();207 ArrayList<String> metadata_names_list = new ArrayList<String>(); 208 208 boolean all_metadata = false; 209 209 // Process the request parameters … … 353 353 boolean want_info = false; 354 354 355 ArrayList info_types = new ArrayList();355 ArrayList<String> info_types = new ArrayList<String>(); 356 356 // The document structure information desired 357 357 boolean want_ancestors = false; … … 440 440 for (int j = 0; j < info_types.size(); j++) 441 441 { 442 String info_type = (String)info_types.get(j);442 String info_type = info_types.get(j); 443 443 String info_value = getStructureInfo(doc_id, info_type); 444 444 if (info_value != null) … … 654 654 protected void addDescendants(Element doc, String doc_id, boolean recursive) 655 655 { 656 ArrayList child_ids = getChildrenIds(doc_id);656 ArrayList<String> child_ids = getChildrenIds(doc_id); 657 657 if (child_ids == null) 658 658 return; 659 659 for (int i = 0; i < child_ids.size(); i++) 660 660 { 661 String child_id = (String)child_ids.get(i);661 String child_id = child_ids.get(i); 662 662 Element child_elem = createDocNode(child_id); 663 663 doc.appendChild(child_elem); … … 707 707 708 708 /** returns the list of sibling ids, including the specified node_id */ 709 protected ArrayList getSiblingIds(String node_id)709 protected ArrayList<String> getSiblingIds(String node_id) 710 710 { 711 711 String parent_id = getParentId(node_id); … … 803 803 * implementation: return null 804 804 */ 805 protected ArrayList getChildrenIds(String node_id)805 protected ArrayList<String> getChildrenIds(String node_id) 806 806 { 807 807 return null; … … 821 821 * <metadataList><metadata name="xxx">value</metadata></metadataList> 822 822 */ 823 abstract protected Element getMetadataList(String doc_id, boolean all_metadata, ArrayList metadata_names) throws GSException;823 abstract protected Element getMetadataList(String doc_id, boolean all_metadata, ArrayList<String> metadata_names) throws GSException; 824 824 825 825 /** -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java
r25427 r25635 157 157 158 158 /** returns a list of the child ids in order, null if no children */ 159 protected ArrayList getChildrenIds(String node_id)159 protected ArrayList<String> getChildrenIds(String node_id) 160 160 { 161 161 DBInfo info = this.coll_db.getInfo(node_id); … … 170 170 return null; 171 171 } 172 ArrayList children = new ArrayList();172 ArrayList<String> children = new ArrayList<String>(); 173 173 StringTokenizer st = new StringTokenizer(contains, ";"); 174 174 while (st.hasMoreTokens()) … … 198 198 */ 199 199 // assumes only one value per metadata 200 protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList metadata_names) throws GSException200 protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList<String> metadata_names) throws GSException 201 201 { 202 202 Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER); … … 210 210 { 211 211 // return everything out of the database 212 Set keys = info.getKeys();213 Iterator it = keys.iterator();212 Set<String> keys = info.getKeys(); 213 Iterator<String> it = keys.iterator(); 214 214 while (it.hasNext()) 215 215 { 216 String key = (String)it.next();216 String key = it.next(); 217 217 //String value = info.getInfo(key); 218 Vector values = info.getMultiInfo(key);218 Vector<String> values = info.getMultiInfo(key); 219 219 for (int i = 0; i < values.size(); i++) 220 220 { 221 GSXML.addMetadata(this.doc, metadata_list, key, this.macro_resolver.resolve( (String)values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));221 GSXML.addMetadata(this.doc, metadata_list, key, this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id)); 222 222 } 223 223 } … … 228 228 for (int i = 0; i < metadata_names.size(); i++) 229 229 { 230 String meta_name = (String)metadata_names.get(i);230 String meta_name = metadata_names.get(i); 231 231 String value = getMetadata(node_id, info, meta_name, lang); 232 232 GSXML.addMetadata(this.doc, metadata_list, meta_name, value); … … 375 375 if (pos == -1) 376 376 { 377 Vector values = info.getMultiInfo(metadata);377 Vector<String> values = info.getMultiInfo(metadata); 378 378 if (values != null) 379 379 { … … 391 391 result.append(separator); 392 392 } 393 result.append(this.macro_resolver.resolve( (String)values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));393 result.append(this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id)); 394 394 } 395 395 return result.toString(); … … 482 482 { 483 483 // we have multiple meta 484 Vector values = relation_info.getMultiInfo(metadata);484 Vector<String> values = relation_info.getMultiInfo(metadata); 485 485 if (values != null) 486 486 { … … 496 496 result.append(separator); 497 497 } 498 result.append(this.macro_resolver.resolve( (String)values.elementAt(i), lang, MacroResolver.SCOPE_META, relation_id));498 result.append(this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, relation_id)); 499 499 } 500 500 } … … 522 522 else 523 523 { 524 Vector values = relation_info.getMultiInfo(metadata);524 Vector<String> values = relation_info.getMultiInfo(metadata); 525 525 if (values != null) 526 526 { … … 528 528 { 529 529 result.insert(0, separator); 530 result.insert(0, this.macro_resolver.resolve( (String)values.elementAt(i), lang, MacroResolver.SCOPE_META, relation_id));530 result.insert(0, this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, relation_id)); 531 531 } 532 532 } -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java
r25461 r25635 34 34 import java.util.Vector; 35 35 import java.io.File; 36 import java.io.Serializable; 36 37 37 38 import org.apache.log4j.*; … … 391 392 if (name.equals(LEVEL_PARAM)) 392 393 { 393 ArrayList level_ids = new ArrayList();394 ArrayList level_names = new ArrayList();394 ArrayList<String> level_ids = new ArrayList<String>(); 395 ArrayList<String> level_names = new ArrayList<String>(); 395 396 getLevelData(level_ids, level_names, lang); 396 397 if (level_ids.size() > 1) … … 429 430 else if (name.equals(FIELD_FIELD_PARAM)) 430 431 { 431 ArrayList fields = new ArrayList();432 ArrayList field_names = new ArrayList();432 ArrayList<String> fields = new ArrayList<String>(); 433 ArrayList<String> field_names = new ArrayList<String>(); 433 434 getIndexData(fields, field_names, lang); 434 435 // the field list - read from config file … … 438 439 // Changed from: 439 440 // param = GSXML.createParameterDescription2(this.doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, (String)fields.get(0), fields, field_names ); 440 String default_value = (fields.size() > 0) ? (String)fields.get(0) : null;441 String default_value = (fields.size() > 0) ? fields.get(0) : null; 441 442 // don't want to access element 0 if fields.size()==0, and 442 443 // GSXML.createParameterDescription2 checks for default_value==null condition … … 465 466 466 467 // should cache some of this 467 protected void getLevelData(ArrayList level_ids, ArrayListlevel_names, String lang)468 protected void getLevelData(ArrayList<String> level_ids, ArrayList<String> level_names, String lang) 468 469 { 469 470 Element level_list = (Element) GSXML.getChildByTagName(this.config_info, LEVEL_ELEM + GSXML.LIST_MODIFIER); … … 565 566 566 567 // Process the request parameters 567 HashMap params = GSXML.extractParams(param_list, false);568 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 568 569 569 570 // Make sure a query has been specified … … 658 659 /** methods to handle actually doing the query */ 659 660 /** do any initialisation of the query object */ 660 abstract protected boolean setUpQueryer(HashMap params);661 abstract protected boolean setUpQueryer(HashMap<String, Serializable> params); 661 662 662 663 /** do the query */ … … 673 674 674 675 /** add in term info if available */ 675 abstract protected boolean addTermInfo(Element term_list, HashMap params, Object query_result);676 abstract protected boolean addTermInfo(Element term_list, HashMap<String, Serializable> params, Object query_result); 676 677 677 678 /** … … 680 681 */ 681 682 /** We assume the combination (AND/OR) is done by the match param */ 682 protected String parseFieldQueryParams(HashMap params)683 protected String parseFieldQueryParams(HashMap<String, Serializable> params) 683 684 { 684 685 … … 707 708 * query 708 709 */ 709 protected String parseAdvancedFieldQueryParams(HashMap params)710 protected String parseAdvancedFieldQueryParams(HashMap<String, Serializable> params) 710 711 { 711 712 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2TextSearch.java
r24857 r25635 227 227 } 228 228 229 protected void getIndexData(ArrayList index_ids, ArrayListindex_names, String lang)229 protected void getIndexData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang) 230 230 { 231 231 // the index info - … … 256 256 } 257 257 258 protected void getIndexSubcollectionData(ArrayList index_sub_ids, ArrayListindex_sub_names, String lang)258 protected void getIndexSubcollectionData(ArrayList<String> index_sub_ids, ArrayList<String> index_sub_names, String lang) 259 259 { 260 260 // the index info - … … 285 285 } 286 286 287 protected void getIndexLanguageData(ArrayList index_lang_ids, ArrayListindex_lang_names, String lang)287 protected void getIndexLanguageData(ArrayList<String> index_lang_ids, ArrayList<String> index_lang_names, String lang) 288 288 { 289 289 // the index info - -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractSearch.java
r24892 r25635 288 288 { 289 289 // should we make these class fields? 290 ArrayList index_ids = new ArrayList();291 ArrayList index_names = new ArrayList();290 ArrayList<String> index_ids = new ArrayList<String>(); 291 ArrayList<String> index_names = new ArrayList<String>(); 292 292 getIndexData(index_ids, index_names, lang); 293 293 String param_type = GSXML.PARAM_TYPE_ENUM_SINGLE; … … 389 389 * subclass there must be at least one index 390 390 */ 391 abstract protected void getIndexData(ArrayList index_ids, ArrayListindex_names, String lang);391 abstract protected void getIndexData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang); 392 392 393 393 } -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractTextSearch.java
r24394 r25635 105 105 Element index_sub_list = (Element)GSXML.getChildByTagName(this.config_info, INDEX_SUBCOLLECTION_ELEM+GSXML.LIST_MODIFIER); 106 106 if (index_sub_list == null) return true; // processed, just not a very interesting result 107 ArrayList index_sub_ids = new ArrayList();108 ArrayList index_sub_names = new ArrayList();107 ArrayList<String> index_sub_ids = new ArrayList<String>(); 108 ArrayList<String> index_sub_names = new ArrayList<String>(); 109 109 getIndexSubcollectionData(index_sub_ids, index_sub_names, lang); 110 110 String param_type = GSXML.PARAM_TYPE_ENUM_SINGLE; … … 122 122 Element index_lang_list = (Element)GSXML.getChildByTagName(this.config_info, INDEX_LANGUAGE_ELEM+GSXML.LIST_MODIFIER); 123 123 if (index_lang_list == null) return true; // processed, just not a very interesting result 124 ArrayList index_lang_ids = new ArrayList();125 ArrayList index_lang_names = new ArrayList();124 ArrayList<String> index_lang_ids = new ArrayList<String>(); 125 ArrayList<String> index_lang_names = new ArrayList<String>(); 126 126 getIndexLanguageData(index_lang_ids, index_lang_names, lang); 127 127 String param_type = GSXML.PARAM_TYPE_ENUM_SINGLE; … … 150 150 * might be implemented by subclass 151 151 */ 152 protected void getIndexSubcollectionData(ArrayList index_ids, ArrayListindex_names, String lang){}152 protected void getIndexSubcollectionData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang){} 153 153 154 154 /** get the details about the indexes available 155 155 * might be implemented by subclass 156 156 */ 157 protected void getIndexLanguageData(ArrayList index_ids, ArrayListindex_names, String lang){}157 protected void getIndexLanguageData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang){} 158 158 159 159 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ArchiveIO.java
r24993 r25635 36 36 37 37 import java.io.File; 38 import java.io.Serializable; 38 39 import java.util.ArrayList; 39 40 import java.util.HashMap; … … 118 119 return result; 119 120 } 120 HashMap params = GSXML.extractParams(param_list, false);121 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 121 122 122 123 String oid = (String) params.get(GSXML.NODE_ID_ATT); … … 148 149 return result; 149 150 } 150 HashMap params = GSXML.extractParams(param_list, false);151 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 151 152 152 153 String srcFile = (String) params.get("sourcefile"); //TODO: Replace with a constant … … 182 183 return result; 183 184 } 184 HashMap params = GSXML.extractParams(param_list, false);185 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 185 186 186 187 String oid = (String) params.get(GSXML.NODE_ID_ATT); … … 317 318 return result; 318 319 } 319 HashMap params = GSXML.extractParams(param_list, false);320 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 320 321 321 322 String oid = (String) params.get(GSXML.NODE_ID_ATT); … … 333 334 for (int i = 1; i < assocFiles.size(); i++) 334 335 { 335 metadataList.appendChild(GSXML.createMetadataElement(this.doc, "assocfile", (String)assocFiles.get(i)));336 metadataList.appendChild(GSXML.createMetadataElement(this.doc, "assocfile", assocFiles.get(i))); 336 337 } 337 338 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ArchiveRetrieve.java
r24993 r25635 32 32 33 33 import java.io.File; 34 import java.io.Serializable; 34 35 import java.util.HashMap; 35 36 import java.util.Vector; … … 115 116 return result; 116 117 } 117 HashMap params = GSXML.extractParams(param_list, false);118 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 118 119 119 120 String oid = (String) params.get("oid"); … … 152 153 return result; 153 154 } 154 HashMap params = GSXML.extractParams(param_list, false);155 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 155 156 156 157 String srcFile = (String) params.get("srcfile"); … … 223 224 return result; 224 225 } 225 HashMap params = GSXML.extractParams(param_list, false);226 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 226 227 227 228 String oid = (String) params.get("oid"); … … 269 270 270 271 String srcFile = info.getInfo("src-file"); 271 Vector data = info.getMultiInfo("assoc-file");272 Vector<String> data = info.getMultiInfo("assoc-file"); 272 273 273 274 Element metadataList = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER); … … 276 277 for (int i = 0; i < data.size(); i++) 277 278 { 278 metadataList.appendChild(createMetadataElement("assocfile", (String)data.get(i)));279 metadataList.appendChild(createMetadataElement("assocfile", data.get(i))); 279 280 } 280 281 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java
r25352 r25635 18 18 import java.util.regex.Pattern; 19 19 import java.io.File; 20 import java.io.Serializable; 20 21 21 22 import net.tanesha.recaptcha.ReCaptchaImpl; … … 230 231 } 231 232 232 HashMap params = GSXML.extractParams(paramList, true);233 HashMap<String, Serializable> params = GSXML.extractParams(paramList, true); 233 234 234 235 String username = (String) params.get("username"); … … 308 309 return result; // Return the empty result 309 310 } 310 HashMap paramMap = GSXML.extractParams(param_list, false);311 HashMap<String, Serializable> paramMap = GSXML.extractParams(param_list, false); 311 312 String op = (String) paramMap.get("authpage"); 312 313 serviceNode.setAttribute("operation", op); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/BerryBasket.java
r24993 r25635 35 35 import org.greenstone.gsdl3.util.UserContext; 36 36 37 import java.io.Serializable; 37 38 import java.net.InetAddress; 38 39 import java.util.Properties; … … 66 67 protected static final int delay = 1800000; 67 68 68 protected Hashtable userMap = null;69 protected Hashtable timerMap = null;69 protected Hashtable<String, Hashtable<String, Hashtable<String, Item>>> userMap = null; 70 protected Hashtable<String, UserTimer> timerMap = null; 70 71 protected String username = ""; 71 72 protected String password = ""; … … 74 75 public BerryBasket() 75 76 { 76 userMap = new Hashtable ();77 timerMap = new Hashtable ();78 } 79 80 private Hashtable updateDocMap(Element request)77 userMap = new Hashtable<String, Hashtable<String, Hashtable<String, Item>>>(); 78 timerMap = new Hashtable<String, UserTimer>(); 79 } 80 81 private Hashtable<String, Hashtable<String, Item>> updateDocMap(Element request) 81 82 { 82 83 … … 87 88 if (timerMap.containsKey(id)) 88 89 { 89 UserTimer timer = (UserTimer)timerMap.get(id);90 UserTimer timer = timerMap.get(id); 90 91 timer.restart(); 91 92 } 92 return (Hashtable)userMap.get(id);93 return userMap.get(id); 93 94 } 94 95 else … … 97 98 timerMap.put(id, timer); 98 99 timer.start(); 99 Hashtable newDocs = new Hashtable();100 Hashtable<String, Hashtable<String, Item>> newDocs = new Hashtable<String, Hashtable<String, Item>>(); 100 101 userMap.put(id, newDocs); 101 102 return newDocs; … … 210 211 protected Element processAddItem(Element request) 211 212 { 212 Hashtable docsMap = updateDocMap(request);213 Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request); 213 214 214 215 // Create a new (empty) result message … … 223 224 } 224 225 225 HashMap params = GSXML.extractParams(param_list, false);226 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 226 227 227 228 String item = (String) params.get("item"); … … 236 237 if (docsMap.containsKey(collection)) 237 238 { 238 Hashtable items = (Hashtable)docsMap.get(collection);239 Hashtable<String, Item> items = docsMap.get(collection); 239 240 if (!items.containsKey(item)) 240 241 { … … 246 247 else 247 248 { 248 Hashtable items = new Hashtable();249 Hashtable<String, Item> items = new Hashtable<String, Item>(); 249 250 Item newItem = generateItem(collection, item); 250 251 items.put(item, newItem); … … 261 262 Item item = new Item(collection, id); 262 263 String to = GSPath.appendLink(collection, "DocumentMetadataRetrieve"); 263 ArrayList tmp = new ArrayList();264 ArrayList<String> tmp = new ArrayList<String>(); 264 265 tmp.add(id); 265 266 … … 303 304 protected Element processDeleteItems(Element request) 304 305 { 305 Hashtable docsMap = updateDocMap(request);306 Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request); 306 307 307 308 // Create a new (empty) result message … … 317 318 } 318 319 319 HashMap params = GSXML.extractParams(param_list, false);320 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 320 321 321 322 String param = (String) params.get("items"); … … 341 342 if (docsMap.containsKey(collection)) 342 343 { 343 Hashtable itemMap = (Hashtable)docsMap.get(collection);344 Hashtable itemMap = docsMap.get(collection); 344 345 if (itemMap.containsKey(item)) 345 346 { … … 359 360 protected Element processDeleteItem(Element request) 360 361 { 361 Hashtable docsMap = updateDocMap(request);362 Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request); 362 363 363 364 // Create a new (empty) result message … … 373 374 } 374 375 375 HashMap params = GSXML.extractParams(param_list, false);376 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 376 377 377 378 String param = (String) params.get("item"); … … 393 394 if (docsMap.containsKey(collection)) 394 395 { 395 Hashtable itemMap = (Hashtable)docsMap.get(collection);396 Hashtable itemMap = docsMap.get(collection); 396 397 if (itemMap.containsKey(item)) 397 398 { … … 409 410 protected Element processItemNum(Element request) 410 411 { 411 Hashtable docsMap = updateDocMap(request);412 Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request); 412 413 413 414 // Create a new (empty) result message … … 416 417 int size = 0; 417 418 String ids = ""; 418 Iterator keys = docsMap.keySet().iterator();419 Iterator<String> keys = docsMap.keySet().iterator(); 419 420 420 421 while (keys.hasNext()) 421 422 { 422 Hashtable items = (Hashtable) docsMap.get((String)keys.next());423 Hashtable items = docsMap.get(keys.next()); 423 424 size += items.size(); 424 425 Iterator values = items.values().iterator(); … … 437 438 } 438 439 439 private Element getDocumentMetadata(String to, UserContext userContext, Iterator ids)440 private Element getDocumentMetadata(String to, UserContext userContext, Iterator<String> ids) 440 441 { 441 442 … … 446 447 447 448 // Create a parameter list to specify the required metadata information 448 HashSet meta_names = new HashSet();449 HashSet<String> meta_names = new HashSet<String>(); 449 450 meta_names.add("Title"); // the default 450 451 meta_names.add("root_Title"); … … 454 455 455 456 Element param = null; 456 Iterator i = meta_names.iterator();457 Iterator<String> i = meta_names.iterator(); 457 458 while (i.hasNext()) 458 459 { 459 String name = (String)i.next();460 String name = i.next(); 460 461 param = this.doc.createElement(GSXML.PARAM_ELEM); 461 462 param_list.appendChild(param); … … 476 477 Element dm_doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM); 477 478 dm_doc_list.appendChild(dm_doc_node); 478 dm_doc_node.setAttribute(GSXML.NODE_ID_ATT, (String)ids.next());479 dm_doc_node.setAttribute(GSXML.NODE_ID_ATT, ids.next()); 479 480 } 480 481 … … 485 486 protected Element processDisplayList(Element request) 486 487 { 487 Hashtable docsMap = updateDocMap(request);488 Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request); 488 489 489 490 // Create a new (empty) result message 490 491 Element result = this.doc.createElement(GSXML.RESPONSE_ELEM); 491 492 492 Iterator keys = docsMap.keySet().iterator();493 Iterator<String> keys = docsMap.keySet().iterator(); 493 494 494 495 while (keys.hasNext()) 495 496 { 496 String collection = (String)keys.next();497 Hashtable items = (Hashtable)docsMap.get(collection);497 String collection = keys.next(); 498 Hashtable items = docsMap.get(collection); 498 499 Iterator itemItr = items.values().iterator(); 499 500 … … 534 535 } 535 536 536 HashMap params = GSXML.extractParams(param_list, false);537 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 537 538 538 539 String to = (String) params.get("address"); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/CoverageMetadataRetrieve.java
r22974 r25635 198 198 DBInfo collection_info = this.coll_db.getInfo("collection"); 199 199 200 Set keys = collection_info.getKeys();201 202 Vector valid_keys = new Vector();200 Set<String> keys = collection_info.getKeys(); 201 202 Vector<String> valid_keys = new Vector<String>(); 203 203 204 204 // Iterate over keys and add valid ones to the valid_keys vector 205 205 String current_key = null; 206 Iterator iter = keys.iterator();206 Iterator<String> iter = keys.iterator(); 207 207 208 208 while (iter.hasNext()) { 209 current_key = (String)iter.next();209 current_key = iter.next(); 210 210 if(current_key.matches("^metadatalist-([a-zA-Z][^-])*$")) 211 211 { … … 232 232 233 233 while (iter.hasNext()) { 234 current_key = (String)iter.next();234 current_key = iter.next(); 235 235 236 236 // Create metadataSet using the current key and add to metadataSetList … … 244 244 245 245 // Create a metadata element for each value and add to metadataSet 246 Vector sub_info = collection_info.getMultiInfo(current_key);247 Iterator iter2 = sub_info.iterator();246 Vector<String> sub_info = collection_info.getMultiInfo(current_key); 247 Iterator<String> iter2 = sub_info.iterator(); 248 248 while (iter2.hasNext()) { 249 value = (String)iter2.next();249 value = iter2.next(); 250 250 metadata = this.doc.createElement("metadata"); 251 251 metadata.setAttribute(GSXML.NAME_ATT, value); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/CrossCollectionSearch.java
r24993 r25635 292 292 logger.debug("metadata response = " + this.converter.getPrettyString(metadata_response)); 293 293 NodeList coll_responses = metadata_response.getElementsByTagName(GSXML.RESPONSE_ELEM); 294 ArrayList valid_colls = new ArrayList();295 ArrayList valid_coll_names = new ArrayList();294 ArrayList<String> valid_colls = new ArrayList<String>(); 295 ArrayList<String> valid_coll_names = new ArrayList<String>(); 296 296 for (int i = 0; i < coll_responses.getLength(); i++) 297 297 { … … 317 317 // ids no all has the list without 'all' option. 318 318 this.coll_ids_list_no_all = new String[1]; 319 this.coll_ids_list_no_all = (String[])valid_colls.toArray(coll_ids_list_no_all);319 this.coll_ids_list_no_all = valid_colls.toArray(coll_ids_list_no_all); 320 320 321 321 valid_colls.add(0, "all"); … … 323 323 this.coll_ids_list = new String[1]; 324 324 this.coll_names_list = new String[1]; 325 this.coll_ids_list = (String[])valid_colls.toArray(coll_ids_list);326 this.coll_names_list = (String[])valid_coll_names.toArray(coll_names_list);325 this.coll_ids_list = valid_colls.toArray(coll_ids_list); 326 this.coll_names_list = valid_coll_names.toArray(coll_names_list); 327 327 return true; 328 328 } … … 361 361 362 362 // organise the nodes into collection lists 363 HashMap coll_map = new HashMap();363 HashMap<String, Node> coll_map = new HashMap<String, Node>(); 364 364 365 365 for (int i = 0; i < query_doc_list.getLength(); i++) -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentBasket.java
r25091 r25635 72 72 protected static final String BASKET_BOOK = "documentBasketBook"; 73 73 74 protected Hashtable userMap = null;75 protected Hashtable timerMap = null;74 protected Hashtable<String, Hashtable<String, Hashtable<String, Item>>> userMap = null; 75 protected Hashtable<String, UserTimer> timerMap = null; 76 76 protected String username = ""; 77 77 protected String password = ""; … … 80 80 public DocumentBasket() 81 81 { 82 userMap = new Hashtable ();83 timerMap = new Hashtable ();84 } 85 86 private Hashtable updateDocMap(Element request)82 userMap = new Hashtable<String, Hashtable<String, Hashtable<String, Item>>>(); 83 timerMap = new Hashtable<String, UserTimer>(); 84 } 85 86 private Hashtable<String, Hashtable<String, Item>> updateDocMap(Element request) 87 87 { 88 88 String id = request.getAttribute("uid"); … … 92 92 if (timerMap.containsKey(id)) 93 93 { 94 UserTimer timer = (UserTimer)timerMap.get(id);94 UserTimer timer = timerMap.get(id); 95 95 timer.restart(); 96 96 } 97 return (Hashtable)userMap.get(id);97 return userMap.get(id); 98 98 } 99 99 else … … 102 102 timerMap.put(id, timer); 103 103 timer.start(); 104 Hashtable newDocs = new Hashtable();104 Hashtable<String, Hashtable<String, Item>> newDocs = new Hashtable<String, Hashtable<String, Item>>(); 105 105 userMap.put(id, newDocs); 106 106 return newDocs; … … 226 226 { 227 227 //System.err.println("REQUEST = " + GSXML.xmlNodeToString(request)); 228 Hashtable docsMap = updateDocMap(request);228 Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request); 229 229 //System.err.println("DOCSMAP = " + docsMap); 230 230 // Create a new (empty) result message … … 239 239 } 240 240 241 HashMap params = GSXML.extractParams(param_list, false);241 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 242 242 //System.err.println("PARAMS = " + params); 243 243 String item = (String) params.get("item"); … … 256 256 if (docsMap.containsKey(collection)) 257 257 { 258 Hashtable items = (Hashtable)docsMap.get(collection);258 Hashtable<String, Item> items = docsMap.get(collection); 259 259 if (!items.containsKey(item)) 260 260 { … … 266 266 else 267 267 { 268 Hashtable items = new Hashtable();268 Hashtable<String, Item> items = new Hashtable<String, Item>(); 269 269 Item newItem = generateItem(collection, item); 270 270 items.put(item, newItem); … … 286 286 } 287 287 288 HashMap params = GSXML.extractParams(param_list, false);288 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 289 289 290 290 String docString = (String) params.get("docs"); … … 379 379 Item item = new Item(collection, id); 380 380 String to = GSPath.appendLink(collection, "DocumentMetadataRetrieve"); 381 ArrayList tmp = new ArrayList();381 ArrayList<String> tmp = new ArrayList<String>(); 382 382 tmp.add(id); 383 383 … … 422 422 protected Element processClearDocuments(Element request) 423 423 { 424 Hashtable docsMap = updateDocMap(request);424 Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request); 425 425 426 426 Element result = this.doc.createElement(GSXML.RESPONSE_ELEM); … … 435 435 } 436 436 437 HashMap params = GSXML.extractParams(param_list, false);437 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 438 438 String collection = (String) params.get(GSParams.COLLECTION); 439 439 … … 441 441 return result; 442 442 443 docsMap.put(collection, new Hashtable ());443 docsMap.put(collection, new Hashtable<String, Item>()); 444 444 445 445 return result; … … 448 448 protected Element processDeleteDocuments(Element request) 449 449 { 450 Hashtable docsMap = updateDocMap(request);450 Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request); 451 451 452 452 // Create a new (empty) result message … … 464 464 } 465 465 466 HashMap params = GSXML.extractParams(param_list, false);466 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 467 467 468 468 String param = (String) params.get("items"); … … 489 489 if (docsMap.containsKey(collection)) 490 490 { 491 Hashtable itemMap = (Hashtable)docsMap.get(collection);491 Hashtable itemMap = docsMap.get(collection); 492 492 if (itemMap.containsKey(item)) 493 493 { … … 506 506 protected Element processDeleteDocument(Element request) 507 507 { 508 Hashtable docsMap = updateDocMap(request);508 Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request); 509 509 510 510 // Create a new (empty) result message … … 522 522 } 523 523 524 HashMap params = GSXML.extractParams(param_list, false);524 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 525 525 526 526 String item = (String) params.get("item"); … … 540 540 if (docsMap.containsKey(collection)) 541 541 { 542 Hashtable itemMap = (Hashtable)docsMap.get(collection);542 Hashtable itemMap = docsMap.get(collection); 543 543 if (itemMap.containsKey(item)) 544 544 { … … 557 557 { 558 558 // GSXML.printXMLNode(request); 559 Hashtable docsMap = updateDocMap(request);559 Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request); 560 560 561 561 // Create a new (empty) result message … … 564 564 int size = 0; 565 565 String ids = ""; 566 Iterator keys = docsMap.keySet().iterator();566 Iterator<String> keys = docsMap.keySet().iterator(); 567 567 568 568 while (keys.hasNext()) 569 569 { 570 Hashtable items = (Hashtable) docsMap.get((String)keys.next());570 Hashtable items = docsMap.get(keys.next()); 571 571 size += items.size(); 572 572 Iterator values = items.values().iterator(); … … 585 585 } 586 586 587 private Element getDocumentMetadata(String to, UserContext userContext, Iterator ids)587 private Element getDocumentMetadata(String to, UserContext userContext, Iterator<String> ids) 588 588 { 589 589 … … 594 594 595 595 // Create a parameter list to specify the required metadata information 596 HashSet meta_names = new HashSet();596 HashSet<String> meta_names = new HashSet<String>(); 597 597 meta_names.add("Title"); // the default 598 598 meta_names.add("root_Title"); … … 602 602 603 603 Element param = null; 604 Iterator i = meta_names.iterator();604 Iterator<String> i = meta_names.iterator(); 605 605 while (i.hasNext()) 606 606 { 607 String name = (String)i.next();607 String name = i.next(); 608 608 param = this.doc.createElement(GSXML.PARAM_ELEM); 609 609 param_list.appendChild(param); … … 623 623 Element dm_doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM); 624 624 dm_doc_list.appendChild(dm_doc_node); 625 dm_doc_node.setAttribute(GSXML.NODE_ID_ATT, (String)ids.next());625 dm_doc_node.setAttribute(GSXML.NODE_ID_ATT, ids.next()); 626 626 } 627 627 … … 631 631 protected Element processDisplayDocumentList(Element request) 632 632 { 633 Hashtable docsMap = updateDocMap(request);633 Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request); 634 634 635 635 // Create a new (empty) result message 636 636 Element result = this.doc.createElement(GSXML.RESPONSE_ELEM); 637 637 638 Iterator keys = docsMap.keySet().iterator();638 Iterator<String> keys = docsMap.keySet().iterator(); 639 639 640 640 while (keys.hasNext()) 641 641 { 642 String collection = (String)keys.next();643 Hashtable items = (Hashtable)docsMap.get(collection);642 String collection = keys.next(); 643 Hashtable items = docsMap.get(collection); 644 644 Iterator itemItr = items.values().iterator(); 645 645 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentMaker.java
r25541 r25635 25 25 import java.io.InputStreamReader; 26 26 import java.io.OutputStream; 27 import java.io.Serializable; 27 28 import java.lang.reflect.Type; 28 29 import java.util.ArrayList; … … 370 371 } 371 372 372 HashMap params = GSXML.extractParams(param_list, false);373 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 373 374 String transactionString = (String) params.get("transactions"); 374 375 transactionString = transactionString.replace("%26", "&"); … … 393 394 for (int j = 0; j < transactions.size(); j++) 394 395 { 395 Map keyValueMap = (Map)transactions.get(j);396 Map keyValueMap = transactions.get(j); 396 397 String operation = (String) keyValueMap.get("operation"); 397 398 if (operation.equals("move") || operation.equals("duplicate")) -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java
r22370 r25635 81 81 this.doc = this.converter.newDOM(); 82 82 this.short_service_info = this.doc.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER); 83 this.format_info_map = new HashMap ();83 this.format_info_map = new HashMap<String, Node>(); 84 84 85 85 } … … 407 407 NodeList paramNodes = request.getElementsByTagName(GSXML.PARAM_ELEM); 408 408 if(paramNodes.getLength() > 0) { 409 HashMap params = new HashMap(paramNodes.getLength());409 HashMap<String, String> params = new HashMap<String, String>(paramNodes.getLength()); 410 410 for(int i = 0; i < paramNodes.getLength(); i++) { 411 411 Element param = (Element)paramNodes.item(i); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Browse.java
r24393 r25635 158 158 } 159 159 /** returns a list of the child ids in order, null if no children */ 160 protected ArrayList getChildrenIds(String node_id) {160 protected ArrayList<String> getChildrenIds(String node_id) { 161 161 DBInfo info = this.coll_db.getInfo(node_id); 162 162 if (info == null) { … … 164 164 } 165 165 166 ArrayList children = new ArrayList();166 ArrayList<String> children = new ArrayList<String>(); 167 167 168 168 String contains = info.getInfo("contains"); … … 190 190 } 191 191 192 Set keys = info.getKeys();193 Iterator it = keys.iterator();192 Set<String> keys = info.getKeys(); 193 Iterator<String> it = keys.iterator(); 194 194 while(it.hasNext()) { 195 String key_in = (String)it.next();195 String key_in = it.next(); 196 196 String value = info.getInfo(key); 197 197 if (key_in.equals(key)){ … … 212 212 // assumes only one value per metadata 213 213 protected Element getMetadataList(String node_id, boolean all_metadata, 214 ArrayList metadata_names) {214 ArrayList<String> metadata_names) { 215 215 String lang = "en"; 216 216 Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); … … 221 221 if (all_metadata) { 222 222 // return everything out of the database 223 Set keys = info.getKeys();224 Iterator it = keys.iterator();223 Set<String> keys = info.getKeys(); 224 Iterator<String> it = keys.iterator(); 225 225 while(it.hasNext()) { 226 String key = (String)it.next();226 String key = it.next(); 227 227 String value = info.getInfo(key); 228 228 GSXML.addMetadata(this.doc, metadata_list, key, this.macro_resolver.resolve(value, lang, GS2MacroResolver.SCOPE_META, node_id)); … … 231 231 } else { 232 232 for (int i=0; i<metadata_names.size(); i++) { 233 String meta_name = (String)metadata_names.get(i);233 String meta_name = metadata_names.get(i); 234 234 String value = (String)info.getInfo(meta_name); 235 235 GSXML.addMetadata(this.doc, metadata_list, meta_name, value); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java
r25550 r25635 37 37 import java.io.File; 38 38 import java.io.FileWriter; 39 import java.io.Serializable; 39 40 import java.lang.Thread.State; 40 41 import java.util.Locale; … … 82 83 83 84 // set of listeners for any construction commands 84 protected Map listeners = null;85 protected Map<String, GS2PerlListener> listeners = null; 85 86 protected HashMap<String, Boolean> collectionOperationMap = new HashMap<String, Boolean>(); 86 87 87 88 public GS2Construct() 88 89 { 89 this.listeners = Collections.synchronizedMap(new HashMap ());90 this.listeners = Collections.synchronizedMap(new HashMap<String, GS2PerlListener>()); 90 91 } 91 92 … … 175 176 String id = statusElem.getAttribute("pid"); 176 177 177 GS2PerlListener currentListener = (GS2PerlListener)this.listeners.get(id);178 GS2PerlListener currentListener = this.listeners.get(id); 178 179 int statusCode = currentListener.getStatus(); 179 180 while (!GSStatus.isCompleted(statusCode)) … … 199 200 { 200 201 Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 201 HashMap params = GSXML.extractParams(param_list, false);202 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 202 203 203 204 //If we have been requested to only build certain documents then we need to create a manifest file … … 264 265 // the MR about it. but we have to wait until the process is finished. 265 266 Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 266 HashMap params = GSXML.extractParams(param_list, false);267 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 267 268 String coll_name = (String) params.get(COL_PARAM); 268 269 String lang = request.getAttribute(GSXML.LANG_ATT); … … 288 289 } 289 290 String id = status.getAttribute(GSXML.STATUS_PROCESS_ID_ATT); 290 GS2PerlListener listener = (GS2PerlListener)this.listeners.get(id);291 GS2PerlListener listener = this.listeners.get(id); 291 292 if (listener == null) 292 293 { … … 342 343 343 344 Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 344 HashMap params = GSXML.extractParams(param_list, false);345 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 345 346 346 347 boolean get_status_only = false; … … 400 401 401 402 Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 402 HashMap params = GSXML.extractParams(param_list, false);403 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 403 404 404 405 boolean get_status_only = false; … … 551 552 552 553 Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 553 HashMap params = GSXML.extractParams(param_list, false);554 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 554 555 555 556 boolean get_status_only = false; … … 564 565 String id = (String) params.get(PROCESS_ID_PARAM); 565 566 status.setAttribute(GSXML.STATUS_PROCESS_ID_ATT, id); 566 GS2PerlListener listener = (GS2PerlListener)this.listeners.get(id);567 GS2PerlListener listener = this.listeners.get(id); 567 568 if (listener == null) 568 569 { … … 725 726 * element 726 727 */ 727 protected Element extractOtherParams(HashMap params, int type)728 protected Element extractOtherParams(HashMap<String, Serializable> params, int type) 728 729 { 729 730 … … 758 759 { 759 760 Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 760 HashMap params = GSXML.extractParams(param_list, false);761 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 761 762 762 763 String collection = (String)params.get(COL_PARAM); … … 783 784 { 784 785 Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER); 785 HashMap params = GSXML.extractParams(param_list, false);786 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 786 787 787 788 String collection = (String)params.get(COL_PARAM); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2LuceneSearch.java
r24738 r25635 30 30 import java.util.HashMap; 31 31 import java.io.File; 32 import java.io.Serializable; 32 33 import java.util.Iterator; 33 34 import java.util.Set; … … 62 63 63 64 /** do any initialisation of the query object */ 64 protected boolean setUpQueryer(HashMap params) {65 protected boolean setUpQueryer(HashMap<String, Serializable> params) { 65 66 String indexdir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) + File.separatorChar + "index"+File.separatorChar; 66 67 … … 173 174 174 175 /** add in term info if available */ 175 protected boolean addTermInfo(Element term_list, HashMap params,176 protected boolean addTermInfo(Element term_list, HashMap<String, Serializable> params, 176 177 Object query_result) { 177 178 String query_level = (String)params.get(LEVEL_PARAM); // the current query level -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java
r20239 r25635 42 42 import java.util.Vector; 43 43 import java.io.File; 44 import java.io.Serializable; 44 45 45 46 import org.apache.log4j.*; … … 93 94 } 94 95 95 protected boolean setUpQueryer(HashMap params) {96 protected boolean setUpQueryer(HashMap<String, Serializable> params) { 96 97 97 98 // set up the defaults that may be changed by query params … … 189 190 } 190 191 191 protected boolean addTermInfo(Element term_list, HashMap params,192 protected boolean addTermInfo(Element term_list, HashMap<String, Serializable> params, 192 193 Object query_result) { 193 194 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2MGSearch.java
r24394 r25635 36 36 import java.util.Iterator; 37 37 import java.io.File; 38 import java.io.Serializable; 38 39 39 40 import org.apache.log4j.*; … … 92 93 93 94 // Process the request parameters 94 HashMap params = GSXML.extractParams (param_list, false);95 HashMap<String, Serializable> params = GSXML.extractParams (param_list, false); 95 96 96 97 // Make sure a query has been specified … … 213 214 214 215 // should probably use a list rather than map 215 protected boolean setStandardQueryParams(HashMap params)216 protected boolean setStandardQueryParams(HashMap<String, Serializable> params) 216 217 { 217 218 // set the default settings that gs uses -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GoogleNgramMGPPSearch.java
r24394 r25635 64 64 //ArrayList docList_present = new ArrayList(); 65 65 66 ArrayList docList = new ArrayList();66 ArrayList<DocWrapper> docList = new ArrayList<DocWrapper>(); 67 67 68 68 for (int d = 0; d < docs.size(); d++) { … … 133 133 // interval = 10; 134 134 135 doc_nums[d] = ((DocWrapper)docList.get(d)).num;135 doc_nums[d] = docList.get(d).num; 136 136 137 137 } -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/IViaProxy.java
r14224 r25635 15 15 import java.io.InputStreamReader; 16 16 import java.io.IOException; 17 import java.io.Serializable; 17 18 import java.net.HttpURLConnection; 18 19 import java.net.URLConnection; … … 176 177 177 178 // Process the request parameters 178 HashMap params = GSXML.extractParams(param_list, false);179 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 179 180 180 181 // Make sure a query has been specified -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/IViaRetrieve.java
r22085 r25635 205 205 } 206 206 207 protected ArrayList getChildrenIds(String node_id){207 protected ArrayList<String> getChildrenIds(String node_id){ 208 208 return null; 209 209 } … … 215 215 protected Element getMetadataList (String doc_id, 216 216 boolean all_metadata, 217 ArrayList metadata_names)217 ArrayList<String> metadata_names) 218 218 throws GSException { 219 219 … … 225 225 226 226 for (int i=0; i<metadata_names.size();i++){ 227 if (isAcceptableMetadata( (String)metadata_names.get(i))){227 if (isAcceptableMetadata(metadata_names.get(i))){ 228 228 metadata_found = true; 229 field_list.append( (String)metadata_names.get(i));229 field_list.append(metadata_names.get(i)); 230 230 field_list.append(","); 231 231 } -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/IViaSearch.java
r24394 r25635 15 15 import java.io.File; 16 16 import java.io.BufferedReader; 17 import java.io.Serializable; 17 18 import java.net.Authenticator; 18 19 … … 37 38 38 39 protected String ivia_server_url = null; 39 protected ArrayList index_ids = null;40 protected ArrayList<String> index_ids = null; 40 41 public IViaSearch() 41 42 { … … 62 63 does_multi_index_search = true; 63 64 this.default_index = ",kw,au,su,ti,de,fu,"; // all of them 64 index_ids = new ArrayList ();65 index_ids = new ArrayList<String>(); 65 66 index_ids.add("kw"); 66 67 index_ids.add("au"); … … 88 89 89 90 // Process the request parameters 90 HashMap params = GSXML.extractParams(param_list, false);91 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 91 92 92 93 // Make sure a query has been specified … … 195 196 An IVia server has a fixed list of fields to search (I think) so we can hard code them here rather than reading them in from a config file 196 197 */ 197 protected void getIndexData(ArrayList index_ids, ArrayListindex_names,String lang){198 protected void getIndexData(ArrayList<String> index_ids, ArrayList<String> index_names,String lang){ 198 199 index_ids.addAll(this.index_ids); 199 200 index_names.add(getTextString("param."+INDEX_PARAM+".kw", lang)); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/LuceneSearch.java
r24738 r25635 29 29 import org.greenstone.LuceneWrapper3.GS2Analyzer; 30 30 import java.io.File; 31 import java.io.Serializable; 31 32 32 33 import org.apache.log4j.*; … … 43 44 protected static final String INDEX_ELEM = "index"; 44 45 45 protected ArrayList index_ids;46 protected ArrayList<String> index_ids; 46 47 47 48 public LuceneSearch() 48 49 { 49 index_ids = new ArrayList ();50 index_ids = new ArrayList<String>(); 50 51 } 51 52 … … 77 78 } 78 79 79 protected void getIndexData(ArrayList index_ids, ArrayListindex_names, String lang)80 protected void getIndexData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang) 80 81 { 81 82 // copying exercise for index_ids, … … 133 134 134 135 // Process the request parameters to make sure a query has been specified 135 HashMap params = GSXML.extractParams(param_list, false);136 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 136 137 String query_string = (String) params.get(QUERY_PARAM); 137 138 … … 164 165 } 165 166 166 HashMap params = GSXML.extractParams(param_list, false);167 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 167 168 String query_string = (String) params.get(QUERY_PARAM); 168 169 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/MapRetrieve.java
r14225 r25635 10 10 11 11 // General Java classes 12 import java.io.File;13 12 import java.io.*; 14 13 import java.util.StringTokenizer; … … 36 35 protected static final int DOCUMENT=1; 37 36 38 protected ArrayList index_name_list = null;39 protected ArrayList index_display_list = null;37 protected ArrayList<String> index_name_list = null; 38 protected ArrayList<String> index_display_list = null; 40 39 protected String files_home_dir = null; 41 40 protected String temp_files_dir = null; … … 45 44 protected String http_image_dir = null; 46 45 protected String http_temp_image_dir = null; 47 private LinkedList namesInList = new LinkedList();46 private LinkedList<String> namesInList = new LinkedList<String>(); 48 47 49 48 private DefaultMutableTreeNode tree; … … 91 90 this.http_temp_image_dir = this.site_http_address + "/collect/"+this.cluster_name+"/temp/"; 92 91 93 this.index_name_list = new ArrayList ();94 this.index_display_list = new ArrayList ();92 this.index_name_list = new ArrayList<String>(); 93 this.index_display_list = new ArrayList<String>(); 95 94 Element index_list = (Element)GSXML.getChildByTagName(this.config_info, GSXML.INDEX_ELEM+GSXML.LIST_MODIFIER); 96 95 Element display_index_list = (Element)GSXML.getChildByTagName(extra_info, "search"); … … 200 199 201 200 // The metadata information required 202 Vector metadata_list = new Vector();201 Vector<String> metadata_list = new Vector<String>(); 203 202 boolean all_metadata = false; 204 203 // Process the request parameters … … 292 291 // create the navigation thumbnails. This doesn't seem to work most of the time ??????? 293 292 for (int m = 0; m < metadata_list.size(); m++) { 294 String metadata = (String)metadata_list.get(m);293 String metadata = metadata_list.get(m); 295 294 thumb = ""; 296 295 String value = ""; … … 448 447 //put the names in an array 449 448 for(int ri=0; namesInList.size()>0; ri++){ 450 returnNames[ri]= (String)namesInList.getFirst();449 returnNames[ri]=namesInList.getFirst(); 451 450 returnNames[ri] = returnNames[ri].substring(0,returnNames[ri].indexOf('`')); 452 451 namesInList.removeFirst(); … … 825 824 826 825 for (int i=0; i<this.index_name_list.size(); i++) { 827 String name = (String)this.index_name_list.get(i);826 String name = this.index_name_list.get(i); 828 827 dropDownBox.append("<option value=\""); 829 828 dropDownBox.append(name); 830 829 dropDownBox.append("\">"); 831 String display = (String)this.index_display_list.get(i);830 String display = this.index_display_list.get(i); 832 831 dropDownBox.append(display); 833 832 dropDownBox.append("\n"); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/MapSearch.java
r24394 r25635 41 41 import java.io.ObjectInputStream; 42 42 import java.io.FileInputStream; 43 import java.io.Serializable; 43 44 import java.lang.ClassNotFoundException; 44 45 … … 140 141 } 141 142 142 protected void getIndexData(ArrayList index_ids, ArrayListindex_names, String lang)143 protected void getIndexData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang) 143 144 { 144 145 // for now, we just have one dummy index … … 174 175 175 176 // Process the request parameters 176 HashMap params = GSXML.extractParams(param_list, false);177 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 177 178 178 179 // Make sure a query has been specified … … 241 242 String nameData; 242 243 double xco, yco; 243 LinkedList mapList = new LinkedList();244 LinkedList<Object> mapList = new LinkedList<Object>(); 244 245 LinkedList placeList = new LinkedList(); 245 246 String readString = ""; … … 304 305 305 306 //for each map, create a list of the query matches on that map 306 LinkedList tempList = new LinkedList();307 LinkedList<Object> tempList = new LinkedList<Object>(); 307 308 String mapNumber = ""; 308 309 String currentMap[] = {"",""}; -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/OAIPMH.java
r23938 r25635 227 227 */ 228 228 NodeList params = GSXML.getChildrenByTagName(req, OAIXML.PARAM); 229 HashMap param_map = OAIXML.getParamMap(params);230 231 String prefix = (String)param_map.get(OAIXML.METADATA_PREFIX);229 HashMap<String, String> param_map = OAIXML.getParamMap(params); 230 231 String prefix = param_map.get(OAIXML.METADATA_PREFIX); 232 232 if (prefix == null || prefix.equals("")) { 233 233 //Just a double-check … … 242 242 } 243 243 244 String oid = (String)param_map.get(OAIXML.OID);244 String oid = param_map.get(OAIXML.OID); 245 245 246 246 //get a DBInfo object of the identifier; if this identifier is not present in the database, … … 252 252 } 253 253 254 ArrayList keys = new ArrayList(info.getKeys());254 ArrayList<String> keys = new ArrayList<String>(info.getKeys()); 255 255 String oailastmodified = ""; 256 256 if(keys.contains(OAIXML.OAI_LASTMODIFIED)) { … … 285 285 } 286 286 287 HashMap param_map = OAIXML.getParamMap(params);287 HashMap<String, String> param_map = OAIXML.getParamMap(params); 288 288 289 289 String prefix = ""; … … 296 296 return OAIXML.getResponse(OAIXML.createErrorElement(OAIXML.CANNOT_DISSEMINATE_FORMAT, "")); 297 297 } 298 prefix = (String)param_map.get(OAIXML.METADATA_PREFIX);298 prefix = param_map.get(OAIXML.METADATA_PREFIX); 299 299 if (prefix == null || prefix.equals("")) { 300 300 //Just a double-check … … 304 304 305 305 if(param_map.containsKey(OAIXML.FROM)) { 306 String from = (String)param_map.get(OAIXML.FROM);306 String from = param_map.get(OAIXML.FROM); 307 307 from_date = OAIXML.getDate(from); 308 308 } 309 309 if(param_map.containsKey(OAIXML.UNTIL)) { 310 String until = (String)param_map.get(OAIXML.UNTIL);310 String until = param_map.get(OAIXML.UNTIL); 311 311 until_date = OAIXML.getDate(until); 312 312 } … … 317 317 return OAIXML.getResponse(OAIXML.createErrorElement(OAIXML.CANNOT_DISSEMINATE_FORMAT, "")); 318 318 } 319 ArrayList oid_list = getChildrenIds(OAIXML.BROWSELIST);319 ArrayList<String> oid_list = getChildrenIds(OAIXML.BROWSELIST); 320 320 if (oid_list == null) { 321 321 logger.error("No matched records found in collection: browselist is empty"); … … 325 325 Element list_identifiers = OAIXML.createElement(OAIXML.LIST_IDENTIFIERS); 326 326 for(int i=0; i<oid_list.size(); i++) { 327 String oid = (String)oid_list.get(i);327 String oid = oid_list.get(i); 328 328 DBInfo info = this.coll_db.getInfo(oid); 329 329 if (info == null) { … … 331 331 continue; 332 332 } 333 ArrayList keys = new ArrayList(info.getKeys());333 ArrayList<String> keys = new ArrayList<String>(info.getKeys()); 334 334 String oailastmodified = ""; 335 335 if(keys.contains(OAIXML.OAI_LASTMODIFIED)) { … … 370 370 } 371 371 372 HashMap param_map = OAIXML.getParamMap(params);372 HashMap<String, String> param_map = OAIXML.getParamMap(params); 373 373 374 374 String prefix = ""; … … 381 381 return OAIXML.getResponse(OAIXML.createErrorElement(OAIXML.CANNOT_DISSEMINATE_FORMAT, "")); 382 382 } 383 prefix = (String)param_map.get(OAIXML.METADATA_PREFIX);383 prefix = param_map.get(OAIXML.METADATA_PREFIX); 384 384 if (prefix == null || prefix.equals("")) { 385 385 //Just a double-check … … 389 389 390 390 if(param_map.containsKey(OAIXML.FROM)) { 391 String from = (String)param_map.get(OAIXML.FROM);391 String from = param_map.get(OAIXML.FROM); 392 392 from_date = OAIXML.getDate(from); 393 393 } 394 394 if(param_map.containsKey(OAIXML.UNTIL)) { 395 String until = (String)param_map.get(OAIXML.UNTIL);395 String until = param_map.get(OAIXML.UNTIL); 396 396 until_date = OAIXML.getDate(until); 397 397 } … … 403 403 404 404 //get a list of identifiers (it contains a list of strings) 405 ArrayList oid_list = getChildrenIds(OAIXML.BROWSELIST);405 ArrayList<String> oid_list = getChildrenIds(OAIXML.BROWSELIST); 406 406 if (oid_list == null) { 407 407 logger.error("No matched records found in collection: browselist is empty"); … … 411 411 Element list_records = OAIXML.createElement(OAIXML.LIST_RECORDS); 412 412 for(int i=0; i<oid_list.size(); i++) { 413 String oid = (String)oid_list.get(i);413 String oid = oid_list.get(i); 414 414 DBInfo info = this.coll_db.getInfo(oid); 415 415 if (info == null) { … … 417 417 continue; 418 418 } 419 ArrayList keys = new ArrayList(info.getKeys());419 ArrayList<String> keys = new ArrayList<String>(info.getKeys()); 420 420 String oailastmodified = ""; 421 421 if(keys.contains(OAIXML.OAI_LASTMODIFIED)) { … … 527 527 return OAIXML.getResponse(OAIXML.createErrorElement(OAIXML.ID_DOES_NOT_EXIST, "")); 528 528 } 529 ArrayList oid_list = getChildrenIds(OAIXML.BROWSELIST);529 ArrayList<String> oid_list = getChildrenIds(OAIXML.BROWSELIST); 530 530 if (oid_list == null || oid_list.contains(oid) == false) { 531 531 logger.error("OID: " + oid + " is not present in the database."); … … 591 591 592 592 /** returns a list of the child ids in order, null if no children */ 593 protected ArrayList getChildrenIds(String node_id) {593 protected ArrayList<String> getChildrenIds(String node_id) { 594 594 DBInfo info = this.coll_db.getInfo(node_id); 595 595 if (info == null) { … … 601 601 return null; 602 602 } 603 ArrayList children = new ArrayList();603 ArrayList<String> children = new ArrayList<String>(); 604 604 StringTokenizer st = new StringTokenizer(contains, ";"); 605 605 while (st.hasMoreTokens()) { … … 663 663 public String[] getMetadata(DBInfo info, String names) { 664 664 String[] name_value = new String[2]; 665 ArrayList keys = new ArrayList(info.getKeys());665 ArrayList<String> keys = new ArrayList<String>(info.getKeys()); 666 666 for (int i=0; i<keys.size(); i++) { 667 String key = (String)keys.get(i);667 String key = keys.get(i); 668 668 String first_name = ""; 669 669 String second_name = ""; … … 689 689 return null; 690 690 } 691 HashMap map = new HashMap();691 HashMap<String, String> map = new HashMap<String, String>(); 692 692 boolean empty_map = true; 693 693 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java
r16355 r25635 30 30 import java.util.HashMap; 31 31 import java.io.File; 32 import java.io.Serializable; 32 33 33 34 import org.apache.log4j.*; … … 133 134 134 135 Element param_elem = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER); 135 HashMap params = GSXML.extractParams(param_elem, false);136 HashMap<String, Serializable> params = GSXML.extractParams(param_elem, false); 136 137 137 138 long first_e = Long.parseLong((String)params.get("pfe")); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java
r24393 r25635 92 92 * XML element for stylesheet requests - map of service name to format elem 93 93 */ 94 protected HashMap format_info_map = null;94 protected HashMap<String, Node> format_info_map = null; 95 95 96 96 /** … … 151 151 this.doc = this.converter.newDOM(); 152 152 this.short_service_info = this.doc.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER); 153 this.format_info_map = new HashMap ();153 this.format_info_map = new HashMap<String, Node>(); 154 154 } 155 155 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceUtil.java
r24752 r25635 2 2 3 3 import java.io.File; 4 import java.io.Serializable; 4 5 import java.util.ArrayList; 5 6 import java.util.HashMap; … … 79 80 } 80 81 81 HashMap params = GSXML.extractParams(param_list, false);82 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 82 83 83 84 String regex = (String)params.get("extregex"); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/SharedSoleneGS2FieldSearch.java
r24738 r25635 93 93 if (name.equals(RANK_PARAM)) { 94 94 // get the fields 95 ArrayList fields = new ArrayList();95 ArrayList<String> fields = new ArrayList<String>(); 96 96 fields.add(RANK_PARAM_RANK_VALUE); 97 ArrayList field_names = new ArrayList();97 ArrayList<String> field_names = new ArrayList<String>(); 98 98 field_names.add(getTextString("param.sortBy.rank", lang)); 99 99 getSortByIndexData(fields, field_names, lang); 100 100 101 param = GSXML.createParameterDescription2(this.doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, (String)fields.get(0), fields, field_names );101 param = GSXML.createParameterDescription2(this.doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, fields.get(0), fields, field_names ); 102 102 } 103 103 if (param != null) { … … 108 108 } 109 109 110 protected void getSortByIndexData(ArrayList index_ids, ArrayListindex_names, String lang) {110 protected void getSortByIndexData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang) { 111 111 // the index info - 112 112 Element index_list = (Element)GSXML.getChildByTagName(this.config_info, INDEX_ELEM+GSXML.LIST_MODIFIER); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/XMLRetrieve.java
r14225 r25635 16 16 // General Java classes 17 17 import java.io.File; 18 import java.io.Serializable; 18 19 import java.util.Vector; 19 20 import java.util.HashMap; … … 46 47 // look for the parameters 47 48 Element param_list = (Element)GSXML.getChildByTagName(info, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER); 48 HashMap params;49 HashMap<String, Serializable> params; 49 50 String services_to_provide = ""; 50 51 if (param_list != null) { … … 242 243 } 243 244 244 Vector meta_name_list = new Vector();245 Vector<String> meta_name_list = new Vector<String>(); 245 246 boolean all_metadata = false; 246 247 // Process the request parameters … … 345 346 } 346 347 347 protected Element getMetadata(String node_id, boolean all, Vector meta_name_list) {348 protected Element getMetadata(String node_id, boolean all, Vector<String> meta_name_list) { 348 349 349 350 // our default strategy here is to only return Title and root:Title … … 373 374 // have to process metadata one by one 374 375 for (int i=0; i<meta_name_list.size(); i++) { 375 String meta_name = (String)meta_name_list.elementAt(i);376 String meta_name = meta_name_list.elementAt(i); 376 377 String actual_meta_name = meta_name; 377 378 if (meta_name.startsWith("root_")) { -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/XSLTServices.java
r14225 r25635 216 216 217 217 // extract the only parameter we care about 218 HashMap params = GSXML.extractParams(param_list, false);218 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 219 219 String query = (String)params.get(QUERY_PARAM); 220 220 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/DatabaseFactory.java
r16883 r25635 11 11 12 12 public class DatabaseFactory{ 13 private static HashMap serverMap = new HashMap();13 private static HashMap<String, SQLServer> serverMap = new HashMap<String, SQLServer>(); 14 14 private static Logger logger = Logger.getLogger(org.greenstone.gsdl3.sql.DatabaseFactory.class.getName()); 15 15 … … 29 29 public static final SQLServer getDatabaseServer(String dbname){ 30 30 dbname = properDBName(dbname); 31 if (serverMap.containsKey(dbname)) return (SQLServer)serverMap.get(dbname);31 if (serverMap.containsKey(dbname)) return serverMap.get(dbname); 32 32 String fullName = "org.greenstone.gsdl3.sql." + dbname.toLowerCase()+ "." + dbname +"SQLServer"; 33 33 try { -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/MetadataDBWrapper.java
r16883 r25635 2 2 3 3 import java.util.ArrayList; 4 import java.util.HashMap; 4 5 5 6 import java.sql.ResultSet; … … 22 23 23 24 //return a list of rows 24 public ArrayList executeQuery(String query_statement);25 public ArrayList<HashMap<String, Object>> executeQuery(String query_statement); 25 26 26 27 public ResultSet queryResultSet(String query_statement); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbyDBWrapper.java
r21321 r25635 30 30 if(sqlState == null) return null; 31 31 String dbInfoState = sqlState.getDBInfoStatement(id); 32 ArrayList result = executeQuery(dbInfoState);32 ArrayList<HashMap<String, Object>> result = executeQuery(dbInfoState); 33 33 if (result.size() == 0) return null; 34 34 DBInfo info = new DBInfo(); 35 35 for(int i=0; i<result.size();i++){ 36 HashMap arow = (HashMap)result.get(i);36 HashMap arow = result.get(i); 37 37 Iterator ite = arow.keySet().iterator(); 38 38 while(ite.hasNext()){ … … 90 90 } 91 91 92 public synchronized ArrayList executeQuery(String query_statement){92 public synchronized ArrayList<HashMap<String, Object>> executeQuery(String query_statement){ 93 93 //the database hasn't been correct yet 94 ArrayList results = new ArrayList();94 ArrayList<HashMap<String, Object>> results = new ArrayList<HashMap<String, Object>>(); 95 95 ResultSet rs = null; 96 96 try{ … … 101 101 int numOfColumns = rsmd.getColumnCount(); 102 102 while(rs.next()){ 103 HashMap arow = new HashMap();103 HashMap<String, Object> arow = new HashMap<String, Object>(); 104 104 for(int i = 1; i <= numOfColumns ; i++){ 105 105 arow.put(rsmd.getColumnName(i).toLowerCase(), rs.getObject(i)); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DBInfo.java
r24393 r25635 30 30 public class DBInfo 31 31 { 32 protected HashMap info_map_;32 protected HashMap<String, Vector<String>> info_map_; 33 33 34 34 public DBInfo() 35 35 { 36 info_map_ = new HashMap ();36 info_map_ = new HashMap<String, Vector<String>>(); 37 37 } 38 38 … … 42 42 public void setInfo(String key, String value) 43 43 { 44 Vector v = new Vector();44 Vector<String> v = new Vector<String>(); 45 45 v.add(value); 46 46 info_map_.put(key, v); … … 53 53 public String getInfo(String key) 54 54 { 55 Vector items = (Vector)info_map_.get(key);55 Vector items = info_map_.get(key); 56 56 if (items == null) 57 57 { … … 66 66 public void addInfo(String key, String value) 67 67 { 68 Vector v = (Vector)info_map_.get(key);68 Vector<String> v = info_map_.get(key); 69 69 if (v == null) 70 70 { 71 v = new Vector ();71 v = new Vector<String>(); 72 72 } 73 73 v.add(value); … … 80 80 * @return Vector of Strings 81 81 */ 82 public Vector getMultiInfo(String key)82 public Vector<String> getMultiInfo(String key) 83 83 { 84 return (Vector)info_map_.get(key);84 return info_map_.get(key); 85 85 } 86 86 87 87 /** returns a list of all the keys in the info */ 88 public Set getKeys()88 public Set<String> getKeys() 89 89 { 90 90 return info_map_.keySet(); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java
r23798 r25635 26 26 // Apache Commons 27 27 import org.apache.commons.lang3.*; 28 import org.greenstone.gsdl3.util.MacroResolver.Macro; 28 29 29 30 import java.util.Stack; … … 65 66 } 66 67 67 Stack macros = new Stack();//ArrayList macros;68 Stack<Macro> macros = new Stack<Macro>();//ArrayList macros; 68 69 if (scope.equals(SCOPE_TEXT)) { 69 70 macros.addAll(text_macros); … … 74 75 while(!macros.empty()) { 75 76 String new_text = null; 76 Macro m = (Macro)macros.pop();//.get(i);77 Macro m = macros.pop();//.get(i); 77 78 switch (m.type) { 78 79 case TYPE_DICT: -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSDocumentModel.java
r25551 r25635 1681 1681 1682 1682 String srcFile = info.getInfo("src-file"); 1683 Vector data = info.getMultiInfo("assoc-file");1683 Vector<String> data = info.getMultiInfo("assoc-file"); 1684 1684 1685 1685 ArrayList<String> assocFiles = new ArrayList<String>(); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSFile.java
r24859 r25635 243 243 * this is not so good because sites may be on a different computer 244 244 */ 245 static public String stylesheetFile(String gsdl3_home, String site_name, String collection, String interface_name, ArrayList base_interfaces, String filename)245 static public String stylesheetFile(String gsdl3_home, String site_name, String collection, String interface_name, ArrayList<String> base_interfaces, String filename) 246 246 { 247 247 … … 281 281 for (int i = 0; i < base_interfaces.size(); i++) 282 282 { 283 interface_home = interfaceHome(gsdl3_home, (String)base_interfaces.get(i));283 interface_home = interfaceHome(gsdl3_home, base_interfaces.get(i)); 284 284 stylesheet = new File(interface_home + File.separatorChar + "transform" + File.separatorChar + filename); 285 285 if (stylesheet.exists()) … … 293 293 } 294 294 295 static public ArrayList<File> getStylesheetFiles(String gsdl3_home, String site_name, String collection, String interface_name, ArrayList base_interfaces, String filename)295 static public ArrayList<File> getStylesheetFiles(String gsdl3_home, String site_name, String collection, String interface_name, ArrayList<String> base_interfaces, String filename) 296 296 { 297 297 ArrayList<File> stylesheets = new ArrayList<File>(); … … 328 328 for (int i = 0; i < base_interfaces.size(); i++) 329 329 { 330 interface_home = interfaceHome(gsdl3_home, (String)base_interfaces.get(i));330 interface_home = interfaceHome(gsdl3_home, base_interfaces.get(i)); 331 331 stylesheet = new File(interface_home + File.separatorChar + "transform" + File.separatorChar + filename); 332 332 if (stylesheet.exists()) -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSParams.java
r25483 r25635 75 75 public static final String EXTERNAL_LINK_TYPE_FRAMED = "frame"; 76 76 77 protected HashMap param_map = null;77 protected HashMap<String, Param> param_map = null; 78 78 79 79 public GSParams() 80 80 { 81 this.param_map = new HashMap (30);81 this.param_map = new HashMap<String, Param>(30); 82 82 83 83 // add in all the standard params … … 135 135 public boolean setParamDefault(String name, String default_value) 136 136 { 137 Param p = (Param)this.param_map.get(name);137 Param p = this.param_map.get(name); 138 138 if (p == null) 139 139 return false; … … 147 147 if (name.startsWith("p.")) 148 148 return false; 149 Param p = (Param)this.param_map.get(name);149 Param p = this.param_map.get(name); 150 150 if (p == null) 151 151 return true; // if things are not in here, always save. -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java
r25571 r25635 28 28 import javax.xml.transform.TransformerFactory; 29 29 import javax.xml.transform.Transformer; 30 31 import java.io.Serializable; 30 32 import java.io.StringWriter; 31 33 import javax.xml.transform.stream.StreamResult; … … 299 301 } 300 302 301 public static HashMap extractParams(Element xml, boolean deep)303 public static HashMap<String, Serializable> extractParams(Element xml, boolean deep) 302 304 { 303 305 return extractParams(xml, deep, null); … … 308 310 * deep=true, extracts embedded params, otherwise just top level params 309 311 */ 310 public static HashMap extractParams(Element xml, boolean deep, String toFind)312 public static HashMap<String, Serializable> extractParams(Element xml, boolean deep, String toFind) 311 313 { 312 314 … … 326 328 params = xml.getChildNodes(); 327 329 } 328 HashMap param_map = new HashMap();330 HashMap<String, Serializable> param_map = new HashMap<String, Serializable>(); 329 331 for (int i = 0; i < params.getLength(); i++) 330 332 { … … 354 356 String namespace = name.substring(0, pos); 355 357 name = name.substring(pos + 1); 356 HashMap map = (HashMap) param_map.get(namespace);358 HashMap<String, String> map = (HashMap<String, String>) param_map.get(namespace); 357 359 if (map == null) 358 360 { 359 map = new HashMap ();361 map = new HashMap<String, String>(); 360 362 param_map.put(namespace, map); 361 363 } … … 669 671 } 670 672 671 public static HashMap getChildrenMap(Node n)672 { 673 674 HashMap map = new HashMap();673 public static HashMap<String, Node> getChildrenMap(Node n) 674 { 675 676 HashMap<String, Node> map = new HashMap<String, Node>(); 675 677 Node child = n.getFirstChild(); 676 678 while (child != null) … … 856 858 } 857 859 858 public static Element createParameterDescription2(Document owner, String id, String display_name, String type, String default_value, ArrayList option_ids, ArrayListoption_names)860 public static Element createParameterDescription2(Document owner, String id, String display_name, String type, String default_value, ArrayList<String> option_ids, ArrayList<String> option_names) 859 861 { 860 862 … … 872 874 { 873 875 Element e = owner.createElement(PARAM_OPTION_ELEM); 874 e.setAttribute(NAME_ATT, (String)option_ids.get(i));875 e.appendChild(createDisplayTextElement(owner, GSXML.DISPLAY_TEXT_NAME, (String)option_names.get(i)));876 e.setAttribute(NAME_ATT, option_ids.get(i)); 877 e.appendChild(createDisplayTextElement(owner, GSXML.DISPLAY_TEXT_NAME, option_names.get(i))); 876 878 p.appendChild(e); 877 879 } -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXSLT.java
r25397 r25635 124 124 * the files 125 125 */ 126 public static void absoluteIncludePaths(Document stylesheet, String gsdl3_home, String site_name, String collection, String interface_name, ArrayList base_interfaces)126 public static void absoluteIncludePaths(Document stylesheet, String gsdl3_home, String site_name, String collection, String interface_name, ArrayList<String> base_interfaces) 127 127 { 128 128 … … 151 151 * metadata names into a Vector 152 152 */ 153 public static Vector extractWantedMetadata(Document stylesheet, String template_name)153 public static Vector<String> extractWantedMetadata(Document stylesheet, String template_name) 154 154 { 155 155 156 Vector metadata = new Vector();156 Vector<String> metadata = new Vector<String>(); 157 157 Element base_node = stylesheet.getDocumentElement(); 158 158 NodeList templates = base_node.getElementsByTagNameNS("*", "template"); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/MacroResolver.java
r25300 r25635 35 35 public static final int TYPE_DICT = 2; 36 36 37 protected ArrayList text_macros = null;38 protected ArrayList metadata_macros = null;37 protected ArrayList<Macro> text_macros = null; 38 protected ArrayList<Macro> metadata_macros = null; 39 39 40 40 String lang = null; 41 41 42 42 public MacroResolver() { 43 this.text_macros = new ArrayList ();44 this.metadata_macros = new ArrayList ();43 this.text_macros = new ArrayList<Macro>(); 44 this.metadata_macros = new ArrayList<Macro>(); 45 45 } 46 46 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/MyNodeList.java
r9874 r25635 27 27 28 28 public class MyNodeList implements NodeList { 29 private ArrayList node_list = null;29 private ArrayList<Node> node_list = null; 30 30 31 31 public MyNodeList() { 32 node_list = new ArrayList ();32 node_list = new ArrayList<Node>(); 33 33 } 34 34 public int getLength() { … … 38 38 public Node item(int i) { 39 39 if (i<0 || i >= node_list.size()) return null; 40 return (Node)node_list.get(i);40 return node_list.get(i); 41 41 } 42 42 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/OAIXML.java
r23938 r25635 22 22 23 23 import org.w3c.dom.*; 24 24 25 import java.io.*; 25 26 import java.net.*; … … 561 562 return oai; 562 563 } 563 public static HashMap getChildrenMapByTagName(Node n, String tag_name) {564 public static HashMap<String, Node> getChildrenMapByTagName(Node n, String tag_name) { 564 565 565 HashMap map= new HashMap();566 HashMap<String, Node> map= new HashMap<String, Node>(); 566 567 Node child = n.getFirstChild(); 567 568 while (child!=null) { … … 622 623 } 623 624 } 624 public static HashMap getParamMap(NodeList params) {625 HashMap map = new HashMap();625 public static HashMap<String, String> getParamMap(NodeList params) { 626 HashMap<String, String> map = new HashMap<String, String>(); 626 627 for(int i=0; i<params.getLength(); i++) { 627 628 Element param = (Element)params.item(i); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/SimpleCollectionDatabase.java
r24393 r25635 154 154 { 155 155 StringBuilder valueToAdd = new StringBuilder(); 156 Iterator i = info.getKeys().iterator();156 Iterator<String> i = info.getKeys().iterator(); 157 157 while (i.hasNext()) 158 158 { 159 String currentKey = (String)i.next();160 Vector currentValues = (Vector)info.getMultiInfo(currentKey);159 String currentKey = i.next(); 160 Vector<String> currentValues = (Vector<String>)info.getMultiInfo(currentKey); 161 161 162 162 if(currentValues.size() == 0) -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/UserQueryResult.java
r25265 r25635 59 59 for (int i = 0; i < users.size(); i++) 60 60 { 61 result += ((UserTermInfo) users.elementAt(i)).toString() + ", ";61 result += users.elementAt(i).toString() + ", "; 62 62 } 63 63 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java
r25617 r25635 216 216 } 217 217 218 public Node transform(Document stylesheet, Document source, HashMap parameters)218 public Node transform(Document stylesheet, Document source, HashMap<String, Comparable> parameters) 219 219 { 220 220 return transform(stylesheet, source, parameters, null, null); 221 221 } 222 222 223 public Node transform(Document stylesheet, Document source, HashMap parameters, Document docDocType)223 public Node transform(Document stylesheet, Document source, HashMap<String, Comparable> parameters, Document docDocType) 224 224 { 225 225 return transform(stylesheet, source, parameters, docDocType, null); 226 226 } 227 227 228 protected Node transform(Document stylesheet, Document source, HashMap parameters, Document docDocType, Document resultNode)228 protected Node transform(Document stylesheet, Document source, HashMap<String, Comparable> parameters, Document docDocType, Document resultNode) 229 229 { 230 230 try -
main/trunk/greenstone3/src/java/org/greenstone/server/BaseServerSettings.java
r24490 r25635 202 202 return returnValues; 203 203 } 204 protected void save(ScriptReadWrite scriptReadWrite, ArrayList newFileLines) {}204 protected void save(ScriptReadWrite scriptReadWrite, ArrayList<String> newFileLines) {} 205 205 protected abstract JPanel createServletPanel(); 206 206 … … 278 278 279 279 if (has_changed) { 280 ArrayList oldFileLines = null;281 ArrayList newFileLines = null;280 ArrayList<String> oldFileLines = null; 281 ArrayList<String> newFileLines = null; 282 282 283 283 ScriptReadWrite scriptReadWrite = new ScriptReadWrite(); -
main/trunk/greenstone3/src/java/org/greenstone/server/Server2.java
r24911 r25635 83 83 config_properties.setProperty(url, URL_PENDING); 84 84 ScriptReadWrite scriptReadWrite = new ScriptReadWrite(); 85 ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);85 ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file); 86 86 scriptReadWrite.replaceOrAddLine(fileLines, url, URL_PENDING, true); 87 87 scriptReadWrite.writeOutFile(config_properties_file, fileLines); … … 160 160 String hosts = inetAddress.getHostName(); 161 161 ScriptReadWrite scriptReadWrite = new ScriptReadWrite(); 162 ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);162 ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file); 163 163 scriptReadWrite.replaceOrAddLine(fileLines, "hosts", hosts, true); 164 164 scriptReadWrite.writeOutFile(config_properties_file, fileLines); … … 175 175 config_properties.setProperty(url, URL_PENDING); 176 176 ScriptReadWrite scriptReadWrite = new ScriptReadWrite(); 177 ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);177 ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file); 178 178 scriptReadWrite.replaceOrAddLine(fileLines, url, URL_PENDING, true); 179 179 scriptReadWrite.writeOutFile(config_properties_file, fileLines); … … 355 355 // write this updated port to the config file, since the configure target uses the file to run 356 356 ScriptReadWrite scriptReadWrite = new ScriptReadWrite(); 357 ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);357 ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file); 358 358 scriptReadWrite.replaceOrAddLine(fileLines, "portnumber", port, false); // write the correct port 359 359 scriptReadWrite.writeOutFile(config_properties_file, fileLines); … … 377 377 protected void preStop() { 378 378 ScriptReadWrite scriptReadWrite = new ScriptReadWrite(); 379 ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);379 ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file); 380 380 381 381 // Remove the url=... line, start searching from the end 382 382 boolean done = false; 383 383 for (int i = fileLines.size()-1; i >= 0 && !done; i--) { 384 String line = ((String) fileLines.get(i)).trim();384 String line = fileLines.get(i).trim(); 385 385 if(line.startsWith(property_prefix+"url=")) { 386 386 fileLines.remove(i); … … 437 437 438 438 ScriptReadWrite scriptReadWrite = new ScriptReadWrite(); 439 ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);439 ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file); 440 440 scriptReadWrite.replaceOrAddLine(fileLines, property_prefix+"url", libraryURL, true); 441 441 scriptReadWrite.replaceOrAddLine(fileLines, "portnumber", port, false); // write the correct port -
main/trunk/greenstone3/src/java/org/greenstone/server/Server2Settings.java
r24207 r25635 101 101 } 102 102 103 public void save(ScriptReadWrite scriptReadWrite, ArrayList newFileLines)103 public void save(ScriptReadWrite scriptReadWrite, ArrayList<String> newFileLines) 104 104 { 105 105 // write only 1 or 0 (and not true or false) for Server2 -
main/trunk/greenstone3/src/java/org/greenstone/server/Server3Settings.java
r25388 r25635 22 22 protected String servletDefault = null; 23 23 protected JComboBox servlet_combobox; 24 protected HashMap url_mappings = null;24 protected HashMap<String, String> url_mappings = null; 25 25 26 26 public Server3Settings(BaseServer server) … … 49 49 NodeList servlet_mappings = web_config.getElementsByTagName("servlet-mapping"); 50 50 // make a little map class 51 url_mappings = new HashMap ();51 url_mappings = new HashMap<String, String>(); 52 52 for (int i = 0; i < servlet_mappings.getLength(); i++) { 53 53 Element map = (Element) servlet_mappings.item(i); … … 80 80 boolean hasChanged = false; 81 81 boolean requireRestart = false; 82 String urlMapping = (String)url_mappings.get(servlet_combobox.getSelectedItem());82 String urlMapping = url_mappings.get(servlet_combobox.getSelectedItem()); 83 83 if(urlMapping.endsWith("/*")) { // urlmapping maybe something like "/library/*" 84 84 urlMapping = urlMapping.substring(0, urlMapping.length()-2); … … 92 92 } 93 93 94 public void save(ScriptReadWrite scriptReadWrite, ArrayList newFileLines)94 public void save(ScriptReadWrite scriptReadWrite, ArrayList<String> newFileLines) 95 95 { 96 96 String newAutoEnter = (new Boolean(autoEnter.isSelected())).toString(); … … 101 101 102 102 String newServletDef = (String) servlet_combobox.getSelectedItem(); 103 String servletDefName = (String)url_mappings.get(newServletDef);103 String servletDefName = url_mappings.get(newServletDef); 104 104 if(servletDefName.endsWith("/*")) { // urlmapping maybe something like "/library/*" 105 105 servletDefName = servletDefName.substring(0, servletDefName.length()-2); -
main/trunk/greenstone3/src/java/org/greenstone/testing/ClassFinder.java
r3290 r25635 19 19 */ 20 20 public class ClassFinder { 21 final private Vector classNameList = new Vector();21 final private Vector<String> classNameList = new Vector<String> (); 22 22 final private int startPackageName; 23 23 … … 78 78 * Return the found classes. 79 79 */ 80 public Iterator getClasses () {80 public Iterator<String> getClasses () { 81 81 return classNameList.iterator (); 82 82 } -
main/trunk/greenstone3/src/java/org/greenstone/testing/TestCaseLoader.java
r3290 r25635 7 7 */ 8 8 public class TestCaseLoader { 9 final private Vector classList = new Vector();9 final private Vector<Class> classList = new Vector<Class> (); 10 10 final private String requiredType; 11 11 … … 78 78 * Obtain an iterator over the collection of test case classes loaded by <code>loadTestCases</code> 79 79 */ 80 public Iterator getClasses () {80 public Iterator<Class> getClasses () { 81 81 return classList.iterator (); 82 82 } -
main/trunk/greenstone3/src/java/org/greenstone/util/Configuration.java
r22085 r25635 42 42 public class Configuration { 43 43 44 static private Hashtable hash = null;44 static private Hashtable<String, String> hash = null; 45 45 46 46 /** The first of three patterns used during tokenization, this pattern handles a comma separated list. */ … … 53 53 public Configuration() { 54 54 55 hash = new Hashtable ();55 hash = new Hashtable<String, String>(); 56 56 57 57 … … 76 76 /** Retrieve whether the named property is set or not */ 77 77 static public boolean get(String property) { 78 String value = (String)hash.get(property);78 String value = hash.get(property); 79 79 return (value != null && value.equalsIgnoreCase("true")); 80 80 } … … 82 82 /** Retrieve the value of the named property as a String */ 83 83 static public String getString(String property) { 84 return (String)hash.get(property);84 return hash.get(property); 85 85 } 86 86 … … 89 89 Locale result = Locale.getDefault(); 90 90 try { 91 String raw = (String)hash.get(property);91 String raw = hash.get(property); 92 92 if (raw==null) { 93 93 return result; … … 113 113 static public Color getColor(String property) { 114 114 Color result = Color.white; // Default 115 String raw = (String)hash.get(property);115 String raw = hash.get(property); 116 116 if (raw == null || raw.equals("")) { 117 117 return result; -
main/trunk/greenstone3/src/java/org/greenstone/util/ScriptReadWrite.java
r22085 r25635 15 15 } 16 16 17 public ArrayList readInFile(File file) {17 public ArrayList<String> readInFile(File file) { 18 18 try { 19 ArrayList fileLines = new ArrayList();19 ArrayList<String> fileLines = new ArrayList<String>(); 20 20 String oneLine = null; 21 21 BufferedReader bufferedReader = new BufferedReader(new FileReader(file)); … … 31 31 } 32 32 33 public void writeOutFile(File file, ArrayList fileLines_in) {33 public void writeOutFile(File file, ArrayList<String> fileLines_in) { 34 34 try { 35 35 PrintWriter printWriter = new PrintWriter(new BufferedWriter(new FileWriter(file))); … … 44 44 } 45 45 46 public ArrayList queryReplace(ArrayListfileLines_ex, String param,46 public ArrayList<String> queryReplace(ArrayList<String> fileLines_ex, String param, 47 47 String newValue) { 48 48 // only replace existing, don't append if param does not exist … … 52 52 // if the parameter exists, then a replace is performed, else the parameter-value 53 53 // is appended 54 public ArrayList replaceOrAddLine(ArrayListfileLines_ex, String param, String newValue,54 public ArrayList<String> replaceOrAddLine(ArrayList<String> fileLines_ex, String param, String newValue, 55 55 boolean replaceElseAdd) 56 56 { … … 63 63 64 64 for (int i = 0; i < fileLines_ex.size(); i++) { 65 oneLine = ((String) fileLines_ex.get(i)).trim();65 oneLine = fileLines_ex.get(i).trim(); 66 66 // oneLine_length = oneLine.length(); 67 67 StringTokenizer st = new StringTokenizer(oneLine, "=");
Note:
See TracChangeset
for help on using the changeset viewer.