Index: /trunk/src/org/openstreetmap/josm/gui/io/importexport/FileExporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/importexport/FileExporter.java	(revision 15661)
+++ /trunk/src/org/openstreetmap/josm/gui/io/importexport/FileExporter.java	(revision 15662)
@@ -87,5 +87,5 @@
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        // To be overriden by subclasses if their enabled state depends of the active layer nature
+        // To be overridden by subclasses if their enabled state depends of the active layer nature
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 15661)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 15662)
@@ -594,5 +594,5 @@
      */
     public void onPostLoadFromFile() {
-        // To be overriden if needed
+        // To be overridden if needed
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java	(revision 15661)
+++ /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java	(revision 15662)
@@ -55,5 +55,5 @@
      */
     public ManualAuthorizationUI(String apiUrl, Executor executor) {
-        super(/* dont pass apiURL because setApiUrl is overriden and references a local field */);
+        super(/* dont pass apiURL because setApiUrl is overridden and references a local field */);
         setApiUrl(apiUrl);
         this.executor = executor;
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java	(revision 15661)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java	(revision 15662)
@@ -96,5 +96,5 @@
 
     /**
-     * Restore default behaviour of focus transfer with TAB, overriden by {@link JTextArea}.
+     * Restore default behaviour of focus transfer with TAB, overridden by {@link JTextArea}.
      * @return {@code this}
      * @since 11308
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java	(revision 15661)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java	(revision 15662)
@@ -72,5 +72,5 @@
     /**
      * Launches the popup menu according to the given mouse event.
-     * This method needs to be overriden if the default constructor has been called.
+     * This method needs to be overridden if the default constructor has been called.
      * @param evt A mouse event
      */
Index: /trunk/src/org/tukaani/xz/BasicArrayCache.java
===================================================================
--- /trunk/src/org/tukaani/xz/BasicArrayCache.java	(revision 15661)
+++ /trunk/src/org/tukaani/xz/BasicArrayCache.java	(revision 15662)
@@ -126,5 +126,5 @@
             //
             // That last argument is true to get LRU cache behavior together
-            // with the overriden removeEldestEntry method.
+            // with the overridden removeEldestEntry method.
             super(2 * STACKS_MAX, 0.75f, true);
         }
Index: /trunk/src/org/tukaani/xz/BlockInputStream.java
===================================================================
--- /trunk/src/org/tukaani/xz/BlockInputStream.java	(revision 15661)
+++ /trunk/src/org/tukaani/xz/BlockInputStream.java	(revision 15662)
@@ -78,5 +78,5 @@
 
         try {
-            // Set the maximum valid compressed size. This is overriden
+            // Set the maximum valid compressed size. This is overridden
             // by the value from the Compressed Size field if it is present.
             compressedSizeLimit = (DecoderUtil.VLI_MAX & ~3)
Index: /trunk/src/org/tukaani/xz/rangecoder/RangeEncoder.java
===================================================================
--- /trunk/src/org/tukaani/xz/rangecoder/RangeEncoder.java	(revision 15661)
+++ /trunk/src/org/tukaani/xz/rangecoder/RangeEncoder.java	(revision 15662)
@@ -73,5 +73,5 @@
         // how big the finished buffer is. RangeEncoderToStream has no
         // buffer and thus no return value is needed. Here we use a dummy
-        // value which can be overriden in RangeEncoderToBuffer.finish().
+        // value which can be overridden in RangeEncoderToBuffer.finish().
         return -1;
     }
Index: /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 15661)
+++ /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 15662)
@@ -756,6 +756,6 @@
     public @interface OverrideAssumeRevision {
         /**
-         * Returns overriden assumed JOSM version.
-         * @return overriden assumed JOSM version
+         * Returns overridden assumed JOSM version.
+         * @return overridden assumed JOSM version
          */
         String value();
@@ -771,6 +771,6 @@
     public @interface OverrideTimeout {
         /**
-         * Returns overriden timeout value.
-         * @return overriden timeout value
+         * Returns overridden timeout value.
+         * @return overridden timeout value
          */
         int value();