Changeset 35363 for main

Timestamp:

2021-09-11T14:11:31+12:00 (3 years ago)

Author:

kjdon

Message:

new Long(long) and new Integer(int) are deprecated. Use Integer.valueOf and Long.valueOf instead

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• action/DocumentAction.java (modified) (3 diffs)
• core/OAIReceptionist.java (modified) (1 diff)
• util/OAIResumptionToken.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -1477 +1477 @@
         if (phrase_query_term_variants_hierarchy.size() ==0) {
           for (int i = 0; i < word_matches.size(); i++) {
-            highlight_start_positions.add(new Integer(word_matches.get(i).start_position));
-            highlight_end_positions.add(new Integer(word_matches.get(i).end_position));
+            highlight_start_positions.add(Integer.valueOf(word_matches.get(i).start_position));
+            highlight_end_positions.add(Integer.valueOf(word_matches.get(i).end_position));
           }
         }
@@ -1517 +1517 @@
                             }
 
-                            highlight_start_positions.add(new Integer(partial_phrase_match.start_position));
-                            highlight_end_positions.add(new Integer(word_match.end_position));
+                            highlight_start_positions.add(Integer.valueOf(partial_phrase_match.start_position));
+                            highlight_end_positions.add(Integer.valueOf(word_match.end_position));
                         }
                         // No, but add the partial match back into the list for next time
@@ -1544 +1544 @@
                     if (phrase_query_p_term_variants_list.size() == 1)
                     {
-                        highlight_start_positions.add(new Integer(word_match.start_position));
-                        highlight_end_positions.add(new Integer(word_match.end_position));
+                        highlight_start_positions.add(Integer.valueOf(word_match.start_position));
+                        highlight_end_positions.add(Integer.valueOf(word_match.end_position));
                     }
                     // Otherwise we have the start of a potential phrase match

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java

@@ -75 +75 @@
     * NOTE: Being done with Integer instead of int because they're put into Vectors and they can only contain Objects not primitive data types.
   */
-  protected static final Integer DEACTIVATED = new Integer(0);
-  protected static final Integer ACTIVE = new Integer(1);
+  protected static final Integer DEACTIVATED = Integer.valueOf(0);
+  protected static final Integer ACTIVE = Integer.valueOf(1);
   
   /** If this is true, then there are no OAI enabled collections, so can always return noRecordsMatch (after validating the request params) */

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/OAIResumptionToken.java

@@ -113 +113 @@
     data.put(OAIXML.METADATA_PREFIX, metadata_prefix);
     stored_tokens.put(name, data);
-    expiration_data.put(name, new Long(expiration));
+    expiration_data.put(name, Long.valueOf(expiration));
   }
 
@@ -123 +123 @@
     stored_tokens.put(base_token_name, data);   
     expiration_date += (OAIXML.getTokenExpiration());
-    expiration_data.put(base_token_name, new Long(expiration_date));
+    expiration_data.put(base_token_name, Long.valueOf(expiration_date));
     String token_name = base_token_name+":" + cursor + ":" + current_set +":"+ current_cursor;
     data.put(OAIXML.FROM, from);