Changeset 2676 in josm for trunk/src/org/openstreetmap/josm/data/projection

Timestamp:

2009-12-24T08:48:40+01:00 (14 years ago)

Author:

jttt

Message:

Fix some of the warnings found by FindBugs

File:

• trunk/src/org/openstreetmap/josm/data/projection/Puwg.java (modified) (13 diffs)

trunk/src/org/openstreetmap/josm/data/projection/Puwg.java

@@ -3 +3 @@
 package org.openstreetmap.josm.data.projection;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagLayout;
 import java.text.DecimalFormat;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.GridBagLayout;
 import java.util.Collection;
 import java.util.Collections;
@@ -40 +39 @@
     private static DecimalFormat decFormatter = new DecimalFormat("###0");
 
+    @Override
     public EastNorth latlon2eastNorth(LatLon p) {
         PuwgData z = Zones[zone];
@@ -50 +50 @@
     }
 
+    @Override
     public LatLon eastNorth2latlon(EastNorth p) {
         PuwgData z = Zones[zone];
@@ -63 +64 @@
     }
 
+    @Override
     public String toCode() {
         return Zones[zone].toCode();
@@ -72 +74 @@
     }
 
+    @Override
     public String getCacheDirectoryName() {
         return Zones[zone].getCacheDirectoryName();
     }
 
+    @Override
     public Bounds getWorldBoundsLatLon() {
         return Zones[zone].getWorldBoundsLatLon();
     }
 
+    @Override
     public double getDefaultZoomInPPD() {
         // This will set the scale bar to about 100 km
@@ -93 +98 @@
     }
 
+    @Override
     public void setupPreferencePanel(JPanel p) {
         JComboBox prefcb = new JComboBox(Puwg.Zones);
@@ -105 +111 @@
     }
 
+    @Override
     public Collection<String> getPreferences(JPanel p) {
-    Object prefcb = p.getComponent(2);
+        Object prefcb = p.getComponent(2);
         if(!(prefcb instanceof JComboBox))
             return null;
@@ -113 +120 @@
     }
 
+    @Override
     public Collection<String> getPreferencesFromCode(String code)
     {
@@ -118 +126 @@
         {
             if(code.equals(p.toCode()))
-            return Collections.singleton(code);
+                return Collections.singleton(code);
         }
         return null;
     }
 
+    @Override
     public void setPreferences(Collection<String> args)
     {
@@ -131 +140 @@
                 for(String s : args)
                 {
-                for (int i=0; i < Puwg.Zones.length; ++i)
-                    if(s.equals(Zones[i].toCode()))
-                    zone = i;
-                break;
+                    for (int i=0; i < Puwg.Zones.length; ++i)
+                        if(s.equals(Zones[i].toCode())) {
+                            zone = i;
+                        }
+                    break;
                 }
-            } catch (NullPointerException e) {};
+            } catch (NullPointerException e) {}
         }
     }
@@ -151 +161 @@
 class Epsg2180 implements PuwgData {
 
-    final private double Epsg2180FalseEasting = 500000.0; /* y */
-    final private double Epsg2180FalseNorthing = -5300000.0; /* x */
-    final private double Epsg2180ScaleFactor = 0.9993;
-    final private double Epsg2180CentralMeridian = 19.0;
+    private static final double Epsg2180FalseEasting = 500000.0; /* y */
+    private static final double Epsg2180FalseNorthing = -5300000.0; /* x */
+    private static final double Epsg2180ScaleFactor = 0.9993;
+    private static final double Epsg2180CentralMeridian = 19.0;
     private static DecimalFormat decFormatter = new DecimalFormat("###0");
 
@@ -202 +212 @@
 abstract class Puwg2000 implements PuwgData {
 
-    final private double PuwgFalseEasting = 500000.0;
-    final private double PuwgFalseNorthing = 0;
-    final private double PuwgScaleFactor = 0.999923;
-    final private double[] Puwg2000CentralMeridian = {15.0, 18.0, 21.0, 24.0};
+    private static final double PuwgFalseEasting = 500000.0;
+    private static final double PuwgFalseNorthing = 0;
+    private static final double PuwgScaleFactor = 0.999923;
+    //final private double[] Puwg2000CentralMeridian = {15.0, 18.0, 21.0, 24.0};
     final private String[] Puwg2000Code = { "EPSG:2176",  "EPSG:2177", "EPSG:2178", "EPSG:2179"};
     final private String[] Puwg2000CDName = { "epsg2176",  "epsg2177", "epsg2178", "epsg2179"};
@@ -258 +268 @@
 
 class Epsg2176 extends Puwg2000 implements Projection {
-    final private int PuwgZone = 5;
-
+    private static final int PuwgZone = 5;
+
+    @Override
     public int getZone() { return PuwgZone; }
 }
 
 class Epsg2177 extends Puwg2000 implements Projection {
-    final private int PuwgZone = 6;
-
+    private static final int PuwgZone = 6;
+
+    @Override
     public int getZone() { return PuwgZone; }
 }
 
 class Epsg2178 extends Puwg2000 implements Projection {
-    final private int PuwgZone = 7;
-
+    private static final int PuwgZone = 7;
+
+    @Override
     public int getZone() { return PuwgZone; }
 }
 
 class Epsg2179 extends Puwg2000 implements Projection {
-    final private int PuwgZone = 8;
-
-    public int getZone() { return PuwgZone; }
-}
+    private static final int PuwgZone = 8;
+
+    @Override
+    public int getZone() { return PuwgZone; }
+}