Changeset 6105 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-08-03T00:17:44+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8902 - Small performance enhancements / coding style (patch by shinigami):

• removed useles null checks before instanceof

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapMover.java (modified) (1 diff)
• dialogs/RelationListDialog.java (modified) (2 diffs)
• dialogs/relation/RelationDialogManager.java (modified) (1 diff)
• help/HelpBrowser.java (modified) (1 diff)
• history/CoordinateInfoViewer.java (modified) (2 diffs)
• history/HistoryBrowserModel.java (modified) (1 diff)
• mappaint/BoxTextElemStyle.java (modified) (1 diff)
• mappaint/Environment.java (modified) (2 diffs)
• mappaint/MapImage.java (modified) (1 diff)

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

@@ -224 +224 @@
      */
     public static boolean isPlatformOsx() {
-        return Main.platform != null && Main.platform instanceof PlatformHookOsx;
+        return Main.platform instanceof PlatformHookOsx;
     }
 

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

@@ -228 +228 @@
      */
     protected void initFromLayer(Layer layer) {
-        if (layer == null || ! (layer instanceof OsmDataLayer)) {
+        if (!(layer instanceof OsmDataLayer)) {
             model.setRelations(null);
             return;
@@ -677 +677 @@
     public void tagsChanged(TagsChangedEvent event) {
         OsmPrimitive prim = event.getPrimitive();
-        if (prim == null || ! (prim instanceof Relation))
+        if (!(prim instanceof Relation))
             return;
         // trigger a sort of the relation list because the display name may

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java

@@ -185 +185 @@
     @Override
     public void layerRemoved(Layer oldLayer) {
-        if (oldLayer == null || ! (oldLayer instanceof OsmDataLayer))
+        if (!(oldLayer instanceof OsmDataLayer))
             return;
         OsmDataLayer dataLayer = (OsmDataLayer)oldLayer;

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -581 +581 @@
             AttributeSet set = e.getSourceElement().getAttributes();
             Object value = set.getAttribute(Tag.A);
-            if (value == null || ! (value instanceof SimpleAttributeSet)) return null;
+            if (!(value instanceof SimpleAttributeSet)) return null;
             SimpleAttributeSet atts = (SimpleAttributeSet)value;
             value = atts.getAttribute(javax.swing.text.html.HTML.Attribute.HREF);

trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

@@ -252 +252 @@
             HistoryOsmPrimitive p = getPrimitive();
             HistoryOsmPrimitive  opposite = getOppositePrimitive();
-            if (p == null || ! ( p instanceof HistoryNode)) return;
-            if (opposite == null || ! (opposite instanceof HistoryNode)) return;
+            if (!(p instanceof HistoryNode)) return;
+            if (!(opposite instanceof HistoryNode)) return;
             HistoryNode node = (HistoryNode)p;
             HistoryNode oppositeNode = (HistoryNode) opposite;
@@ -325 +325 @@
             HistoryOsmPrimitive p = getPrimitive();
             HistoryOsmPrimitive opposite = getOppositePrimitive();
-            if (p == null || ! ( p instanceof HistoryNode)) return;
-            if (opposite == null || ! (opposite instanceof HistoryNode)) return;
+            if (!(p instanceof HistoryNode)) return;
+            if (!(opposite instanceof HistoryNode)) return;
             HistoryNode node = (HistoryNode) p;
             HistoryNode oppositeNode = (HistoryNode) opposite;

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -755 +755 @@
     @Override
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        if (oldLayer != null && oldLayer instanceof OsmDataLayer) {
+        if (oldLayer instanceof OsmDataLayer) {
             OsmDataLayer l = (OsmDataLayer)oldLayer;
             l.data.removeDataSetListener(this);
         }
-        if (newLayer == null || ! (newLayer instanceof OsmDataLayer)) {
+        if (!(newLayer instanceof OsmDataLayer)) {
             latest = null;
             fireModelChange();

trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java

@@ -69 +69 @@
         @Override
         public boolean equals(Object obj) {
-            if (obj == null || !(obj instanceof BoxProvider))
+            if (!(obj instanceof BoxProvider))
                 return false;
             final BoxProvider other = (BoxProvider) obj;

trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java

@@ -107 +107 @@
 
     public boolean hasParentRelation() {
-        return parent != null && parent instanceof Relation;
+        return parent instanceof Relation;
     }
 
@@ -123 +123 @@
             return null;
 
-        if (parent != null && parent instanceof Relation)
+        if (parent instanceof Relation)
             return ((Relation) parent).getMember(index).getRole();
         if (child != null && osm instanceof Relation)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java

@@ -130 +130 @@
         @Override
         public boolean equals(Object obj) {
-            if (obj == null || !(obj instanceof BoxProvider))
+            if (!(obj instanceof BoxProvider))
                 return false;
             if (obj instanceof MapImageBoxProvider) {