Changeset 30733 in osm

Timestamp:

2014-10-18T16:33:42+02:00 (10 years ago)

Author:

donvip

Message:

[josm_epci-fr] fix sonar issues

Location:

applications/editors/josm/plugins/epci-fr

Files:

• .project (modified) (1 diff)
• .settings/org.sonar.ide.eclipse.core.prefs (added)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fr/epci/EpciNameFormatter.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fr/epci/EpciPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/epci-fr/.project

@@ -13 +13 @@
         </buildSpec>
         <natures>
+                <nature>org.sonar.ide.eclipse.core.sonarNature</nature>
                 <nature>org.eclipse.jdt.core.javanature</nature>
         </natures>

applications/editors/josm/plugins/epci-fr/build.xml

@@ -5 +5 @@
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="7001"/>
-        
+    
     <!-- Configure these properties (replace "..." accordingly).
          See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins

applications/editors/josm/plugins/epci-fr/src/org/openstreetmap/josm/plugins/fr/epci/EpciNameFormatter.java

@@ -11 +11 @@
  */
 public class EpciNameFormatter implements NameFormatterHook {
-        
-        @Override
-        public String checkRelationTypeName(IRelation relation, String defaultName) {
+
+    @Override
+    public String checkRelationTypeName(IRelation relation, String defaultName) {
         if (relation == null) return null;
-                String local_authority_FR = relation.get("local_authority:FR");
-        if (local_authority_FR != null) {
-                return (defaultName != null ? defaultName : "") + 
-                        "["+(local_authority_FR.equals("metropole") ? "MP" : local_authority_FR)+"]";
+        String localAuthorityFR = relation.get("local_authority:FR");
+        if (localAuthorityFR != null) {
+            return (defaultName != null ? defaultName : "") +
+                    "["+("metropole".equals(localAuthorityFR) ? "MP" : localAuthorityFR)+"]";
         } else {
-                return null;
+            return null;
         }
-        }
+    }
 
-        @Override
-        public String checkFormat(INode node, String defaultName) {
-                return null;
-        }
+    @Override
+    public String checkFormat(INode node, String defaultName) {
+        return null;
+    }
 
-        @Override
-        public String checkFormat(IWay node, String defaultName) {
-                return null;
-        }
+    @Override
+    public String checkFormat(IWay node, String defaultName) {
+        return null;
+    }
 
-        @Override
-        public String checkFormat(IRelation node, String defaultName) {
-                return null;
-        }
+    @Override
+    public String checkFormat(IRelation node, String defaultName) {
+        return null;
+    }
 }

applications/editors/josm/plugins/epci-fr/src/org/openstreetmap/josm/plugins/fr/epci/EpciPlugin.java

@@ -15 +15 @@
 public class EpciPlugin extends Plugin {
 
-        /**
-         * @param info
-         */
-        public EpciPlugin(PluginInformation info) {
-                super(info);
-                DefaultNameFormatter.registerFormatHook(new EpciNameFormatter());
-        }
+    /**
+     * @param info
+     */
+    public EpciPlugin(PluginInformation info) {
+        super(info);
+        DefaultNameFormatter.registerFormatHook(new EpciNameFormatter());
+    }
 }