Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java
- Timestamp:
- 2012-05-22T13:01:04+12:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
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 }
Note:
See TracChangeset
for help on using the changeset viewer.