Changeset 32398 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

Timestamp:

2016-06-25T11:56:57+02:00 (10 years ago)

Author:

donvip

Message:

checkstyle

File:

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

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

@@ -60 +60 @@
         boolean wont = false;
         for (RelationMember m : r.getMembers()) {
-            if (m.isWay() ) {
+            if (m.isWay()) {
                 ways.add(m.getWay());
             } else {
@@ -67 +67 @@
         }
         if (wont) {
-            JOptionPane.showMessageDialog(Main.parent, tr("Multipolygon must consist only of ways"), tr("Reconstruct polygon"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent,
+                    tr("Multipolygon must consist only of ways"), tr("Reconstruct polygon"), JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -79 +80 @@
 
         if (!mpc.innerWays.isEmpty()) {
-            JOptionPane.showMessageDialog(Main.parent, tr("Reconstruction of polygons can be done only from outer ways"), tr("Reconstruct polygon"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent,
+                    tr("Reconstruction of polygons can be done only from outer ways"), tr("Reconstruct polygon"), JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -86 +88 @@
         List<Way> newSelection = new ArrayList<>();
         List<Command> commands = new ArrayList<>();
-        Command c = DeleteCommand.delete(Main.main.getEditLayer(), Collections.singleton(r), true, true);
-        if (c == null )
+        Command c = DeleteCommand.delete(Main.getLayerManager().getEditLayer(), Collections.singleton(r), true, true);
+        if (c == null)
             return;
         commands.add(c);
@@ -106 +108 @@
                 }
                 List<OsmPrimitive> referrers = w.getReferrers();
-                for (Iterator<OsmPrimitive> ref1 = relations.iterator(); ref1.hasNext(); )
-                    if (!referrers.contains(ref1.next()) ) {
+                for (Iterator<OsmPrimitive> ref1 = relations.iterator(); ref1.hasNext();) {
+                    if (!referrers.contains(ref1.next())) {
                         ref1.remove();
                     }
+                }
             }
             tags.putAll(r.getKeys());
@@ -123 +126 @@
                     keys.removeAll(IRRELEVANT_KEYS);
                     if (keys.isEmpty()) {
-                        if (candidateWay == null ) {
+                        if (candidateWay == null) {
                             candidateWay = w;
                         } else {
@@ -149 +152 @@
         Main.main.undoRedo.add(new SequenceCommand(tr("Reconstruct polygons from relation {0}",
                 r.getDisplayName(DefaultNameFormatter.getInstance())), commands));
-        Main.main.getCurrentDataSet().setSelected(newSelection);
+        Main.getLayerManager().getEditDataSet().setSelected(newSelection);
     }
 
@@ -158 +161 @@
 
     private boolean isSuitableRelation(Relation newRelation) {
-        if (newRelation == null || !"multipolygon".equals(newRelation.get("type")) || newRelation.getMembersCount() == 0 )
+        if (newRelation == null || !"multipolygon".equals(newRelation.get("type")) || newRelation.getMembersCount() == 0)
             return false;
         else {
-            for (RelationMember m : newRelation.getMembers() )
-                if ("inner".equals(m.getRole()) )
+            for (RelationMember m : newRelation.getMembers()) {
+                if ("inner".equals(m.getRole()))
                     return false;
+            }
             return true;
         }