Changeset 35665

Timestamp:

2021-10-21T19:57:30+13:00 (3 years ago)

Author:

davidb

Message:

Calling things like new Boolean(false) and new Integer(100) has been depreated in favour of Boolean.valueOf(false) and Integer.valueOf(100). This set of code commits reflects the necessary coding changes to the valueOf() form, which the JDK developers specify is a more efficient way to achieve the same thing

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/DOMProxyListModel.java (modified) (2 diffs)
• download/DownloadProgressBar.java (modified) (2 diffs)
• feedback/Movie.java (modified) (2 diffs)
• gems/MetadataSetModel.java (modified) (1 diff)
• gui/Preferences.java (modified) (1 diff)
• gui/tree/DragTree.java (modified) (1 diff)
• metadata/DocXMLFile.java (modified) (1 diff)
• util/SafeProcess.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/cdm/DOMProxyListModel.java

@@ -209 +209 @@
         }
         
-        Object object = cache.get (new Integer (index));
+        Object object = cache.get (Integer.valueOf(index));
         if (object != null) {
             return object;
@@ -223 +223 @@
         // Now wrap it in the object of the users choice
         object = class_type.create (element);
-        cache.put (new Integer (index), object);
+        cache.put (Integer.valueOf(index), object);
         return object;
     }

main/trunk/gli/src/org/greenstone/gatherer/download/DownloadProgressBar.java

@@ -348 +348 @@
         else {
             // Assign a new progress bar of length expected content length.
-            progress = new JProgressBar(0, (new Long(expected)).intValue());
+            progress = new JProgressBar(0, (Long.valueOf(expected)).intValue());
         }
         progress.setEnabled(true);
@@ -358 +358 @@
         // update percent complete.
         else if (expected != 0) {
-        progress.setValue((new Long(file_size)).intValue());
-        int p_c = (new Double(progress.getPercentComplete() * 100)).intValue();
+        progress.setValue((Long.valueOf(file_size)).intValue());
+        int p_c = (Double.valueOf(progress.getPercentComplete() * 100)).intValue();
         progress.setString(p_c + "%");
         progress.setStringPainted(true);

main/trunk/gli/src/org/greenstone/gatherer/feedback/Movie.java

@@ -171 +171 @@
         NumberFormatter formatter;
     formatter = new NumberFormatter(numberFormat);
-        formatter.setMinimum(new Integer(FPS_MIN));
-        formatter.setMaximum(new Integer(FPS_MAX));
+        formatter.setMinimum(Integer.valueOf(FPS_MIN));
+        formatter.setMaximum(Integer.valueOf(FPS_MAX));
 
         textField = new JFormattedTextField(formatter);
     textField.setBackground(new Color(224,240,224));
-        textField.setValue(new Integer(FPS_INIT));
+        textField.setValue(Integer.valueOf(FPS_INIT));
         textField.setColumns(5);
         textField.addPropertyChangeListener(this);
@@ -267 +267 @@
         if (!source.getValueIsAdjusting()) 
         { 
-        textField.setValue(new Integer(fps));
+        textField.setValue(Integer.valueOf(fps));
         if (fps == 0) 
             {

main/trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetModel.java

@@ -92 +92 @@
     public void valueChanged(){
         setChanged();
-    notifyObservers(new Boolean(false));
+    notifyObservers(Boolean.valueOf(false));
     clearChanged();
     }

main/trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -581 +581 @@
     String port_value = Configuration.getString("general."+protocol+"_proxy_port", true);
     if(port_value.length() > 0) {
-       proxy_port_field = new JSpinner(new SpinnerNumberModel((new Integer(port_value)).intValue(), 0, 65535, 1));
+       proxy_port_field = new JSpinner(new SpinnerNumberModel((Integer.valueOf(port_value)).intValue(), 0, 65535, 1));
     }
     else {

main/trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTree.java

@@ -70 +70 @@
     // For some reason these aren't set with Java 1.4.2 and the GTK look and feel?
     if (UIManager.get("Tree.leftChildIndent") == null) {
-        UIManager.put("Tree.leftChildIndent", new Integer(7));
+        UIManager.put("Tree.leftChildIndent", Integer.valueOf(7));
     }
     if (UIManager.get("Tree.rightChildIndent") == null) {
-        UIManager.put("Tree.rightChildIndent", new Integer(13));
+        UIManager.put("Tree.rightChildIndent", Integer.valueOf(13));
     }
 

main/trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java

@@ -321 +321 @@
             source_file_name_to_description_elements_mapping.put(gsdlsourcefilename_value, new ArrayList());
         }
-        ((ArrayList) source_file_name_to_description_elements_mapping.get(gsdlsourcefilename_value)).add(new Integer(description_element_start_gsdlsourcefilename_value));      
+        ((ArrayList) source_file_name_to_description_elements_mapping.get(gsdlsourcefilename_value)).add(Integer.valueOf(description_element_start_gsdlsourcefilename_value));      
         
         // Next, if Windows, check if dealing with Win 8.3 Short Filename

main/trunk/gli/src/org/greenstone/gatherer/util/SafeProcess.java

@@ -1077 +1077 @@
         } else {
         long child_pid = sc.nextLong();
-        subprocs.push(new Long(child_pid));         
+        subprocs.push(Long.valueOf(child_pid));         
         }
     }