Index: /trunk/src/org/openstreetmap/josm/actions/JumpToAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/JumpToAction.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/actions/JumpToAction.java	(revision 11620)
@@ -195,6 +195,6 @@
             double zoomLvl = Double.parseDouble(zm.getText());
             url.setText(OsmUrlToBounds.getURL(dlat, dlon, (int) zoomLvl));
-        } catch (NumberFormatException x) {
-            Main.debug(x.getMessage());
+        } catch (NumberFormatException e) {
+            Main.debug(e.getMessage());
         }
     }
Index: /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 11620)
@@ -282,6 +282,6 @@
                     .append(paramCleanup(entry.getValue().getValue().toString())).append('\n');
             }
-        } catch (Exception x) {
-            Main.error(x);
+        } catch (Exception ex) {
+            Main.error(ex);
         }
 
Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 11620)
@@ -349,6 +349,6 @@
 
                     oldMousePos = ms.mousePos;
-                } catch (ConcurrentModificationException x) {
-                    Main.warn(x);
+                } catch (ConcurrentModificationException ex) {
+                    Main.warn(ex);
                 } finally {
                     if (ds != null) {
Index: /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 11620)
@@ -141,5 +141,5 @@
             try {
                 values[i] = Double.parseDouble(latlon[i].getText());
-            } catch (NumberFormatException x) {
+            } catch (NumberFormatException ex) {
                 return null;
             }
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 11620)
@@ -291,18 +291,18 @@
                     data.storageFile = sel;
 
-                } catch (SAXException x) {
-                    Main.error(x);
+                } catch (SAXException ex) {
+                    Main.error(ex);
                     JOptionPane.showMessageDialog(
                             Main.parent,
-                            tr("Error while parsing {0}", sel.getName())+": "+x.getMessage(),
+                            tr("Error while parsing {0}", sel.getName())+": "+ex.getMessage(),
                             tr("Error"),
                             JOptionPane.ERROR_MESSAGE
                     );
                     return;
-                } catch (IOException x) {
-                    Main.error(x);
+                } catch (IOException ex) {
+                    Main.error(ex);
                     JOptionPane.showMessageDialog(
                             Main.parent,
-                            tr("Could not read \"{0}\"", sel.getName())+'\n'+x.getMessage(),
+                            tr("Could not read \"{0}\"", sel.getName())+'\n'+ex.getMessage(),
                             tr("Error"),
                             JOptionPane.ERROR_MESSAGE
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java	(revision 11620)
@@ -452,6 +452,6 @@
             dirExif = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
             dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class);
-        } catch (CompoundException | IOException p) {
-            Main.warn(p);
+        } catch (CompoundException | IOException ex) {
+            Main.warn(ex);
             setExifCoor(null);
             setPos(null);
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 11620)
@@ -150,5 +150,5 @@
             try {
                 Thread.sleep(10);
-            } catch (InterruptedException ie) {
+            } catch (InterruptedException e) {
                 Main.warn("InterruptedException while drawing thumb");
                 Thread.currentThread().interrupt();
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 11620)
@@ -155,6 +155,6 @@
             try {
                 OsmApi.getOsmApi().initialize(null);
-            } catch (OsmTransferCanceledException | OsmApiInitializationException x) {
-                Main.warn(x);
+            } catch (OsmTransferCanceledException | OsmApiInitializationException ex) {
+                Main.warn(ex);
             }
         }
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java	(revision 11620)
@@ -141,5 +141,5 @@
                     aibutton.addActionListener(e -> auto_increment_selected = buttonvalue);
                     pnl.add(aibutton, GBC.std());
-                } catch (ParseException x) {
+                } catch (ParseException ex) {
                     Main.error("Cannot parse auto-increment value of '" + ai + "' into an integer");
                 }
Index: /trunk/src/org/openstreetmap/josm/io/FileWatcher.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/FileWatcher.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/io/FileWatcher.java	(revision 11620)
@@ -113,5 +113,5 @@
             try {
                 key = watcher.take();
-            } catch (InterruptedException x) {
+            } catch (InterruptedException ex) {
                 Thread.currentThread().interrupt();
                 return;
Index: /trunk/src/org/openstreetmap/josm/io/GpxExporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxExporter.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/io/GpxExporter.java	(revision 11620)
@@ -205,7 +205,7 @@
             new GpxWriter(fo).write(gpxData);
             fo.flush();
-        } catch (IOException x) {
-            Main.error(x);
-            JOptionPane.showMessageDialog(Main.parent, tr("Error while exporting {0}:\n{1}", fn, x.getMessage()),
+        } catch (IOException ex) {
+            Main.error(ex);
+            JOptionPane.showMessageDialog(Main.parent, tr("Error while exporting {0}:\n{1}", fn, ex.getMessage()),
                     tr("Error"), JOptionPane.ERROR_MESSAGE);
         }
Index: /trunk/src/org/openstreetmap/josm/io/NameFinder.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/NameFinder.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/io/NameFinder.java	(revision 11620)
@@ -238,10 +238,10 @@
                     data.add(currentResult);
                 }
-            } catch (NumberFormatException x) {
-                Main.error(x); // SAXException does not chain correctly
-                throw new SAXException(x.getMessage(), x);
-            } catch (NullPointerException x) {
-                Main.error(x); // SAXException does not chain correctly
-                throw new SAXException(tr("Null pointer exception, possibly some missing tags."), x);
+            } catch (NumberFormatException ex) {
+                Main.error(ex); // SAXException does not chain correctly
+                throw new SAXException(ex.getMessage(), ex);
+            } catch (NullPointerException ex) {
+                Main.error(ex); // SAXException does not chain correctly
+                throw new SAXException(tr("Null pointer exception, possibly some missing tags."), ex);
             }
         }
Index: /trunk/src/org/openstreetmap/josm/io/NmeaReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 11620)
@@ -415,7 +415,7 @@
             return true;
 
-        } catch (RuntimeException x) {
+        } catch (RuntimeException ex) {
             // out of bounds and such
-            Main.debug(x);
+            Main.debug(ex);
             ps.malformed++;
             ps.pWp = null;
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java	(revision 11620)
@@ -103,7 +103,7 @@
                 Socket request = server.accept();
                 RequestProcessor.processRequest(request);
-            } catch (SocketException se) {
+            } catch (SocketException e) {
                 if (!server.isClosed()) {
-                    Main.error(se);
+                    Main.error(e);
                 } else {
                     // stop the thread automatically if server is stopped
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java	(revision 11620)
@@ -417,7 +417,7 @@
                 }
                 RequestProcessor.processRequest(request);
-            } catch (SocketException se) {
+            } catch (SocketException e) {
                 if (!server.isClosed()) {
-                    Main.error(se);
+                    Main.error(e);
                 }
             } catch (IOException ioe) {
Index: /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java	(revision 11620)
@@ -602,6 +602,6 @@
                 zipFile = new ZipFile(sessionFile, StandardCharsets.UTF_8);
                 return getZipInputStream(zipFile);
-            } catch (ZipException ze) {
-                throw new IOException(ze);
+            } catch (ZipException ex) {
+                throw new IOException(ex);
             }
         } else {
Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 11620)
@@ -1227,7 +1227,7 @@
                 parser.parse(new InputSource(is));
             }
-        } catch (SAXReturnException r) {
-            Main.trace(r);
-            return r.getResult();
+        } catch (SAXReturnException e) {
+            Main.trace(e);
+            return e.getResult();
         } catch (IOException | SAXException | ParserConfigurationException e) {
             Main.warn("Parsing " + base + fn + " failed:\n" + e);
Index: /trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 11620)
@@ -41,6 +41,6 @@
                 url = Utils.decodeUrl(url);
             }
-        } catch (IllegalArgumentException x) {
-            Main.error(x);
+        } catch (IllegalArgumentException ex) {
+            Main.error(ex);
         }
         Bounds b = parseShortLink(url);
@@ -82,6 +82,6 @@
                         z == null ? 18 : Integer.parseInt(z));
             }
-        } catch (NumberFormatException | NullPointerException | ArrayIndexOutOfBoundsException x) {
-            Main.error(x);
+        } catch (NumberFormatException | NullPointerException | ArrayIndexOutOfBoundsException ex) {
+            Main.error(ex);
         }
         return b;
Index: /trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java	(revision 11619)
+++ /trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java	(revision 11620)
@@ -50,10 +50,13 @@
         try {
             fact = DatatypeFactory.newInstance();
-        } catch (DatatypeConfigurationException ce) {
-            Main.error(ce);
+        } catch (DatatypeConfigurationException e) {
+            Main.error(e);
         }
         XML_DATE = fact;
     }
 
+    /**
+     * Constructs a new {@code DateUtils}.
+     */
     protected DateUtils() {
         // Hide default constructor for utils classes
Index: /trunk/tools/checkstyle/josm_checks.xml
===================================================================
--- /trunk/tools/checkstyle/josm_checks.xml	(revision 11619)
+++ /trunk/tools/checkstyle/josm_checks.xml	(revision 11620)
@@ -16,4 +16,7 @@
     <module name="BooleanExpressionComplexity">
       <property name="max" value="6"/>
+    </module>
+    <module name="CatchParameterName">
+      <property name="format" value="^(e[1-9]?|t|ex[1-9]?|[a-z][a-z][a-zA-Z]+)$"/>
     </module>
     <module name="FileContentsHolder"/>