Changeset 6084 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

Timestamp:

2013-07-26T13:38:17+02:00 (11 years ago)

Author:

bastiK

Message:

see #8902 - add missing @Override annotations (patch by shinigami)

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -842 +842 @@
         }
 
+        @Override
         public Object getElementAt(int index) {
             if (index < compareModes.size())
@@ -848 +849 @@
         }
 
+        @Override
         public int getSize() {
             return compareModes.size();
         }
 
+        @Override
         public Object getSelectedItem() {
             return compareModes.get(selectedIdx);
         }
 
+        @Override
         public void setSelectedItem(Object anItem) {
             int i = compareModes.indexOf(anItem);