Changeset 9212 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-12-29T18:51:22+01:00 (8 years ago)

Author:

Don-vip

Message:

checkstyle 6.14 + tune xml validation settings in Eclipse project

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/ConflictColors.java (modified) (1 diff)
• conflict/pair/ComparePairType.java (modified) (1 diff)
• preferences/plugin/PluginUpdatePolicyPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java

@@ -34 +34 @@
     BGCOLOR_SAME_POSITION_IN_OPPOSITE(marktr("Conflict background: same position in opposite"), new Color(217, 255, 217)),
 
-    BGCOLOR_TAG_KEEP_ONE (marktr("Conflict background: keep one tag"), new Color(217, 255, 217)),
-    FGCOLOR_TAG_KEEP_ONE (marktr("Conflict foreground: keep one tag"), Color.black),
+    BGCOLOR_TAG_KEEP_ONE(marktr("Conflict background: keep one tag"), new Color(217, 255, 217)),
+    FGCOLOR_TAG_KEEP_ONE(marktr("Conflict foreground: keep one tag"), Color.black),
     BGCOLOR_TAG_KEEP_NONE(marktr("Conflict background: drop tag"), Color.lightGray),
     FGCOLOR_TAG_KEEP_NONE(marktr("Conflict foreground: drop tag"), Color.black),
-    BGCOLOR_TAG_KEEP_ALL (marktr("Conflict background: keep all tags"), new Color(255, 234, 213)),
-    FGCOLOR_TAG_KEEP_ALL (marktr("Conflict foreground: keep all tags"), Color.black),
+    BGCOLOR_TAG_KEEP_ALL(marktr("Conflict background: keep all tags"), new Color(255, 234, 213)),
+    FGCOLOR_TAG_KEEP_ALL(marktr("Conflict foreground: keep all tags"), Color.black),
     BGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict background: sum all numeric tags"), new Color(255, 234, 213)),
     FGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict foreground: sum all numeric tags"), Color.black),
 
-    BGCOLOR_MEMBER_KEEP  (marktr("Conflict background: keep member"), new Color(217, 255, 217)),
-    FGCOLOR_MEMBER_KEEP  (marktr("Conflict foreground: keep member"), Color.black),
+    BGCOLOR_MEMBER_KEEP(marktr("Conflict background: keep member"), new Color(217, 255, 217)),
+    FGCOLOR_MEMBER_KEEP(marktr("Conflict foreground: keep member"), Color.black),
     BGCOLOR_MEMBER_REMOVE(marktr("Conflict background: remove member"), Color.lightGray),
     FGCOLOR_MEMBER_REMOVE(marktr("Conflict foreground: remove member"), Color.black);

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java

@@ -17 +17 @@
      * compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with their version
      */
-    MY_WITH_THEIR (tr("My with Their"), new ListRole[] {MY_ENTRIES, THEIR_ENTRIES}),
+    MY_WITH_THEIR(tr("My with Their"), new ListRole[] {MY_ENTRIES, THEIR_ENTRIES}),
 
     /**
      * compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged version
      */
-    MY_WITH_MERGED (tr("My with Merged"),  new ListRole[] {MY_ENTRIES, MERGED_ENTRIES}),
+    MY_WITH_MERGED(tr("My with Merged"),  new ListRole[] {MY_ENTRIES, MERGED_ENTRIES}),
 
     /**

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java

@@ -32 +32 @@
 
     private enum Policy {
-        ASK ("ask"),
+        ASK("ask"),
         ALWAYS("always"),
         NEVER("never");