Changeset 32395 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelationComponent.java

Timestamp:

2016-06-24T09:10:57+02:00 (9 years ago)

Author:

donvip

Message:

checkstyle, update to JOSM 10279

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelationComponent.java (modified) (3 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelationComponent.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package relcontext;
 
@@ -18 +19 @@
     public ChosenRelationComponent(ChosenRelation rel) {
         super("");
-/*        setBackground(Color.white);
+        /*        setBackground(Color.white);
         setOpaque(true);
         setBorder(new LineBorder(Color.black, 1, true));*/
@@ -25 +26 @@
     }
 
-    public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+    @Override
+    public void chosenRelationChanged(Relation oldRelation, Relation newRelation) {
         setText(prepareText(newRelation));
         repaint();
     }
-    
+
     private final static String[] TYPE_KEYS = new String[] {
-        "natural", "landuse", "place", "waterway", "leisure", "amenity", "restriction", "public_transport", "route", "enforcement"
+            "natural", "landuse", "place", "waterway", "leisure", "amenity", "restriction", "public_transport", "route", "enforcement"
     };
 
     private final static String[] NAMING_TAGS = new String[] {
-        "name", "place_name", "ref", "destination", "note"
+            "name", "place_name", "ref", "destination", "note"
     };
 
-    protected String prepareText( Relation rel ) {
-        if( rel == null )
+    protected String prepareText(Relation rel) {
+        if (rel == null )
             return "";
 
         String type = rel.get("type");
-        if( type == null || type.length() == 0 )
+        if (type == null || type.length() == 0 ) {
             type = "-";
+        }
 
         String tag = null;
-        for( int i = 0; i < TYPE_KEYS.length && tag == null; i++ )
-            if( rel.hasKey(TYPE_KEYS[i]))
+        for (int i = 0; i < TYPE_KEYS.length && tag == null; i++ )
+            if (rel.hasKey(TYPE_KEYS[i])) {
                 tag = TYPE_KEYS[i];
-        if( tag != null )
+            }
+        if (tag != null ) {
             tag = tag.substring(0, 2) + "=" + rel.get(tag);
+        }
 
         String name = null;
-        for( int i = 0; i < NAMING_TAGS.length && name == null; i++ )
-            if( rel.hasKey(NAMING_TAGS[i]) )
+        for (int i = 0; i < NAMING_TAGS.length && name == null; i++ )
+            if (rel.hasKey(NAMING_TAGS[i]) ) {
                 name = rel.get(NAMING_TAGS[i]);
+            }
 
         StringBuilder sb = new StringBuilder();
         sb.append(type.substring(0, 1));
-        if( type.equals("boundary") && rel.hasKey("admin_level") )
+        if (type.equals("boundary") && rel.hasKey("admin_level") ) {
             sb.append(rel.get("admin_level"));
-        if( name != null )
+        }
+        if (name != null ) {
             sb.append(" \"").append(name).append('"');
-        if( tag != null )
+        }
+        if (tag != null ) {
             sb.append("; ").append(tag);
+        }
         sb.append(" (").append(rel.getMembersCount()).append(')');