Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.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/tagging/TaggingPresetItems.java (modified) (18 diffs)

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

@@ -87 +87 @@
 
     // cache the parsing of types using a LRU cache (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html)
-    private static final Map<String,Set<TaggingPresetType>> TYPE_CACHE = new LinkedHashMap<>(16, 1.1f, true);
+    private static final Map<String, Set<TaggingPresetType>> TYPE_CACHE = new LinkedHashMap<>(16, 1.1f, true);
 
     /**
      * Last value of each key used in presets, used for prefilling corresponding fields
      */
-    private static final Map<String,String> LAST_VALUES = new HashMap<>();
+    private static final Map<String, String> LAST_VALUES = new HashMap<>();
 
     public static class PresetListEntry implements Comparable<PresetListEntry> {
@@ -196 +196 @@
 
         public void setRequisite(String str) throws SAXException {
-            if("required".equals(str)) {
+            if ("required".equals(str)) {
                 required = true;
-            } else if(!"optional".equals(str))
+            } else if (!"optional".equals(str))
                 throw new SAXException(tr("Unknown requisite: {0}", str));
         }
@@ -232 +232 @@
             if (count > 0 && !required) {
                 cstring = "0,"+count;
-            } else if(count > 0) {
+            } else if (count > 0) {
                 cstring = String.valueOf(count);
-            } else if(!required) {
+            } else if (!required) {
                 cstring = "0-...";
             } else {
@@ -242 +242 @@
                 locale_text = getLocaleText(text, text_context, null);
             }
-            p.add(new JLabel(locale_text+":"), GBC.std().insets(0,0,10,0));
-            p.add(new JLabel(key), GBC.std().insets(0,0,10,0));
-            p.add(new JLabel(cstring), types == null ? GBC.eol() : GBC.std().insets(0,0,10,0));
+            p.add(new JLabel(locale_text+":"), GBC.std().insets(0, 0, 10, 0));
+            p.add(new JLabel(key), GBC.std().insets(0, 0, 10, 0));
+            p.add(new JLabel(cstring), types == null ? GBC.eol() : GBC.std().insets(0, 0, 10, 0));
             if (types != null) {
                 JPanel pp = new JPanel();
-                for(TaggingPresetType t : types) {
+                for (TaggingPresetType t : types) {
                     pp.add(new JLabel(ImageProvider.get(t.getIconName())));
                 }
@@ -553 +553 @@
 
         public abstract MatchType getDefaultMatch();
+
         public abstract Collection<String> getValues();
 
@@ -650 +651 @@
                 textField.setMaxChars(Integer.valueOf(length));
             }
-            if (usage.unused()){
+            if (usage.unused()) {
                 if (auto_increment_selected != 0  && auto_increment != null) {
                     try {
@@ -681 +682 @@
                 comboBox.setEditor(textField);
                 comboBox.getEditor().setItem(DIFFERENT);
-                value=comboBox;
+                value = comboBox;
                 originalValue = DIFFERENT;
             }
@@ -702 +703 @@
                     JToggleButton aibutton = new JToggleButton(ai);
                     aibutton.setToolTipText(tr("Select auto-increment of {0} for this field", ai));
-                    aibutton.setMargin(new java.awt.Insets(0,0,0,0));
+                    aibutton.setMargin(new java.awt.Insets(0, 0, 0, 0));
                     aibutton.setFocusable(false);
                     saveHorizontalSpace(aibutton);
@@ -732 +733 @@
                 JButton releasebutton = new JButton("X");
                 releasebutton.setToolTipText(tr("Cancel auto-increment for this field"));
-                releasebutton.setMargin(new java.awt.Insets(0,0,0,0));
+                releasebutton.setMargin(new java.awt.Insets(0, 0, 0, 0));
                 releasebutton.setFocusable(false);
                 releasebutton.addActionListener(new ActionListener() {
@@ -745 +746 @@
                 value = pnl;
             }
-            p.add(new JLabel(locale_text+":"), GBC.std().insets(0,0,10,0));
+            p.add(new JLabel(locale_text+":"), GBC.std().insets(0, 0, 10, 0));
             p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
             return true;
@@ -765 +766 @@
                 return ((JosmTextField) comp).getText();
             } else if (comp instanceof JPanel) {
-                return getValue(((JPanel)comp).getComponent(0));
+                return getValue(((JPanel) comp).getComponent(0));
             } else {
                 return null;
@@ -996 +997 @@
 
         protected abstract Object getSelectedItem();
+
         protected abstract void addToPanelAnchor(JPanel p, String def, boolean presetInitiallyMatches);
 
@@ -1414 +1416 @@
     private static class ConcatenatingJList extends JList<PresetListEntry> {
         private String delimiter;
+
         public ConcatenatingJList(String del, PresetListEntry[] o) {
             super(o);
@@ -1431 +1434 @@
                     final String value = lm.getElementAt(i).value;
                     if (parts.contains(value)) {
-                        intParts[j++]=i;
+                        intParts[j++] = i;
                         parts.remove(value);
                     }
@@ -1447 +1450 @@
             int[] si = getSelectedIndices();
             StringBuilder builder = new StringBuilder();
-            for (int i=0; i<si.length; i++) {
-                if (i>0) {
+            for (int i = 0; i < si.length; i++) {
+                if (i > 0) {
                     builder.append(delimiter);
                 }
@@ -1474 +1477 @@
 
     static String fixPresetString(String s) {
-        return s == null ? s : s.replaceAll("'","''");
+        return s == null ? s : s.replaceAll("'", "''");
     }
 
@@ -1500 +1503 @@
         boolean backslash = false;
         StringBuilder item = new StringBuilder();
-        for (int i=0; i<s.length(); i++) {
+        for (int i = 0; i < s.length(); i++) {
             char ch = s.charAt(i);
             if (backslash) {
@@ -1530 +1533 @@
                 returnValue.hadEmpty = true;
             }
-            if(s.hasKeys()) {
+            if (s.hasKeys()) {
                 returnValue.hadKeys = true;
             }