Changeset 8377 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-05-17T04:02:42+02:00 (9 years ago)

Author:

Don-vip

Message:

performance - remove useless boxing of boolean constants

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (1 diff)
• conflict/pair/ListMerger.java (modified) (2 diffs)
• dialogs/LayerListDialog.java (modified) (1 diff)
• dialogs/MapPaintDialog.java (modified) (1 diff)
• dialogs/ToggleDialog.java (modified) (1 diff)
• dialogs/changeset/query/ChangesetQueryTask.java (modified) (2 diffs)
• history/VersionTable.java (modified) (1 diff)
• io/RecentlyOpenedFilesMenu.java (modified) (1 diff)
• mappaint/ElemStyle.java (modified) (1 diff)
• mappaint/ElemStyles.java (modified) (2 diffs)
• mappaint/MultiCascade.java (modified) (1 diff)
• mappaint/mapcss/ExpressionFactory.java (modified) (2 diffs)
• preferences/SourceEditor.java (modified) (1 diff)
• preferences/SourceEntry.java (modified) (1 diff)
• preferences/advanced/ListEditor.java (modified) (1 diff)
• preferences/advanced/ListListEditor.java (modified) (1 diff)
• preferences/advanced/MapListEditor.java (modified) (1 diff)
• preferences/advanced/PreferencesTable.java (modified) (1 diff)
• preferences/display/ColorPreference.java (modified) (2 diffs)
• preferences/imagery/ImageryPreference.java (modified) (1 diff)
• preferences/plugin/PluginPreferencesModel.java (modified) (1 diff)
• progress/AbstractProgressMonitor.java (modified) (2 diffs)
• tagging/TaggingPresetItems.java (modified) (1 diff)
• widgets/AbstractTextComponentValidator.java (modified) (2 diffs)
• widgets/JosmComboBox.java (modified) (1 diff)
• widgets/JosmEditorPane.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -349 +349 @@
         }
 
-        Boolean skipLoadingPlugins = false;
+        boolean skipLoadingPlugins = false;
         if (args.containsKey(Option.SKIP_PLUGINS)) {
             skipLoadingPlugins = true;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -774 +774 @@
     }
 
-    public static interface FreezeActionProperties {
+    private static interface FreezeActionProperties {
         String PROP_SELECTED = FreezeActionProperties.class.getName() + ".selected";
     }
@@ -782 +782 @@
      *
      */
-    class FreezeAction extends AbstractAction implements ItemListener, FreezeActionProperties  {
-
-        public FreezeAction() {
+    private class FreezeAction extends AbstractAction implements ItemListener, FreezeActionProperties  {
+
+        private FreezeAction() {
             putValue(Action.NAME, tr("Freeze"));
             putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements."));
-            putValue(PROP_SELECTED, false);
+            putValue(PROP_SELECTED, Boolean.FALSE);
             setEnabled(true);
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -173 +173 @@
         layerList.addMouseListener(new PopupMenuHandler());
         layerList.setBackground(UIManager.getColor("Button.background"));
-        layerList.putClientProperty("terminateEditOnFocusLost", true);
-        layerList.putClientProperty("JTable.autoStartsEdit", false);
+        layerList.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
+        layerList.putClientProperty("JTable.autoStartsEdit", Boolean.FALSE);
         layerList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         layerList.setTableHeader(null);

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -140 +140 @@
         tblStyles.setSelectionModel(selectionModel= new DefaultListSelectionModel());
         tblStyles.addMouseListener(new PopupMenuHandler());
-        tblStyles.putClientProperty("terminateEditOnFocusLost", true);
+        tblStyles.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         tblStyles.setBackground(UIManager.getColor("Panel.background"));
         tblStyles.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -312 +312 @@
         setIsShowing(true);
         windowMenuItem.setState(true);
-        toggleAction.putValue("selected", false);
-        toggleAction.putValue("selected", true);
+        toggleAction.putValue("selected", Boolean.FALSE);
+        toggleAction.putValue("selected", Boolean.TRUE);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java

@@ -33 +33 @@
 /**
  * Asynchronous task to send a changeset query to the OSM API.
- *
+ * @since 2689
  */
 public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetDownloadTask{
@@ -57 +57 @@
      */
     public ChangesetQueryTask(ChangesetQuery query) {
-        super(tr("Querying and downloading changesets",false /* don't ignore exceptions */));
+        super(tr("Querying and downloading changesets"), false /* don't ignore exceptions */);
         CheckParameterUtil.ensureParameterNotNull(query, "query");
         this.query = query;

trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java

@@ -55 +55 @@
         setBackground(UIManager.getColor("Button.background"));
         setIntercellSpacing(new Dimension(6, 0));
-        putClientProperty("terminateEditOnFocusLost", true);
+        putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         popupMenu = new VersionTablePopupMenu();
         addMouseListener(new MouseListener());

trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java

@@ -59 +59 @@
                     putValue(NAME, file);
                     putValue("help", ht("/Action/OpenRecent"));
-                    putValue("toolbar", false);
+                    putValue("toolbar", Boolean.FALSE);
                 }
                 @Override

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

@@ -40 +40 @@
         zIndex = c.get(Z_INDEX, 0f, Float.class);
         objectZIndex = c.get(OBJECT_Z_INDEX, 0f, Float.class);
-        isModifier = c.get(MODIFIER, false, Boolean.class);
+        isModifier = c.get(MODIFIER, Boolean.FALSE, Boolean.class);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -369 +369 @@
         if (defaultNodesIdx == cacheIdx)
             return defaultNodes;
-        defaultNodes = fromCanvas("default-points", true, Boolean.class);
+        defaultNodes = fromCanvas("default-points", Boolean.TRUE, Boolean.class);
         defaultNodesIdx = cacheIdx;
         return defaultNodes;
@@ -380 +380 @@
         if (defaultLinesIdx == cacheIdx)
             return defaultLines;
-        defaultLines = fromCanvas("default-lines", true, Boolean.class);
+        defaultLines = fromCanvas("default-lines", Boolean.TRUE, Boolean.class);
         defaultLinesIdx = cacheIdx;
         return defaultLines;

trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java

@@ -64 +64 @@
             c = new Cascade();
             if (!"default".equals(layer) && !"*".equals(layer)) {
-                c.put(MODIFIER, true);
+                c.put(MODIFIER, Boolean.TRUE);
             }
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -969 +969 @@
                 Boolean b = Cascade.convertTo(arg.evaluate(env), boolean.class);
                 if (b == null || !b) {
-                    return false;
+                    return Boolean.FALSE;
                 }
             }
-            return true;
+            return Boolean.TRUE;
         }
     }
@@ -996 +996 @@
                 Boolean b = Cascade.convertTo(arg.evaluate(env), boolean.class);
                 if (b != null && b) {
-                    return true;
+                    return Boolean.TRUE;
                 }
             }
-            return false;
+            return Boolean.FALSE;
         }
     }

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -327 +327 @@
         tblIconPaths.getColumnModel().getColumn(0).setCellEditor(new FileOrUrlCellEditor(false));
         tblIconPaths.setRowHeight(20);
-        tblIconPaths.putClientProperty("terminateEditOnFocusLost", true);
+        tblIconPaths.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         iconPathsModel.setIconPaths(getInitialIconPathsList());
 

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java

@@ -90 +90 @@
      * @see #active
      */
-    public SourceEntry(String url, String name, String title, Boolean active) {
+    public SourceEntry(String url, String name, String title, boolean active) {
         this(url, false, null, name, title, active);
     }

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java

@@ -69 +69 @@
         ListSettingTableModel listModel = new ListSettingTableModel();
         JTable table = new JTable(listModel);
-        table.putClientProperty("terminateEditOnFocusLost", true);
+        table.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         table.setTableHeader(null);
 

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java

@@ -102 +102 @@
         tableModel = new ListTableModel();
         table = new JTable(tableModel);
-        table.putClientProperty("terminateEditOnFocusLost", true);
+        table.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         table.setTableHeader(null);
 

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java

@@ -120 +120 @@
         tableModel = new MapTableModel();
         table = new JTable(tableModel);
-        table.putClientProperty("terminateEditOnFocusLost", true);
+        table.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         table.getTableHeader().getColumnModel().getColumn(0).setHeaderValue(tr("Key"));
         table.getTableHeader().getColumnModel().getColumn(1).setHeaderValue(tr("Value"));

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java

@@ -53 +53 @@
         model = new AllSettingsTableModel();
         setModel(model);
-        putClientProperty("terminateEditOnFocusLost", true);
+        putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         getColumnModel().getColumn(1).setCellRenderer(new SettingCellRenderer());
         getColumnModel().getColumn(1).setCellEditor(new SettingCellEditor());

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -276 +276 @@
     @Override
     public boolean ok() {
-        Boolean ret = false;
+        boolean ret = false;
         for(String d : del) {
             Main.pref.put("color."+d, null);
@@ -282 +282 @@
         for (int i = 0; i < colors.getRowCount(); ++i) {
             String key = (String)colors.getValueAt(i, 0);
-            if(Main.pref.putColor(key, (Color)colors.getValueAt(i, 1)))
-            {
+            if(Main.pref.putColor(key, (Color)colors.getValueAt(i, 1))) {
                 if(key.startsWith("mappaint.")) {
                     ret = true;

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -302 +302 @@
                 }
             };
-            activeTable.putClientProperty("terminateEditOnFocusLost", true);
+            activeTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
 
             defaultModel = new ImageryDefaultLayerTableModel();

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

@@ -84 +84 @@
             if (selectedPluginsMap.get(pi) == null) {
                 if (activePlugins.contains(pi.name)) {
-                    selectedPluginsMap.put(pi, true);
+                    selectedPluginsMap.put(pi, Boolean.TRUE);
                 }
             }

trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java

@@ -108 +108 @@
                 requestedState.title = title;
             }
-            requestedState.intermediate = false;
+            requestedState.intermediate = Boolean.FALSE;
         } else {
             checkState(State.IN_TASK);
@@ -126 +126 @@
                 requestedState.title = title;
             }
-            requestedState.intermediate = true;
+            requestedState.intermediate = Boolean.TRUE;
         } else {
             checkState(State.IN_TASK);

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

@@ -555 +555 @@
                 return null;
             case KEY:
-                return tags.containsKey(key) ? true : null;
+                return tags.containsKey(key) ? Boolean.TRUE : null;
             case KEY_REQUIRED:
                 return tags.containsKey(key);
             case KEY_VALUE:
-                return tags.containsKey(key) && getValues().contains(tags.get(key)) ? true : null;
+                return tags.containsKey(key) && getValues().contains(tags.get(key)) ? Boolean.TRUE : null;
             case KEY_VALUE_REQUIRED:
                 return tags.containsKey(key) && getValues().contains(tags.get(key));

trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java

@@ -46 +46 @@
     protected void feedbackInvalid(String msg) {
         if (valid == null || valid || !Objects.equals(msg, this.msg)) {
-            // only provide feedback if the validity has changed. This avoids
-            // unnecessary UI updates.
+            // only provide feedback if the validity has changed. This avoids unnecessary UI updates.
             tc.setBorder(ERROR_BORDER);
             tc.setBackground(ERROR_BACKGROUND);
             tc.setToolTipText(msg);
-            valid = false;
+            valid = Boolean.FALSE;
             this.msg = msg;
         }
@@ -62 +61 @@
     protected void feedbackValid(String msg) {
         if (valid == null || !valid || !Objects.equals(msg, this.msg)) {
-            // only provide feedback if the validity has changed. This avoids
-            // unnecessary UI updates.
+            // only provide feedback if the validity has changed. This avoids unnecessary UI updates.
             tc.setBorder(UIManager.getBorder("TextField.border"));
             tc.setBackground(UIManager.getColor("TextField.background"));
             tc.setToolTipText(msg == null ? "" : msg);
-            valid = true;
+            valid = Boolean.TRUE;
             this.msg = msg;
         }

trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java

@@ -184 +184 @@
         public void propertyChange(PropertyChangeEvent evt) {
             if ("editable".equals(evt.getPropertyName())) {
-                if (evt.getNewValue().equals(true)) {
+                if (evt.getNewValue().equals(Boolean.TRUE)) {
                     enableMenu();
                 } else {

trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java

@@ -125 +125 @@
             defaults.put("EditorPane[Enabled].backgroundPainter", bgColor);
             pane.putClientProperty("Nimbus.Overrides", defaults);
-            pane.putClientProperty("Nimbus.Overrides.InheritDefaults", true);
+            pane.putClientProperty("Nimbus.Overrides.InheritDefaults", Boolean.TRUE);
             pane.setBackground(bgColor);
         }