Changeset 12866 in josm for trunk/src/org

Timestamp:

2017-09-15T01:35:48+02:00 (7 years ago)

Author:

Don-vip

Message:

SonarQube:

• squid:S4144 - Methods should not have identical implementations
• squid:S4165 - Assignments should not be redundant

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/RelationMemberData.java (modified) (2 diffs)
• gui/MapStatus.java (modified) (1 diff)
• gui/ScrollViewport.java (modified) (2 diffs)
• gui/dialogs/CommandStackDialog.java (modified) (1 diff)
• gui/io/ActionFlagsTableCell.java (modified) (1 diff)
• gui/widgets/ButtonColumn.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java

@@ -83 +83 @@
     @Override
     public OsmPrimitiveType getType() {
-        return memberType;
+        return getMemberType();
     }
 
@@ -91 +91 @@
     @Override
     public long getUniqueId() {
-        return memberId;
+        return getMemberId();
     }
 

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -671 +671 @@
                  @Override
                  public void mouseDragged(MouseEvent e) {
-                    l.setBackground(SystemColor.info);
-                    l.setForeground(SystemColor.infoText);
+                     mouseMoved(e);
                  }
             });

trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java

@@ -70 +70 @@
 
         @Override
-        public void mouseExited(MouseEvent arg0) {
+        public void mouseExited(MouseEvent e) {
+            mouseReleased(e);
+        }
+
+        @Override
+        public void mouseReleased(MouseEvent e) {
             ScrollViewport.this.scrollDirection = NO_SCROLL;
             timer.stop();
@@ -76 +81 @@
 
         @Override
-        public void mouseReleased(MouseEvent arg0) {
-            ScrollViewport.this.scrollDirection = NO_SCROLL;
-            timer.stop();
-        }
-
-        @Override public void mousePressed(MouseEvent arg0) {
+        public void mousePressed(MouseEvent e) {
             ScrollViewport.this.scrollDirection = direction;
             scroll();
             timer.restart();
         }
-
     }
 

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

@@ -208 +208 @@
             @Override
             public void treeNodesInserted(TreeModelEvent e) {
-                updater.updateEnabledState();
-                updateTitle();
+                treeNodesChanged(e);
             }
 
             @Override
             public void treeNodesRemoved(TreeModelEvent e) {
-                updater.updateEnabledState();
-                updateTitle();
+                treeNodesChanged(e);
             }
 
             @Override
             public void treeStructureChanged(TreeModelEvent e) {
-                updater.updateEnabledState();
-                updateTitle();
+                treeNodesChanged(e);
             }
         });

trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java

@@ -101 +101 @@
     @Override
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-        updatePanel((SaveLayerInfo) value);
-        updateCheckboxes(value);
-        return this;
+        return getTableCellEditorComponent(table, value, isSelected, row, column);
     }
 

trunk/src/org/openstreetmap/josm/gui/widgets/ButtonColumn.java

@@ -86 +86 @@
             editButton.setIcon(null);
         }
-        this.editorValue = value;
         return editButton;
     }