Changeset 11374 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-12-09T23:31:13+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S00112 - Generic exceptions should never be thrown: define JosmRuntimeException

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/LayerListDialog.java (modified) (1 diff)
• dialogs/ValidatorDialog.java (modified) (2 diffs)
• mappaint/mapcss/ConditionFactory.java (modified) (2 diffs)
• mappaint/mapcss/ExpressionFactory.java (modified) (4 diffs)
• mappaint/mapcss/MapCSSParser.jj (modified) (3 diffs)
• mappaint/mapcss/MapCSSStyleSource.java (modified) (3 diffs)
• preferences/projection/ProjectionPreference.java (modified) (2 diffs)
• tagging/TagCellRenderer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -1030 +1030 @@
                     l.rename((String) value);
                     break;
-                default: throw new RuntimeException();
+                default:
+                    throw new IllegalArgumentException("Wrong column: " + col);
                 }
                 fireTableCellUpdated(row, col);

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -55 +55 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
@@ -634 +635 @@
             } catch (InterruptedException | InvocationTargetException e) {
                 // FIXME: signature of realRun should have a generic checked exception we could throw here
-                throw new RuntimeException(e);
+                throw new JosmRuntimeException(e);
             } finally {
                 monitor.finishTask();

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.ToTagConvertable;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -819 +820 @@
                 return not ^ (Boolean) method.invoke(null, e);
             } catch (IllegalAccessException | InvocationTargetException ex) {
-                throw new RuntimeException(ex);
+                throw new JosmRuntimeException(ex);
             }
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -40 +40 @@
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
@@ -97 +98 @@
             parameterFunctions.add(Math.class.getMethod("tanh", double.class));
         } catch (NoSuchMethodException | SecurityException ex) {
-            throw new RuntimeException(ex);
+            throw new JosmRuntimeException(ex);
         }
     }
@@ -1240 +1241 @@
                 result = m.invoke(null, convertedArgs);
             } catch (IllegalAccessException | IllegalArgumentException ex) {
-                throw new RuntimeException(ex);
+                throw new JosmRuntimeException(ex);
             } catch (InvocationTargetException ex) {
                 Main.error(ex);
@@ -1306 +1307 @@
                 result = m.invoke(null, convertedArgs);
             } catch (IllegalAccessException | IllegalArgumentException ex) {
-                throw new RuntimeException(ex);
+                throw new JosmRuntimeException(ex);
             } catch (InvocationTargetException ex) {
                 Main.error(ex);

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.Subpart;
 import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Utils;
@@ -66 +67 @@
      */
     public static enum LexicalState {
-        PREPROCESSOR(0), /* the preprocessor */
-        DEFAULT(2);      /* the main parser */
-        
+        /** the preprocessor */
+        PREPROCESSOR(0),
+        /** the main parser */
+        DEFAULT(2);
+
         int idx; // the integer, which javacc assigns to this state
-        
+
         LexicalState(int idx) {
             if (!this.name().equals(MapCSSParserTokenManager.lexStateNames[idx])) {
-                throw new RuntimeException();
+                throw new JosmRuntimeException("Wrong name for index " + idx);
             }
             this.idx = idx;
         }
-    };
+    }
     
     /**
@@ -95 +98 @@
             scs = new SimpleCharStream(in, encoding, 1, 1);
         } catch (java.io.UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
+            throw new JosmRuntimeException(e);
         }
         return new MapCSSParserTokenManager(scs, initState.idx);

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -60 +60 @@
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Utils;
@@ -108 +109 @@
                 SUPPORTED_KEYS.add((String) f.get(null));
                 if (!f.getName().toLowerCase(Locale.ENGLISH).replace('_', '-').equals(f.get(null))) {
-                    throw new RuntimeException(f.getName());
+                    throw new JosmRuntimeException(f.getName());
                 }
             } catch (IllegalArgumentException | IllegalAccessException ex) {
-                throw new RuntimeException(ex);
+                throw new JosmRuntimeException(ex);
             }
         }
@@ -468 +469 @@
                         break;
                     default:
-                        final RuntimeException e = new RuntimeException(MessageFormat.format("Unknown MapCSS base selector {0}", base));
+                        final RuntimeException e = new JosmRuntimeException(MessageFormat.format("Unknown MapCSS base selector {0}", base));
                         Main.warn(tr("Failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
                         Main.error(e);

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

@@ -37 +37 @@
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 
 /**
@@ -479 +480 @@
         // should have been set to Mercator at JOSM start.
         if (pc == null)
-            throw new RuntimeException("Couldn't find the current projection in the list of available projections!");
+            throw new JosmRuntimeException("Couldn't find the current projection in the list of available projections!");
 
         projectionCombo.addActionListener(e -> {

trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java

@@ -12 +12 @@
 import javax.swing.border.EmptyBorder;
 import javax.swing.table.TableCellRenderer;
+
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 
 /**
@@ -102 +104 @@
         case 1: renderTagValue((TagModel) value); break;
 
-        default: throw new RuntimeException("unexpected index in switch statement");
+        default: throw new JosmRuntimeException("unexpected index in switch statement");
         }
         if (hasFocus && isSelected) {