Changeset 6084 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.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/tags/TagMerger.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

@@ -280 +280 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent arg0) {
             int rows[] = mineTable.getSelectedRows();
@@ -288 +289 @@
         }
 
+        @Override
         public void valueChanged(ListSelectionEvent e) {
             setEnabled(mineTable.getSelectedRowCount() > 0);
@@ -310 +312 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent arg0) {
             int rows[] = theirTable.getSelectedRows();
@@ -318 +321 @@
         }
 
+        @Override
         public void valueChanged(ListSelectionEvent e) {
             setEnabled(theirTable.getSelectedRowCount() > 0);
@@ -346 +350 @@
         }
 
+        @Override
         public void adjustmentValueChanged(AdjustmentEvent e) {
             for (Adjustable a : synchronizedAdjustables) {
@@ -405 +410 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent arg0) {
             int rows[] = mergedTable.getSelectedRows();
@@ -412 +418 @@
         }
 
+        @Override
         public void valueChanged(ListSelectionEvent e) {
             setEnabled(mergedTable.getSelectedRowCount() > 0);
@@ -417 +424 @@
     }
 
+    @Override
     public void deletePrimitive(boolean deleted) {
         // Use my entries, as it doesn't really matter
@@ -425 +433 @@
     }
 
+    @Override
     public void populate(Conflict<? extends OsmPrimitive> conflict) {
         model.populate(conflict.getMy(), conflict.getTheir());