Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

Timestamp:

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

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) (35 diffs)

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

@@ -113 +113 @@
 
         public String getDisplayTooltip() {
-            if(!name.isEmpty())
+            if (!name.isEmpty())
                 return name;
 
@@ -124 +124 @@
 
         public Icon getDisplayIcon() {
-            if(ico != null)
+            if (ico != null)
                 return ico;
             Object o = action.getValue(Action.LARGE_ICON_KEY);
-            if(o == null)
+            if (o == null)
                 o = action.getValue(Action.SMALL_ICON);
             return (Icon) o;
@@ -156 +156 @@
             if (!(getAction() instanceof ParameterizedAction)) return false;
             for (Object o: parameters.values()) {
-                if (o!=null) return true;
+                if (o != null) return true;
             }
             return false;
@@ -208 +208 @@
                 skip('(');
 
-                ParameterizedAction parametrizedAction = (ParameterizedAction)action;
+                ParameterizedAction parametrizedAction = (ParameterizedAction) action;
                 Map<String, ActionParameter<?>> actionParams = new ConcurrentHashMap<>();
                 for (ActionParameter<?> param: parametrizedAction.getActionParameters()) {
@@ -217 +217 @@
                     String paramName = readTillChar('=', '=');
                     skip('=');
-                    String paramValue = readTillChar(',',')');
+                    String paramValue = readTillChar(',', ')');
                     if (!paramName.isEmpty() && !paramValue.isEmpty()) {
                         ActionParameter<?> actionParam = actionParams.get(paramName);
@@ -234 +234 @@
                     String paramName = readTillChar('=', '=');
                     skip('=');
-                    String paramValue = readTillChar(',','}');
+                    String paramValue = readTillChar(',', '}');
                     if ("icon".equals(paramName) && !paramValue.isEmpty()) {
                         result.setIcon(paramValue);
-                    } else if("name".equals(paramName) && !paramValue.isEmpty()) {
+                    } else if ("name".equals(paramName) && !paramValue.isEmpty()) {
                         result.setName(paramValue);
                     }
@@ -249 +249 @@
 
         private void escape(String s) {
-            for (int i=0; i<s.length(); i++) {
+            for (int i = 0; i < s.length(); i++) {
                 char ch = s.charAt(i);
                 if (ch == '\\' || ch == '(' || ch == '{' || ch == ',' || ch == ')' || ch == '}' || ch == '=') {
@@ -265 +265 @@
 
             String val = (String) action.getAction().getValue("toolbar");
-            if(val == null)
+            if (val == null)
                 return null;
             escape(val);
             if (action.getAction() instanceof ParameterizedAction) {
                 result.append('(');
-                List<ActionParameter<?>> params = ((ParameterizedAction)action.getAction()).getActionParameters();
-                for (int i=0; i<params.size(); i++) {
-                    ActionParameter<Object> param = (ActionParameter<Object>)params.get(i);
+                List<ActionParameter<?>> params = ((ParameterizedAction) action.getAction()).getActionParameters();
+                for (int i = 0; i < params.size(); i++) {
+                    ActionParameter<Object> param = (ActionParameter<Object>) params.get(i);
                     escape(param.getName());
                     result.append('=');
@@ -302 +302 @@
                     first = false;
                 }
-                if(!first) {
+                if (!first) {
                     result.append('}');
             }
@@ -325 +325 @@
             if (currentAction.isSeparator() || !(currentAction.getAction() instanceof ParameterizedAction))
                 return adaptable;
-            ParameterizedAction pa = (ParameterizedAction)currentAction.getAction();
+            ParameterizedAction pa = (ParameterizedAction) currentAction.getAction();
             return pa.getActionParameters().size() + adaptable;
         }
@@ -331 +331 @@
         @SuppressWarnings("unchecked")
         private ActionParameter<Object> getParam(int index) {
-            ParameterizedAction pa = (ParameterizedAction)currentAction.getAction();
+            ParameterizedAction pa = (ParameterizedAction) currentAction.getAction();
             return (ActionParameter<Object>) pa.getActionParameters().get(index);
         }
@@ -337 +337 @@
         @Override
         public Object getValueAt(int rowIndex, int columnIndex) {
-            if(currentAction.getAction() instanceof AdaptableAction) {
+            if (currentAction.getAction() instanceof AdaptableAction) {
                 if (rowIndex < 2) {
                     switch (columnIndex) {
@@ -372 +372 @@
             int paramIndex = rowIndex;
 
-            if(currentAction.getAction() instanceof AdaptableAction) {
+            if (currentAction.getAction() instanceof AdaptableAction) {
                 if (rowIndex == 0) {
                      currentAction.setName(val);
@@ -386 +386 @@
 
             if (param != null && !val.isEmpty()) {
-                currentAction.getParameters().put(param.getName(), param.readFromString((String)aValue));
+                currentAction.getParameters().put(param.getName(), param.readFromString((String) aValue));
             }
         }
@@ -402 +402 @@
             this.act = action;
             doNotHide.setSelected(Main.pref.getBoolean("toolbar.always-visible", true));
-            remove.setVisible(act!=null);
-            shortcutEdit.setVisible(act!=null);
+            remove.setVisible(act != null);
+            shortcutEdit.setVisible(act != null);
         }
 
@@ -423 +423 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                    final PreferenceDialog p =new PreferenceDialog(Main.parent);
-                    p.selectPreferencesTabByName("toolbar");
-                    p.setVisible(true);
-                }
-            });
+                final PreferenceDialog p = new PreferenceDialog(Main.parent);
+                p.selectPreferencesTabByName("toolbar");
+                p.setVisible(true);
+            }
+        });
 
         private JMenuItem shortcutEdit = new JMenuItem(new AbstractAction(tr("Edit shortcut")) {
             @Override
             public void actionPerformed(ActionEvent e) {
-                    final PreferenceDialog p =new PreferenceDialog(Main.parent);
+                final PreferenceDialog p = new PreferenceDialog(Main.parent);
                 p.getTabbedPane().getShortcutPreference().setDefaultFilter(act.getDisplayName());
-                    p.selectPreferencesTabByName("shortcuts");
-                    p.setVisible(true);
+                p.selectPreferencesTabByName("shortcuts");
+                p.setVisible(true);
                 // refresh toolbar to try using changed shortcuts without restart
-                    Main.toolbar.refreshToolbarControl();
-                }
-            });
+                Main.toolbar.refreshToolbarControl();
+            }
+        });
 
         private JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar and menu")) {
@@ -447 +447 @@
                 Main.pref.put("toolbar.always-visible", sel);
                 Main.pref.put("menu.always-visible", sel);
-        }
+            }
         });
+
         {
             addPopupMenuListener(new PopupMenuListener() {
@@ -454 +455 @@
                 public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
                     setActionAndAdapt(buttonActions.get(
-                            ((JPopupMenu)e.getSource()).getInvoker()
+                            ((JPopupMenu) e.getSource()).getInvoker()
                     ));
                 }
+
                 @Override
                 public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
@@ -496 +498 @@
             protected Transferable createTransferable(JComponent c) {
                 List<ActionDefinition> actions = new ArrayList<>();
-                for (ActionDefinition o: ((JList<ActionDefinition>)c).getSelectedValuesList()) {
+                for (ActionDefinition o: ((JList<ActionDefinition>) c).getSelectedValuesList()) {
                     actions.add(o);
                 }
@@ -609 +611 @@
                             selected.add(leadItem++, ActionDefinition.getSeparator());
                         } else if (node.getUserObject() instanceof Action) {
-                            selected.add(leadItem++, new ActionDefinition((Action)node.getUserObject()));
+                            selected.add(leadItem++, new ActionDefinition((Action) node.getUserObject()));
                         }
                     }
@@ -744 +746 @@
                         s = tr("Separator");
                     }
-                    JLabel l = (JLabel)def.getListCellRendererComponent(list, s, index, isSelected, cellHasFocus);
+                    JLabel l = (JLabel) def.getListCellRendererComponent(list, s, index, isSelected, cellHasFocus);
                     l.setIcon(i);
                     return l;
@@ -750 +752 @@
             };
             selectedList.setCellRenderer(renderer);
-            selectedList.addListSelectionListener(new ListSelectionListener(){
+            selectedList.addListSelectionListener(new ListSelectionListener() {
                 @Override
                 public void valueChanged(ListSelectionEvent e) {
@@ -806 +808 @@
             right.add(new JScrollPane(actionsTree), GBC.eol().fill(GBC.BOTH));
 
-            final JPanel buttons = new JPanel(new GridLayout(6,1));
+            final JPanel buttons = new JPanel(new GridLayout(6, 1));
             buttons.add(upButton = createButton("up"));
             buttons.add(addButton = createButton("<"));
@@ -814 +816 @@
 
             final JPanel p = new JPanel();
-            p.setLayout(new LayoutManager(){
+            p.setLayout(new LayoutManager() {
                 @Override
                 public void addLayoutComponent(String name, Component comp) {}
+
                 @Override
                 public void removeLayoutComponent(Component comp) {}
+
                 @Override
                 public Dimension minimumLayoutSize(Container parent) {
@@ -824 +828 @@
                     Dimension r = right.getMinimumSize();
                     Dimension b = buttons.getMinimumSize();
-                    return new Dimension(l.width+b.width+10+r.width,l.height+b.height+10+r.height);
-                }
+                    return new Dimension(l.width+b.width+10+r.width, l.height+b.height+10+r.height);
+                }
+
                 @Override
                 public Dimension preferredLayoutSize(Container parent) {
                     Dimension l = new Dimension(200, 200);
                     Dimension r = new Dimension(200, 200);
-                    return new Dimension(l.width+r.width+10+buttons.getPreferredSize().width,Math.max(l.height, r.height));
-                }
+                    return new Dimension(l.width+r.width+10+buttons.getPreferredSize().width, Math.max(l.height, r.height));
+                }
+
                 @Override
                 public void layoutContainer(Container parent) {
@@ -837 +843 @@
                     Dimension b = buttons.getPreferredSize();
                     int width = (d.width-10-b.width)/2;
-                    left.setBounds(new Rectangle(0,0,width,d.height));
-                    right.setBounds(new Rectangle(width+10+b.width,0,width,d.height));
+                    left.setBounds(new Rectangle(0, 0, width, d.height));
+                    right.setBounds(new Rectangle(width+10+b.width, 0, width, d.height));
                     buttons.setBounds(new Rectangle(width+5, d.height/2-b.height/2, b.width, b.height));
                 }
@@ -873 +879 @@
                 } else {
                     String res = parser.saveAction(action);
-                    if(res != null) {
+                    if (res != null) {
                         t.add(res);
                 }
@@ -905 +911 @@
         for (MenuElement item : menuElement.getSubElements()) {
             if (item instanceof JMenuItem) {
-                JMenuItem menuItem = (JMenuItem)item;
+                JMenuItem menuItem = (JMenuItem) item;
                 if (menuItem.getAction() != null) {
                     Action action = menuItem.getAction();
                     userObject = action;
                     Object tb = action.getValue("toolbar");
-                    if(tb == null) {
+                    if (tb == null) {
                         Main.info(tr("Toolbar action without name: {0}",
                         action.getClass().getName()));
                         continue;
                     } else if (!(tb instanceof String)) {
-                        if(!(tb instanceof Boolean) || (Boolean)tb) {
+                        if (!(tb instanceof Boolean) || (Boolean) tb) {
                             Main.info(tr("Strange toolbar value: {0}",
                             action.getClass().getName()));
@@ -923 +929 @@
                         String toolbar = (String) tb;
                         Action r = actions.get(toolbar);
-                        if(r != null && r != action && !toolbar.startsWith("imagery_")) {
+                        if (r != null && r != action && !toolbar.startsWith("imagery_")) {
                             Main.info(tr("Toolbar action {0} overwritten: {1} gets {2}",
                             toolbar, r.getClass().getName(), action.getClass().getName()));
@@ -941 +947 @@
     public Action getAction(String s) {
         Action e = actions.get(s);
-        if(e == null) {
+        if (e == null) {
             e = regactions.get(s);
         }
@@ -990 +996 @@
             } else {
                 ActionDefinition a = actionParser.loadAction(s);
-                if(a != null) {
+                if (a != null) {
                     result.add(a);
                 } else {
@@ -1031 +1037 @@
         control.removeAll();
         buttonActions.clear();
-        boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null;
+        boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0) != null;
 
         for (ActionDefinition action : getDefinedActions()) {
@@ -1077 +1083 @@
             t.remove(definitionText);
         } else {
-            if (preferredIndex>=0 && preferredIndex < t.size()) {
+            if (preferredIndex >= 0 && preferredIndex < t.size()) {
                 t.add(preferredIndex, definitionText); // add to specified place
             } else {
@@ -1105 +1111 @@
 
         String tt = action.getDisplayTooltip();
-        if (tt==null) {
-            tt="";
+        if (tt == null) {
+            tt = "";
         }
 
         if (sc == null || paramCode != 0) {
             String name = (String) action.getAction().getValue("toolbar");
-            if (name==null) {
-                name=action.getDisplayName();
-            }
-            if (paramCode!=0) {
+            if (name == null) {
+                name = action.getDisplayName();
+            }
+            if (paramCode != 0) {
                 name = name+paramCode;
             }
-            String desc = action.getDisplayName() + ((paramCode==0)?"":action.parameters.toString());
+            String desc = action.getDisplayName() + ((paramCode == 0) ? "" : action.parameters.toString());
             sc = Shortcut.registerShortcut("toolbar:"+name, tr("Toolbar: {0}", desc),
                 KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
@@ -1126 +1132 @@
             if (sc.isAssignedUser()) {
                 if (tt.startsWith("<html>") && tt.endsWith("</html>")) {
-                    tt = tt.substring(6,tt.length()-6);
+                    tt = tt.substring(6, tt.length()-6);
                 }
                 tt = Main.platform.makeTooltip(tt, sc);