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

Timestamp:

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

Author:

Don-vip

Message:

checkstyle 6.14 + tune xml validation settings in Eclipse project

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/JCSCachedTileLoaderJob.java (modified) (1 diff)
• data/coor/CoordinateFormat.java (modified) (1 diff)
• data/osm/OsmPrimitiveType.java (modified) (1 diff)
• gui/conflict/ConflictColors.java (modified) (1 diff)
• gui/conflict/pair/ComparePairType.java (modified) (1 diff)
• gui/preferences/plugin/PluginUpdatePolicyPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -461 +461 @@
         ret.setEtag(urlConn.getHeaderField("ETag"));
 
-        if(Main.isDebugEnabled()) {
-            for(Entry<String, List<String>> header: urlConn.getHeaderFields().entrySet()) {
+        if (Main.isDebugEnabled()) {
+            for (Entry<String, List<String>> header: urlConn.getHeaderFields().entrySet()) {
                 log.log(Level.FINE, "Response header - {0}: {1}", new Object[]{header.getKey(), header.getValue()});
             }

trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java

@@ -13 +13 @@
      * the decimal format 999.999
      */
-    DECIMAL_DEGREES (tr("Decimal Degrees")),
+    DECIMAL_DEGREES(tr("Decimal Degrees")),
 
     /**
      * the degrees/minutes/seconds format 9 deg 99 min 99 sec
      */
-    DEGREES_MINUTES_SECONDS (tr("deg\u00B0 min'' sec\"")),
+    DEGREES_MINUTES_SECONDS(tr("deg\u00B0 min'' sec\"")),
 
     /**
      * the nautical format
      */
-    NAUTICAL (tr("deg\u00B0 min'' (Nautical)")),
+    NAUTICAL(tr("deg\u00B0 min'' (Nautical)")),
 
     /**
      * coordinates East/North
      */
-    EAST_NORTH (tr("Projected Coordinates"));
+    EAST_NORTH(tr("Projected Coordinates"));
 
     private String displayName;

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java

@@ -11 +11 @@
 public enum OsmPrimitiveType {
 
-    NODE (marktr(/* ICON(data/) */"node"), Node.class, NodeData.class),
-    WAY  (marktr(/* ICON(data/) */"way"), Way.class, WayData.class),
-    RELATION (marktr(/* ICON(data/) */"relation"), Relation.class, RelationData.class),
+    NODE(marktr(/* ICON(data/) */"node"), Node.class, NodeData.class),
+    WAY(marktr(/* ICON(data/) */"way"), Way.class, WayData.class),
+    RELATION(marktr(/* ICON(data/) */"relation"), Relation.class, RelationData.class),
 
     /* only for display, no real type */
-    CLOSEDWAY  (marktr(/* ICON(data/) */"closedway"), null, WayData.class),
-    MULTIPOLYGON (marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class);
+    CLOSEDWAY(marktr(/* ICON(data/) */"closedway"), null, WayData.class),
+    MULTIPOLYGON(marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class);
 
     private static final Collection<OsmPrimitiveType> DATA_VALUES = Arrays.asList(NODE, WAY, RELATION);

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");