Changeset 6295 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2013-10-04T01:20:31+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - fix various problems, javadoc

Location:

trunk/src/org/openstreetmap/josm/gui/preferences/projection

Files:

• CodeProjectionChoice.java (modified) (1 diff)
• CustomProjectionChoice.java (modified) (3 diffs)
• GaussKruegerProjectionChoice.java (modified) (1 diff)
• LambertCC9ZonesProjectionChoice.java (modified) (1 diff)
• ListProjectionChoice.java (modified) (1 diff)
• SwissGridProjectionChoice.java (modified) (1 diff)
• UTMProjectionChoice.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java

@@ -213 +213 @@
 
     @Override
-    public Collection<String> getPreferences(JPanel pnl) {
-        CodeSelectionPanel csPanel = (CodeSelectionPanel) pnl;
+    public Collection<String> getPreferences(JPanel panel) {
+        if (!(panel instanceof CodeSelectionPanel)) {
+            throw new IllegalArgumentException();
+        }
+        CodeSelectionPanel csPanel = (CodeSelectionPanel) panel;
         return Collections.singleton(csPanel.getCode());
     }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java

@@ -42 +42 @@
     private String pref;
 
+    /**
+     * Constructs a new {@code CustomProjectionChoice}.
+     */
     public CustomProjectionChoice() {
         super(tr("Custom Projection"), "core:custom");
@@ -156 +159 @@
     public static class ParameterInfoDialog extends ExtendedDialog {
 
+        /**
+         * Constructs a new {@code ParameterInfoDialog}.
+         */
         public ParameterInfoDialog() {
             super(null, tr("Parameter information"), new String[] { tr("Close") }, false);
@@ -225 +231 @@
     @Override
     public Collection<String> getPreferences(JPanel panel) {
+        if (!(panel instanceof PreferencePanel)) {
+            throw new IllegalArgumentException();
+        }
         PreferencePanel prefPanel = (PreferencePanel) panel;
         String pref = prefPanel.input.getText();

trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java

@@ -11 +11 @@
     private static String[] zones = { "2", "3", "4", "5" };
 
+    /**
+     * Constructs a new {@code GaussKruegerProjectionChoice}.
+     */
     public GaussKruegerProjectionChoice() {
         super(tr("Gau\u00DF-Kr\u00FCger"), "core:gauss-krueger", zones, tr("GK Zone"));

trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java

@@ -28 +28 @@
     };
 
+    /**
+     * Constructs a new {@code LambertCC9ZonesProjectionChoice}.
+     */
     public LambertCC9ZonesProjectionChoice() {
         super(tr("Lambert CC9 Zone (France)"), "core:lambertcc9", lambert9zones, tr("Lambert CC Zone"));

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java

@@ -105 +105 @@
     @Override
     public Collection<String> getPreferences(JPanel panel) {
+        if (!(panel instanceof CBPanel)) {
+            throw new IllegalArgumentException();
+        }
         CBPanel p = (CBPanel) panel;
         int index = p.prefcb.getSelectedIndex();

trunk/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java

@@ -15 +15 @@
 public class SwissGridProjectionChoice extends SingleProjectionChoice {
 
+    /**
+     * Constructs a new {@code SwissGridProjectionChoice}.
+     */
     public SwissGridProjectionChoice() {
         super(tr("Swiss Grid (Switzerland)"), "core:swissgrid", "EPSG:21781");

trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java

@@ -33 +33 @@
     }
 
+    /**
+     * Constructs a new {@code UTMProjectionChoice}.
+     */
     public UTMProjectionChoice() {
         super(tr("UTM"), "core:utm", cbEntries.toArray(), tr("UTM Zone"));
@@ -96 +99 @@
     @Override
     public Collection<String> getPreferences(JPanel panel) {
+        if (!(panel instanceof UTMPanel)) {
+            throw new IllegalArgumentException();
+        }
         UTMPanel p = (UTMPanel) panel;
         int index = p.prefcb.getSelectedIndex();
@@ -133 +139 @@
         Hemisphere hemisphere = DEFAULT_HEMISPHERE;
 
-        if(args != null) {
+        if (args != null) {
             String[] array = args.toArray(new String[args.size()]);
 
@@ -155 +161 @@
         return defaultIndex;
     }
-
 }