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

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

@@ -36 +36 @@
 
     /** the list holding the tags */
-    protected final transient List<TagModel> tags =new ArrayList<>();
+    protected final transient List<TagModel> tags = new ArrayList<>();
 
     /** indicates whether the model is dirty */
@@ -147 +147 @@
         switch(col) {
         case 0:
-            updateTagName(tag, (String)value);
+            updateTagName(tag, (String) value);
             break;
         case 1:
-            String v = (String)value;
+            String v = (String) value;
             if (tag.getValueCount() > 1 && !v.isEmpty()) {
                 updateTagValue(tag, v);
@@ -290 +290 @@
         Iterator<TagModel> it = tags.iterator();
         boolean changed = false;
-        while(it.hasNext()) {
+        while (it.hasNext()) {
             TagModel tm = it.next();
             if (tm.getName().equals(name)) {
@@ -352 +352 @@
         for (String key : primitive.keySet()) {
             String value = primitive.get(key);
-            this.tags.add(new TagModel(key,value));
+            this.tags.add(new TagModel(key, value));
         }
         TagModel tag = new TagModel();
@@ -366 +366 @@
      * @param tags the tags of an OSM primitive
      */
-    public void initFromTags(Map<String,String> tags) {
+    public void initFromTags(Map<String, String> tags) {
         this.tags.clear();
         for (Entry<String, String> entry : tags.entrySet()) {
@@ -385 +385 @@
     public void initFromTags(TagCollection tags) {
         this.tags.clear();
-        if (tags == null){
+        if (tags == null) {
             setDirty(false);
             return;
@@ -391 +391 @@
         for (String key : tags.getKeys()) {
             String value = tags.getJoinedValues(key);
-            this.tags.add(new TagModel(key,value));
+            this.tags.add(new TagModel(key, value));
         }
         sort();
@@ -407 +407 @@
      */
     public void applyToPrimitive(Tagged primitive) {
-        Map<String,String> tags = primitive.getKeys();
+        Map<String, String> tags = primitive.getKeys();
         applyToTags(tags, false);
         primitive.setKeys(tags);
@@ -436 +436 @@
     }
 
-    public Map<String,String> getTags() {
+    public Map<String, String> getTags() {
         return getTags(false);
     }
 
-    public Map<String,String> getTags(boolean keepEmpty) {
-        Map<String,String> tags = new HashMap<>();
+    public Map<String, String> getTags(boolean keepEmpty) {
+        Map<String, String> tags = new HashMap<>();
         applyToTags(tags, keepEmpty);
         return tags;
@@ -494 +494 @@
                 if (!currentkeys.contains(oldkey)) {
                     ChangePropertyCommand deleteCommand =
-                        new ChangePropertyCommand(primitive,oldkey,null);
+                        new ChangePropertyCommand(primitive, oldkey, null);
                     commands.add(deleteCommand);
                 }
@@ -581 +581 @@
 
         Map<String, TagModel> modelTags = new HashMap<>();
-        for (int i=0; i<getRowCount(); i++) {
+        for (int i = 0; i < getRowCount(); i++) {
             TagModel tagModel = get(i);
             modelTags.put(tagModel.getName(), tagModel);
@@ -627 +627 @@
             rowSelectionModel.setValueIsAdjusting(true);
             colSelectionModel.setValueIsAdjusting(true);
-            if (rowMin >= 0 && rowMax >=0) {
+            if (rowMin >= 0 && rowMax >= 0) {
                 rowSelectionModel.setSelectionInterval(rowMin, rowMax);
             }
-            if (colMin >=0 && colMax >= 0) {
+            if (colMin >= 0 && colMax >= 0) {
                 colSelectionModel.setSelectionInterval(colMin, colMax);
             }