Changeset 6362 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2013-11-03T01:06:23+01:00 (11 years ago)

Author:

Don-vip

Message:

Checkstyle:

• private constructors for util classes
• final classes
• missing "else" statements
• import cleanup

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/tags

Files:

• MultiValueCellEditor.java (modified) (1 diff)
• RelationMemberConflictDecision.java (modified) (2 diffs)
• TagConflictResolutionUtil.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java

@@ -74 +74 @@
                 if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_ENTER) {
                     fireGotoNextDecision();
-                } if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_TAB) {
+                } else if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_TAB) {
                     if (e.isShiftDown()) {
                         fireGotoPreviousDecision();

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.tags;
+
+import static org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType.UNDECIDED;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -6 +9 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType.*;
 
 public class RelationMemberConflictDecision {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java

@@ -13 +13 @@
  *
  */
-public class TagConflictResolutionUtil {
+public final class TagConflictResolutionUtil {
 
     /** no constructor, just static utility methods */