Changeset 31427 in osm for applications/viewer/jmapviewer/src/org

Timestamp:

2015-08-01T18:19:40+02:00 (9 years ago)

Author:

wiktorn

Message:

Coverity detected fixes:

TileSourceInfo:

• Initialize cookies variable in Tile

BingAerialTileSource:

• make Attribution class static

CheckBoxTree:

• change Boolean instance comparision with equals()

MemoryTileCache:

• fix synchronization issues, remove unused methods

MapObjectImpl

• fix null pointer dereference

LayerGroup:

• fix unboxing and immediatly boxing Boolean value
• fix null pointer dereference

JobDispatcher:

• synchronize access to workerThreadCount and use equals when comparing tiles

Tile:

• use TileSource of the Tile in equals(...)

Coordinate:

• remove implements Serializable - no fields are stored anyway

JMapViewer:

• fix for null pointer dereference, make TileSource transient as it is not serializable anyway

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• Coordinate.java (modified) (3 diffs)
• JMapViewer.java (modified) (4 diffs)
• JMapViewerTree.java (modified) (8 diffs)
• JobDispatcher.java (modified) (2 diffs)
• LayerGroup.java (modified) (3 diffs)
• MapObjectImpl.java (modified) (2 diffs)
• MemoryTileCache.java (modified) (3 diffs)
• Tile.java (modified) (1 diff)
• checkBoxTree/CheckBoxTree.java (modified) (7 diffs)
• tilesources/BingAerialTileSource.java (modified) (1 diff)
• tilesources/TileSourceInfo.java (modified) (1 diff)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Coordinate.java

@@ -6 +6 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.Serializable;
 import java.util.Objects;
 
@@ -18 +17 @@
  *
  */
-public class Coordinate implements Serializable, ICoordinate {
+public class Coordinate implements ICoordinate {
     private transient Point2D.Double data;
 
@@ -52 +51 @@
     }
 
+    @Override
     public String toString() {
         return "Coordinate[" + data.y + ", " + data.x + "]";

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -89 +89 @@
     protected ZOOM_BUTTON_STYLE zoomButtonStyle;
 
-    protected TileSource tileSource;
+    protected transient TileSource tileSource;
 
     protected AttributionSupport attribution = new AttributionSupport();
@@ -263 +263 @@
         int mapZoomMax = tileController.getTileSource().getMaxZoom();
 
-        if (markers) {
+        if (markers && mapMarkerList != null) {
             synchronized (mapMarkerList) {
                 for (MapMarker marker : mapMarkerList) {
@@ -277 +277 @@
         }
 
-        if (rectangles) {
+        if (rectangles && mapRectangleList != null) {
             synchronized (mapRectangleList) {
                 for (MapRectangle rectangle : mapRectangleList) {
@@ -292 +292 @@
         }
 
-        if (polygons) {
+        if (polygons && mapPolygonList != null) {
             synchronized (mapPolygonList) {
                 for (MapPolygon polygon : mapPolygonList) {

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java

@@ -41 +41 @@
         super();
         splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
-        
+
         tree = new CheckBoxTree(name);
         treePanel = new JPanel();
@@ -51 +51 @@
         splitPane.setOneTouchExpandable(true);
         splitPane.setDividerLocation(150);
-        
+
         //Provide minimum sizes for the two components in the split pane
         Dimension minimumSize = new Dimension(100, 50);
@@ -60 +60 @@
         setTreeVisible(treeVisible);
         tree.addNodeListener(new MouseAdapter() {
+            @Override
             public void mousePressed(MouseEvent e) {
                 maybeShowPopup(e);
             }
+            @Override
             public void mouseReleased(MouseEvent e) {
                 maybeShowPopup(e);
@@ -68 +70 @@
             private void maybeShowPopup(MouseEvent e) {
                 if (e.isPopupTrigger()) {
-                    e.getSource();
                     AbstractLayer layer = ((CheckBoxNodePanel)e.getComponent()).getData().getAbstractLayer();
                     if(layer!=null)
@@ -79 +80 @@
         JMenuItem menuItemShow = new JMenuItem("show texts");
         JMenuItem menuItemHide = new JMenuItem("hide texts");
- 
+
         //Create the popup menu.
         JPopupMenu popup = new JPopupMenu();
-        
+
         // Create items
         if(layer.isVisibleTexts()==null){
@@ -89 +90 @@
         }else if(layer.isVisibleTexts()) popup.add(menuItemHide);
         else popup.add(menuItemShow);
-        
+
         menuItemShow.addActionListener(new ActionListener(){
             @Override
@@ -106 +107 @@
             }
         });
- 
+
         return popup;
     }
@@ -143 +144 @@
     }
     public void addMapObject(MapObject o){
-        
+
     }
     public void setTreeVisible(boolean visible){

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java

@@ -98 +98 @@
             if(job.getTile() != null) {
                 for(TileJob oldJob : jobQueue) {
-                    if(oldJob.getTile() == job.getTile()) {
+                    if (job.getTile().equals(oldJob.getTile())) {
                         return;
                     }
@@ -104 +104 @@
             }
             jobQueue.put(job);
-            if (workerThreadIdleCount == 0 && workerThreadCount < workerThreadMaxCount)
-                addWorkerThread();
+            synchronized (this) {
+                if (workerThreadIdleCount == 0 && workerThreadCount < workerThreadMaxCount)
+                    addWorkerThread();
+            }
         } catch (InterruptedException e) {
         }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/LayerGroup.java

@@ -6 +6 @@
 public class LayerGroup extends AbstractLayer{
     private List<AbstractLayer> layers;
-    
+
     public LayerGroup(String name){
         super(name);
@@ -41 +41 @@
         return this;
     }
-    public void calculateVisibleTexts(){
+    public void calculateVisibleTexts() {
         Boolean calculate=null;
-        if(layers!=null&&layers.size()>0){
+        if (layers!=null&&layers.size()>0){
             calculate=layers.get(0).isVisibleTexts();
-            for(int i=1;i<layers.size(); i++){
+            for (int i=1;i<layers.size(); i++){
                 calculate = resultOf(calculate, layers.get(i).isVisibleTexts());
             }
@@ -52 +52 @@
         if(getParent()!=null) getParent().calculateVisibleTexts();
     }
-    public Boolean resultOf(Boolean b1, Boolean b2){
-        if(b1==null||b2==null) return null;
-        else if(b1.booleanValue() == b2.booleanValue()) return b1.booleanValue();
-        else return null;
+    public Boolean resultOf(Boolean b1, Boolean b2) {
+        if (b1 != null && b1.equals(b2)) {
+            return b1;
+        }
+        return Boolean.FALSE;
     }
 }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapObjectImpl.java

@@ -69 +69 @@
         if(style!=null) style.setStroke(stroke);
     }
-    
+
     public Font getFont() {
         Style styleAssigned = getStyleAssigned();
@@ -95 +95 @@
     public static Font getDefaultFont(){
         Font f = UIManager.getDefaults().getFont("TextField.font");
+        if (f == null) {
+            f = Font.decode(null);
+        }
         return new Font(f.getName(), Font.BOLD, f.getSize());
     }
+
     public void paintText(Graphics g, Point position) {
         if(name!=null && g!=null && position!=null){

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java

@@ -91 +91 @@
 
     @Override
-    public int getTileCount() {
+    public synchronized int getTileCount() {
         return hash.size();
     }
 
-    public int getCacheSize() {
+    public synchronized int getCacheSize() {
         return cacheSize;
     }
@@ -117 +117 @@
     protected static class CacheEntry {
         Tile tile;
-
         CacheEntry next;
         CacheEntry prev;
@@ -124 +123 @@
             this.tile = tile;
         }
-
-        public Tile getTile() {
-            return tile;
-        }
-
-        public CacheEntry getNext() {
-            return next;
-        }
-
-        public CacheEntry getPrev() {
-            return prev;
-        }
-
     }
 

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java

@@ -278 +278 @@
         if (zoom != other.zoom)
             return false;
+        if (!getTileSource().equals(other.getTileSource())) {
+            return false;
+        }
         return true;
     }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java

@@ -21 +21 @@
 /**
  * JTree for checkBox Tree Layers
- * 
+ *
  * @author galo
  */
@@ -27 +27 @@
     /** Serial Version UID */
     private static final long serialVersionUID = 6943401106938034256L;
-    
+
     private final CheckBoxNodeEditor editor;
 
@@ -48 +48 @@
         setCellEditor(editor);
         setEditable(true);
-        
+
         // listen for changes in the model (including check box toggles)
         getModel().addTreeModelListener(new TreeModelListener() {
@@ -121 +121 @@
     private static Boolean childStatus(DefaultMutableTreeNode node){
         Boolean status = data(node.getChildAt(0)).isSelected();
-        for(int i=1; i<node.getChildCount()&&status!=null; i++){
-            if(status != data(node.getChildAt(i)).isSelected()) return null;
+        for (int i=1; i<node.getChildCount() && status!=null; i++){
+            if (!status.equals(
+                    data(node.getChildAt(i)).isSelected()
+                    ))
+                return null;
         }
         return status;
@@ -132 +135 @@
                 CheckBoxNodeData dataParent = data(parent);
                 Boolean childStatus = childStatus(parent);
-                if(dataParent.isSelected()!=childStatus){
+                if(childStatus != null && !childStatus.equals(dataParent.isSelected())) {
                     dataParent.setSelected(childStatus);
                     changeParents(parent);
@@ -148 +151 @@
         for(int i=0; i<node.getChildCount(); i++){
             DefaultMutableTreeNode childNode = node(node.getChildAt(i));
-            if (data(childNode).isSelected() !=data(node).isSelected()){
+            if (!data(childNode).isSelected().equals(data(node).isSelected())){
                 data(childNode).setSelected(data(node).isSelected());
                 setChildrens(childNode, value);
@@ -216 +219 @@
     public DefaultMutableTreeNode add(DefaultMutableTreeNode parent, final AbstractLayer layer){
         layer.setVisible(data(parent).isSelected());
-        DefaultMutableTreeNode node = createNode(layer); 
+        DefaultMutableTreeNode node = createNode(layer);
         parent.add(node);
         ((DefaultTreeModel)getModel()).reload();

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -61 +61 @@
     }
 
-    protected class Attribution {
+    protected static class Attribution {
         String attribution;
         int minZoom;

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java

@@ -30 +30 @@
 
     /** cookies that needs to be sent to tile source */
-    protected String cookies;
+    protected String cookies = "";
 
     /** tile size of the displayed tiles */