Changeset 30738 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/ExtraNameFormatHook.java

Timestamp:

2014-10-19T01:27:04+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix java 7 warnings / global usage of try-with-resource

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/ExtraNameFormatHook.java (modified) (1 diff)

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

@@ -14 +14 @@
 
     public String checkRelationTypeName( IRelation relation, String defaultName ) {
-        return null;
+    return null;
     }
 
     public String checkFormat( INode node, String defaultName ) {
-        return null;
+    return null;
     }
 
     public String checkFormat( IWay way, String defaultName ) {
-        if( way.get("place") != null && way.get("name") == null && way.get("place_name") != null )
-            return way.get("place_name") + " " + defaultName;
-        return null;
+    if( way.get("place") != null && way.get("name") == null && way.get("place_name") != null )
+        return way.get("place_name") + " " + defaultName;
+    return null;
     }
 
     public String checkFormat( IRelation relation, String defaultName ) {
-        String type = relation.get("type");
-        if( type != null ) {
-            String name = relation.get("destination");
-            if( type.equals("destination_sign") && name != null ) {
-                if( relation.get("distance") != null )
-                    name += " " + relation.get("distance");
-                if( defaultName.indexOf('"') < 0 )
-                    return '"' + name + "\" " + defaultName;
-                else
-                    return defaultName.replaceFirst("\".?+\"", '"'+name+'"');
-            }
-        }
-        return null;
+    String type = relation.get("type");
+    if( type != null ) {
+        String name = relation.get("destination");
+        if( type.equals("destination_sign") && name != null ) {
+        if( relation.get("distance") != null )
+            name += " " + relation.get("distance");
+        if( defaultName.indexOf('"') < 0 )
+            return '"' + name + "\" " + defaultName;
+        else
+            return defaultName.replaceFirst("\".?+\"", '"'+name+'"');
+        }
+    }
+    return null;
     }
 }