Changeset 32395 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java

Timestamp:

2016-06-24T09:10:57+02:00 (9 years ago)

Author:

donvip

Message:

checkstyle, update to JOSM 10279

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java (modified) (9 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package relcontext.actions;
 
@@ -36 +37 @@
     private SortAndFixAction sortAndFix;
 
-    public AddRemoveMemberAction( ChosenRelation rel, SortAndFixAction sortAndFix ) {
+    public AddRemoveMemberAction(ChosenRelation rel, SortAndFixAction sortAndFix) {
         super(null, "relcontext/addremove", tr("Add/remove members from the chosen relation"),
                 Shortcut.registerShortcut("reltoolbox:addremove", tr("Relation Toolbox: {0}", tr("Add/remove members from the chosen relation")),
-                KeyEvent.VK_EQUALS, Shortcut.DIRECT), false);
+                        KeyEvent.VK_EQUALS, Shortcut.DIRECT), false);
         this.rel = rel;
         this.sortAndFix = sortAndFix;
@@ -46 +47 @@
     }
 
-    public void actionPerformed( ActionEvent e ) {
-        if( rel.get() == null )
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        if (rel.get() == null )
             return;
 
@@ -63 +65 @@
 
         // 2. add all new members
-        for( OsmPrimitive p : toAdd ) {
+        for (OsmPrimitive p : toAdd) {
             int pos = -1; //p instanceof Way ? findAdjacentMember(p, r) : -1;
-            if( pos < 0 )
+            if (pos < 0 ) {
                 r.addMember(new RelationMember("", p));
-            else
+            } else {
                 r.addMember(pos, new RelationMember("", p));
+            }
         }
 
         // 3. check for roles again (temporary)
         Command roleFix = !isBroken && sortAndFix.needsFixing(r) ? sortAndFix.fixRelation(r) : null;
-        if( roleFix != null )
+        if (roleFix != null ) {
             roleFix.executeCommand();
+        }
 
-        if( !r.getMemberPrimitives().equals(rel.get().getMemberPrimitives()) )
+        if (!r.getMemberPrimitives().equals(rel.get().getMemberPrimitives()) ) {
             Main.main.undoRedo.add(new ChangeCommand(rel.get(), r));
+        }
     }
 
@@ -84 +89 @@
      * @see org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel#determineDirection
      */
-    protected int findAdjacentMember( Way w, Relation r ) {
+    protected int findAdjacentMember(Way w, Relation r) {
         Node firstNode = w.firstNode();
         Node lastNode = w.lastNode();
 
-        if( firstNode != null && !firstNode.equals(lastNode) ) {
-            for( int i = 0; i < r.getMembersCount(); i++ ) {
-                if( r.getMember(i).getType().equals(OsmPrimitiveType.WAY) ) {
+        if (firstNode != null && !firstNode.equals(lastNode)) {
+            for (int i = 0; i < r.getMembersCount(); i++) {
+                if (r.getMember(i).getType().equals(OsmPrimitiveType.WAY)) {
                     Way rw = (Way)r.getMember(i).getMember();
                     Node firstNodeR = rw.firstNode();
                     Node lastNodeR = rw.lastNode();
-                    if( firstNode.equals(firstNodeR) || firstNode.equals(lastNodeR) || lastNode.equals(firstNodeR) || lastNode.equals(lastNodeR) )
+                    if (firstNode.equals(firstNodeR) || firstNode.equals(lastNodeR) || lastNode.equals(firstNodeR) || lastNode.equals(lastNodeR) )
                         return i + 1;
                 }
@@ -102 +107 @@
     }
 
-    public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+    @Override
+    public void chosenRelationChanged(Relation oldRelation, Relation newRelation) {
         updateEnabledState();
     }
@@ -112 +118 @@
 
     @Override
-    protected void updateEnabledState( Collection<? extends OsmPrimitive> selection ) {
+    protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         updateIcon();
-        if( rel == null || rel.get() == null || selection == null || selection.isEmpty() ) {
+        if (rel == null || rel.get() == null || selection == null || selection.isEmpty()) {
             setEnabled(false);
             return;
         }
-        if( selection.size() == 1 && selection.contains(rel.get()) ) {
+        if (selection.size() == 1 && selection.contains(rel.get())) {
             setEnabled(false);
             return;
@@ -128 +134 @@
         // todo: change icon based on selection
         final int state; // 0=unknown, 1=add, 2=remove, 3=both
-        if( getCurrentDataSet() == null || getCurrentDataSet().getSelected() == null
-                || getCurrentDataSet().getSelected().isEmpty() || rel == null || rel.get() == null )
+        if (getCurrentDataSet() == null || getCurrentDataSet().getSelected() == null
+                || getCurrentDataSet().getSelected().isEmpty() || rel == null || rel.get() == null ) {
             state = 0;
-        else {
+        } else {
             Collection<OsmPrimitive> toAdd = new ArrayList<>(getCurrentDataSet().getSelected());
             toAdd.remove(rel.get());
             int selectedSize = toAdd.size();
-            if( selectedSize == 0 )
+            if (selectedSize == 0 ) {
                 state = 0;
-            else {
+            } else {
                 toAdd.removeAll(rel.get().getMemberPrimitives());
-                if( toAdd.isEmpty() )
+                if (toAdd.isEmpty() ) {
                     state = 2;
-                else if( toAdd.size() < selectedSize )
+                } else if (toAdd.size() < selectedSize ) {
                     state = 3;
-                else
+                } else {
                     state = 1;
+                }
             }
         }
@@ -150 +157 @@
             @Override
             public void run() {
-//        String name = state == 0 ? "?" : state == 1 ? "+" : state == 2 ? "-" : "±";
-//        putValue(Action.NAME, name);
+                //        String name = state == 0 ? "?" : state == 1 ? "+" : state == 2 ? "-" : "±";
+                //        putValue(Action.NAME, name);
                 if (state == 0) {
-//            putValue(NAME, "?");
+                    //            putValue(NAME, "?");
                     putValue(LARGE_ICON_KEY, ImageProvider.get("relcontext", "addremove"));
                 } else {