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

Timestamp:

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

Author:

donvip

Message:

checkstyle

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java (modified) (12 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

@@ -69 +69 @@
 
     public boolean isSame(Object r) {
-        if (r == null )
+        if (r == null)
             return chosenRelation == null;
-        else if (!(r instanceof Relation) )
+        else if (!(r instanceof Relation))
             return false;
         else
@@ -89 +89 @@
 
     public static boolean isMultipolygon(Relation r) {
-        if (r == null )
+        if (r == null)
             return false;
         String type = r.get("type");
-        if (type == null )
+        if (type == null)
             return false;
-        for (String t : MULTIPOLYGON_TYPES )
-            if (t.equals(type) )
+        for (String t : MULTIPOLYGON_TYPES) {
+            if (t.equals(type))
                 return true;
+        }
         return false;
     }
@@ -138 +139 @@
             return;
 
-        OsmDataLayer dataLayer = mv.getEditLayer();
-        float opacity = dataLayer == null ? 0.0f : !dataLayer.isVisible() ? 0.0f : (float)dataLayer.getOpacity();
-        if (opacity < 0.01 )
+        OsmDataLayer dataLayer = mv.getLayerManager().getEditLayer();
+        float opacity = dataLayer == null ? 0.0f : !dataLayer.isVisible() ? 0.0f : (float) dataLayer.getOpacity();
+        if (opacity < 0.01)
             return;
 
@@ -153 +154 @@
         g.setComposite(oldComposite);
         g.setStroke(oldStroke);
-
     }
 
@@ -159 +159 @@
         for (OsmPrimitive element : rel.getMemberPrimitives()) {
             if (element.getType() == OsmPrimitiveType.NODE) {
-                Node node = (Node)element;
+                Node node = (Node) element;
                 Point center = mv.getPoint(node);
                 g.drawOval(center.x - 4, center.y - 4, 9, 9);
             } else if (element.getType() == OsmPrimitiveType.WAY) {
-                Way way = (Way)element;
+                Way way = (Way) element;
                 if (way.getNodesCount() >= 2) {
                     GeneralPath b = new GeneralPath();
@@ -177 +177 @@
                 Color oldColor = g.getColor();
                 g.setColor(Color.magenta);
-                drawRelations(g, mv, bbox, (Relation)element);
+                drawRelations(g, mv, bbox, (Relation) element);
                 g.setColor(oldColor);
             }
@@ -186 +186 @@
     @Override
     public void relationMembersChanged(RelationMembersChangedEvent event) {
-        if (chosenRelation != null && event.getRelation().equals(chosenRelation) ) {
+        if (chosenRelation != null && event.getRelation().equals(chosenRelation)) {
             fireRelationChanged(chosenRelation);
         }
@@ -193 +193 @@
     @Override
     public void tagsChanged(TagsChangedEvent event) {
-        if (chosenRelation != null && event.getPrimitive().equals(chosenRelation) ) {
+        if (chosenRelation != null && event.getPrimitive().equals(chosenRelation)) {
             fireRelationChanged(chosenRelation);
         }
@@ -200 +200 @@
     @Override
     public void dataChanged(DataChangedEvent event) {
-        if (chosenRelation != null ) {
+        if (chosenRelation != null) {
             fireRelationChanged(chosenRelation);
         }
@@ -207 +207 @@
     @Override
     public void primitivesRemoved(PrimitivesRemovedEvent event) {
-        if (chosenRelation != null && event.getPrimitives().contains(chosenRelation) ) {
+        if (chosenRelation != null && event.getPrimitives().contains(chosenRelation)) {
             clear();
         }
@@ -214 +214 @@
     @Override
     public void wayNodesChanged(WayNodesChangedEvent event) {
-        if (chosenRelation != null )
-        {
+        if (chosenRelation != null) {
             fireRelationChanged(chosenRelation); // download incomplete primitives doesn't cause dataChanged event
         }
@@ -222 +221 @@
     @Override
     public void primitivesAdded(PrimitivesAddedEvent event) {}
+
     @Override
     public void nodeMoved(NodeMovedEvent event) {}
+
     @Override
     public void otherDatasetChange(AbstractDatasetChangedEvent event) {}