Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/properties

Files:

• PropertiesCellRenderer.java (modified) (3 diffs)
• PropertiesDialog.java (modified) (34 diffs)
• TagEditHelper.java (modified) (15 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java

@@ -60 +60 @@
                         otherCount = v.size();
                     } else {
-                        blankCount = (Integer)v.get("");
+                        blankCount = (Integer) v.get("");
                         otherCount = v.size()-1;
                     }
@@ -75 +75 @@
                         sb.append(trn("{0} different", "{0} different", otherCount, otherCount));
                     }
-                    if(blankCount > 0) {
+                    if (blankCount > 0) {
                         /* I18n: properties display partial string joined with comma */
                         sb.append(trn(", {0} unset", ", {0} unset", blankCount, blankCount));
@@ -88 +88 @@
                 }
             }
-            ((JLabel)c).putClientProperty("html.disable", Boolean.TRUE); // Fix #8730
-            ((JLabel)c).setText(str);
+            ((JLabel) c).putClientProperty("html.disable", Boolean.TRUE); // Fix #8730
+            ((JLabel) c).setText(str);
             if (Main.pref.getBoolean("display.discardable-keys", false)) {
                 String key = null;

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -188 +188 @@
     private final SelectMembersAction addMembersToSelectionAction = new SelectMembersAction(true);
 
-    private final transient HighlightHelper highlightHelper= new HighlightHelper();
+    private final transient HighlightHelper highlightHelper = new HighlightHelper();
 
     /**
@@ -225 +225 @@
     };
 
-    // <editor-fold defaultstate="collapsed" desc="Dialog construction and helper methods">
-
     /**
      * Create a new PropertiesDialog
@@ -246 +244 @@
         boolean top = Main.pref.getBoolean("properties.presets.top", true);
         bothTables.setLayout(new GridBagLayout());
-        if(top) {
+        if (top) {
             bothTables.add(presets, GBC.std().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2).anchor(GBC.NORTHWEST));
             double epsilon = Double.MIN_VALUE; // need to set a weight or else anchor value is ignored
-            bothTables.add(pluginHook, GBC.eol().insets(0,1,1,1).anchor(GBC.NORTHEAST).weight(epsilon, epsilon));
+            bothTables.add(pluginHook, GBC.eol().insets(0, 1, 1, 1).anchor(GBC.NORTHEAST).weight(epsilon, epsilon));
         }
         bothTables.add(selectSth, GBC.eol().fill().insets(10, 10, 10, 10));
@@ -256 +254 @@
         bothTables.add(membershipTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
         bothTables.add(membershipTable, GBC.eol().fill(GBC.BOTH));
-        if(!top) {
+        if (!top) {
             bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
         }
@@ -287 +285 @@
     private void buildTagsTable() {
         // setting up the tags table
-        tagData.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});
+        tagData.setColumnIdentifiers(new String[]{tr("Key"), tr("Value")});
         tagTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         tagTable.getTableHeader().setReorderingAllowed(false);
@@ -297 +295 @@
 
     private void buildMembershipTable() {
-        membershipData.setColumnIdentifiers(new String[]{tr("Member Of"),tr("Role"),tr("Position")});
+        membershipData.setColumnIdentifiers(new String[]{tr("Member Of"), tr("Role"), tr("Position")});
         membershipTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 
@@ -309 +307 @@
                     return this;
                 if (c instanceof JLabel) {
-                    JLabel label = (JLabel)c;
-                    Relation r = (Relation)value;
+                    JLabel label = (JLabel) c;
+                    Relation r = (Relation) value;
                     label.setText(r.getDisplayName(DefaultNameFormatter.getInstance()));
                     if (r.isDisabledAndHidden()) {
@@ -326 +324 @@
                     return this;
                 Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
-                boolean isDisabledAndHidden = ((Relation)table.getValueAt(row, 0)).isDisabledAndHidden();
+                boolean isDisabledAndHidden = ((Relation) table.getValueAt(row, 0)).isDisabledAndHidden();
                 if (c instanceof JLabel) {
                     JLabel label = (JLabel) c;
@@ -342 +340 @@
                     boolean isSelected, boolean hasFocus, int row, int column) {
                 Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
-                boolean isDisabledAndHidden = ((Relation)table.getValueAt(row, 0)).isDisabledAndHidden();
+                boolean isDisabledAndHidden = ((Relation) table.getValueAt(row, 0)).isDisabledAndHidden();
                 if (c instanceof JLabel) {
-                    JLabel label = (JLabel)c;
+                    JLabel label = (JLabel) c;
                     label.setText(((MemberInfo) table.getValueAt(row, 1)).getPositionString());
                     if (isDisabledAndHidden) {
@@ -416 +414 @@
                 if (Main.isDisplayingMapView()) {
                     int row = membershipTable.rowAtPoint(e.getPoint());
-                    if (row>=0) {
+                    if (row >= 0) {
                         if (highlightHelper.highlightOnly((Relation) membershipTable.getValueAt(row, 0))) {
                             Main.map.mapView.repaint();
@@ -462 +460 @@
         tagTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
                 .put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "onTableEnter");
-        tagTable.getActionMap().put("onTableEnter",editAction);
+        tagTable.getActionMap().put("onTableEnter", editAction);
         membershipTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
-                .put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),"onTableEnter");
-        membershipTable.getActionMap().put("onTableEnter",editAction);
+                .put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "onTableEnter");
+        membershipTable.getActionMap().put("onTableEnter", editAction);
 
         // INSERT button = addAction, open "add tag" dialog
         tagTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
-                .put(KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, 0),"onTableInsert");
-        tagTable.getActionMap().put("onTableInsert",addAction);
+                .put(KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, 0), "onTableInsert");
+        tagTable.getActionMap().put("onTableInsert", addAction);
 
         // unassign some standard shortcuts for JTable to allow upload / download / image browsing
@@ -480 +478 @@
 
         tagTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
-                .put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK),"onCopy");
-        tagTable.getActionMap().put("onCopy",copyKeyValueAction);
+                .put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK), "onCopy");
+        tagTable.getActionMap().put("onCopy", copyKeyValueAction);
 
         // allow using enter to add tags for all look&feel configurations
@@ -488 +486 @@
         // DEL button = deleteAction
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-                KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),"delete"
+                KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete"
                 );
         getActionMap().put("delete", deleteAction);
@@ -505 +503 @@
      */
     private void editMembership(int row) {
-        Relation relation = (Relation)membershipData.getValueAt(row, 0);
+        Relation relation = (Relation) membershipData.getValueAt(row, 0);
         Main.map.relationListDialog.selectRelation(relation);
         RelationEditor.getEditor(
@@ -515 +513 @@
 
     private int findRow(TableModel model, Object value) {
-        for (int i=0; i<model.getRowCount(); i++) {
+        for (int i = 0; i < model.getRowCount(); i++) {
             if (model.getValueAt(i, 0).equals(value))
                 return i;
@@ -529 +527 @@
         selectionChanged(null);
     }
-
-   // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Event listeners methods">
 
     @Override
@@ -596 +590 @@
         selectedTag = editHelper.getChangedKey(); // select last added or last edited key by default
         if (selectedTag == null && tagTable.getSelectedRowCount() == 1) {
-            selectedTag = (String)tagData.getValueAt(tagTable.getSelectedRow(), 0);
+            selectedTag = (String) tagData.getValueAt(tagTable.getSelectedRow(), 0);
         }
         if (membershipTable.getSelectedRowCount() == 1) {
-            selectedRelation = (Relation)membershipData.getValueAt(membershipTable.getSelectedRow(), 0);
+            selectedRelation = (Relation) membershipData.getValueAt(membershipTable.getSelectedRow(), 0);
         }
 
@@ -648 +642 @@
                     Relation r = (Relation) ref;
                     MemberInfo mi = roles.get(r);
-                    if(mi == null) {
+                    if (mi == null) {
                         mi = new MemberInfo(newSel);
                     }
@@ -696 +690 @@
         } else if (selectedRelation != null && (selectedIndex = findRow(membershipData, selectedRelation)) != -1) {
             membershipTable.changeSelection(selectedIndex, 0, false, false);
-        } else if(hasTags) {
+        } else if (hasTags) {
             tagTable.changeSelection(0, 0, false, false);
-        } else if(hasMemberships) {
+        } else if (hasMemberships) {
             membershipTable.changeSelection(0, 0, false, false);
         }
 
-        if(tagData.getRowCount() != 0 || membershipData.getRowCount() != 0) {
-            if(newSel.size() > 1) {
+        if (tagData.getRowCount() != 0 || membershipData.getRowCount() != 0) {
+            if (newSel.size() > 1) {
                 setTitle(tr("Objects: {2} / Tags: {0} / Memberships: {1}",
                     tagData.getRowCount(), membershipData.getRowCount(), newSel.size()));
@@ -734 +728 @@
     }
 
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Methods that are called by plugins to extend fuctionality ">
-
     /**
      * Replies the tag popup menu handler.
@@ -777 +767 @@
     }
 
-    // </editor-fold>
-
-     /**
+    /**
      * Class that watches for mouse clicks
      * @author imi
      */
     public class MouseClickWatch extends MouseAdapter {
-        @Override public void mouseClicked(MouseEvent e) {
+        @Override
+        public void mouseClicked(MouseEvent e) {
             if (e.getClickCount() < 2) {
                 // single click, clear selection in other table not clicked in
@@ -812 +801 @@
             }
         }
-        @Override public void mousePressed(MouseEvent e) {
+
+        @Override
+        public void mousePressed(MouseEvent e) {
             if (e.getSource() == tagTable) {
                 membershipTable.clearSelection();
@@ -880 +871 @@
      */
     public static class ReadOnlyTableModel extends DefaultTableModel {
-        @Override public boolean isCellEditable(int row, int column) {
+        @Override
+        public boolean isCellEditable(int row, int column) {
             return false;
         }
-        @Override public Class<?> getColumnClass(int columnIndex) {
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
             return String.class;
         }
@@ -902 +896 @@
         }
 
-        protected void deleteTags(int[] rows){
+        protected void deleteTags(int[] rows) {
             // convert list of rows to HashMap (and find gap for nextKey)
             Map<String, String> tags = new HashMap<>(rows.length);
@@ -925 +919 @@
                     nextKeyIndex++;
                 }
-                nextKey = (String)tagData.getValueAt(nextKeyIndex, 0);
+                nextKey = (String) tagData.getValueAt(nextKeyIndex, 0);
             }
 
@@ -938 +932 @@
 
         protected void deleteFromRelation(int row) {
-            Relation cur = (Relation)membershipData.getValueAt(row, 0);
+            Relation cur = (Relation) membershipData.getValueAt(row, 0);
 
             Relation nextRelation = null;
             int rowCount = membershipTable.getRowCount();
             if (rowCount > 1) {
-                nextRelation = (Relation)membershipData.getValueAt(row + 1 < rowCount ? row + 1 : row - 1, 0);
+                nextRelation = (Relation) membershipData.getValueAt(row + 1 < rowCount ? row + 1 : row - 1, 0);
             }
 
@@ -954 +948 @@
             ed.showDialog();
 
-            if(ed.getValue() != 1)
+            if (ed.getValue() != 1)
                 return;
 
@@ -978 +972 @@
                 int[] rows = membershipTable.getSelectedRows();
                 // delete from last relation to conserve row numbers in the table
-                for (int i=rows.length-1; i>=0; i--) {
+                for (int i = rows.length-1; i >= 0; i--) {
                     deleteFromRelation(rows[i]);
                 }
@@ -1083 +1077 @@
                 } else if (membershipTable.getSelectedRowCount() == 1) {
                     row = membershipTable.getSelectedRow();
-                    String type = ((Relation)membershipData.getValueAt(row, 0)).get("type");
+                    String type = ((Relation) membershipData.getValueAt(row, 0)).get("type");
                     if (type != null) {
                         type = Utils.encodeUrl(type);
@@ -1101 +1095 @@
                 }
 
-                Main.worker.execute(new Runnable(){
+                Main.worker.execute(new Runnable() {
                     @Override public void run() {
                         try {
@@ -1108 +1102 @@
                             for (URI u : uris) {
                                 conn = Utils.openHttpConnection(u.toURL());
-                                conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+                                conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect", 15)*1000);
 
                                 if (conn.getResponseCode() != 200) {
@@ -1122 +1116 @@
                                                 .replaceFirst("/wiki/", "/w/index.php?redirect=no&title=")
                                                 ).toURL());
-                                        conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+                                        conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect", 15)*1000);
                                     }
 
@@ -1187 +1181 @@
                     return;
                 for (OsmPrimitive p : sel) {
-                    Collection<String> s = getString(p,key);
+                    Collection<String> s = getString(p, key);
                     if (s != null) {
                         values.addAll(s);
@@ -1201 +1195 @@
     class CopyValueAction extends AbstractCopyAction {
 
+        /**
+         * Constructs a new {@code CopyValueAction}.
+         */
         public CopyValueAction() {
             putValue(NAME, tr("Copy Value"));

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -153 +153 @@
 
         String key = tagData.getValueAt(row, 0).toString();
-        objKey=key;
+        objKey = key;
 
         @SuppressWarnings("unchecked")
@@ -262 +262 @@
             @Override
             public Component getListCellRendererComponent(JList<? extends AutoCompletionListItem> list,
-                    AutoCompletionListItem value, int index, boolean isSelected,  boolean cellHasFocus){
+                    AutoCompletionListItem value, int index, boolean isSelected,  boolean cellHasFocus) {
                 Component c = def.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
                 if (c instanceof JLabel) {
@@ -280 +280 @@
 
         private EditTagDialog(String key, Map<String, Integer> map, final boolean initialFocusOnKey) {
-            super(Main.parent, trn("Change value?", "Change values?", map.size()), new String[] {tr("OK"),tr("Cancel")});
-            setButtonIcons(new String[] {"ok","cancel"});
+            super(Main.parent, trn("Change value?", "Change values?", map.size()), new String[] {tr("OK"), tr("Cancel")});
+            setButtonIcons(new String[] {"ok", "cancel"});
             setCancelButton(2);
             configureContextsensitiveHelp("/Dialog/EditValue", true /* show help button */);
@@ -307 +307 @@
             keys.setSelectedItem(key);
 
-            p.add(Box.createVerticalStrut(5),GBC.eol());
+            p.add(Box.createVerticalStrut(5), GBC.eol());
             p.add(new JLabel(tr("Key")), GBC.std());
             p.add(Box.createHorizontalStrut(10), GBC.std());
@@ -315 +315 @@
             Collections.sort(valueList, usedValuesAwareComparator);
 
-            final String selection= m.size()!=1?tr("<different>"):m.entrySet().iterator().next().getKey();
+            final String selection = m.size() != 1 ? tr("<different>") : m.entrySet().iterator().next().getKey();
 
             values = new AutoCompletingComboBox(selection);
@@ -324 +324 @@
             values.setSelectedItem(selection);
             values.getEditor().setItem(selection);
-            p.add(Box.createVerticalStrut(5),GBC.eol());
+            p.add(Box.createVerticalStrut(5), GBC.eol());
             p.add(new JLabel(tr("Value")), GBC.std());
             p.add(Box.createHorizontalStrut(10), GBC.std());
@@ -496 +496 @@
         protected FocusAdapter addFocusAdapter(final AutoCompletionManager autocomplete, final Comparator<AutoCompletionListItem> comparator) {
            // get the combo box' editor component
-           JTextComponent editor = (JTextComponent)values.getEditor().getEditorComponent();
+           JTextComponent editor = (JTextComponent) values.getEditor().getEditorComponent();
            // Refresh the values model when focus is gained
            FocusAdapter focus = new FocusAdapter() {
@@ -508 +508 @@
                    values.setPossibleACItems(valueList);
                    values.getEditor().selectAll();
-                   objKey=key;
+                   objKey = key;
                }
            };
@@ -517 +517 @@
         protected JPopupMenu popupMenu = new JPopupMenu() {
             private JCheckBoxMenuItem fixTagLanguageCb = new JCheckBoxMenuItem(
-                new AbstractAction(tr("Use English language for tag by default")){
+                new AbstractAction(tr("Use English language for tag by default")) {
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    boolean use=((JCheckBoxMenuItem) e.getSource()).getState();
+                    boolean use = ((JCheckBoxMenuItem) e.getSource()).getState();
                     PROPERTY_FIX_TAG_LOCALE.put(use);
                     keys.setFixedLocale(use);
@@ -539 +539 @@
 
         public AddTagsDialog() {
-            super(Main.parent, tr("Add value?"), new String[] {tr("OK"),tr("Cancel")});
-            setButtonIcons(new String[] {"ok","cancel"});
+            super(Main.parent, tr("Add value?"), new String[] {tr("OK"), tr("Cancel")});
+            setButtonIcons(new String[] {"ok", "cancel"});
             setCancelButton(2);
             configureContextsensitiveHelp("/Dialog/AddValue", true /* show help button */);
@@ -549 +549 @@
 
             mainPanel.add(new JLabel("<html>"+trn("This will change up to {0} object.",
-                "This will change up to {0} objects.", sel.size(),sel.size())
+                "This will change up to {0} objects.", sel.size(), sel.size())
                 +"<br><br>"+tr("Please select a key")), GBC.eol().fill(GBC.HORIZONTAL));
 
@@ -624 +624 @@
             });
             JCheckBoxMenuItem rememberLastTags = new JCheckBoxMenuItem(
-                new AbstractAction(tr("Remember last used tags after a restart")){
+                new AbstractAction(tr("Remember last used tags after a restart")) {
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();
+                    boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState();
                     PROPERTY_REMEMBER_TAGS.put(sel);
                     if (sel) saveTagsIfNeeded();
@@ -650 +650 @@
             lines.add(code(KeyEvent.getKeyModifiersText(KeyEvent.SHIFT_MASK)+"+"+KeyEvent.getKeyText(KeyEvent.VK_ENTER))
                     +tr("to add without closing the dialog"));
-            sc = Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask|KeyEvent.SHIFT_DOWN_MASK);
+            sc = Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask | KeyEvent.SHIFT_DOWN_MASK);
             if (sc != null) {
                 lines.add(code(sc.getKeyText()) + tr("to add first suggestion without closing the dialog"));
@@ -667 +667 @@
             try {
                 int v = Integer.parseInt(s);
-                if (v>=0 && v<=MAX_LRU_TAGS_NUMBER) {
+                if (v >= 0 && v <= MAX_LRU_TAGS_NUMBER) {
                     PROPERTY_RECENT_TAGS_NUMBER.put(v);
                     return;
@@ -762 +762 @@
                             action.actionPerformed(null);
                             // add tags and close window on double-click
-                            if (e.getClickCount()>1) {
+                            if (e.getClickCount() > 1) {
                                 buttonAction(0, null); // emulate OK click and close the dialog
                             }