Changeset 2986 in josm

Timestamp:

Feb 14, 2010 7:05:36 PM (3 years ago)

Author:

jttt

Message:

Fix some of FindBugs warnings

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/ChangesetCache.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/DataSource.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) (13 diffs)
• src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/CacheCustomContent.java (modified) (4 diffs)
• src/org/openstreetmap/josm/io/CacheFiles.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java (modified) (2 diffs)
• test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -47 +47 @@
         if (Main.main == null || Main.main.getEditLayer() == null) return;
         if (Main.map == null || Main.map.mapView == null) return;
-        Collection<OsmPrimitive> sel = new HashSet<OsmPrimitive>();
-        sel = Main.main.getEditLayer().data.getSelected();
+        Collection<OsmPrimitive> sel = Main.main.getEditLayer().data.getSelected();
         if (sel.isEmpty()) {
             JOptionPane.showMessageDialog(

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -348 +348 @@
         if(currentMode.equals(c) || (!drawTargetCursor && currentMode.equals(DeleteMode.none)))
             return;
-        try {
-            // We invoke this to prevent strange things from happening
-            EventQueue.invokeLater(new Runnable() {
-                public void run() {
-                    // Don't change cursor when mode has changed already
-                    if(!(Main.map.mapMode instanceof DeleteAction))
-                        return;
-
-                    Main.map.mapView.setCursor(c.cursor());
-                    //System.out.println("Set cursor to: " + c.name());
-                }
-            });
-            currentMode = c;
-        } catch(Exception e) {}
+        // We invoke this to prevent strange things from happening
+        EventQueue.invokeLater(new Runnable() {
+            public void run() {
+                // Don't change cursor when mode has changed already
+                if(!(Main.map.mapMode instanceof DeleteAction))
+                    return;
+
+                Main.map.mapView.setCursor(c.cursor());
+                //System.out.println("Set cursor to: " + c.name());
+            }
+        });
+        currentMode = c;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

@@ -60 +60 @@
 
     public void addChangesetCacheListener(ChangesetCacheListener listener) {
-        synchronized(listeners) {
-            if (listener != null && ! listeners.contains(listener)) {
-                listeners.add(listener);
-            }
-        }
+        listeners.addIfAbsent(listener);
     }
 
     public void removeChangesetCacheListener(ChangesetCacheListener listener) {
-        synchronized(listeners) {
-            if (listener != null && listeners.contains(listener)) {
-                listeners.remove(listener);
-            }
-        }
+        listeners.remove(listener);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/DataSource.java

@@ -4 +4 @@
 import org.openstreetmap.josm.data.Bounds;
 
-public class DataSource implements Cloneable {
+public class DataSource {
     public final Bounds bounds;
     public final String origin;
@@ -11 +11 @@
         this.bounds = bounds;
         this.origin = origin;
-        if (bounds == null) {
+        if (bounds == null)
             throw new NullPointerException();
-        }
-    }
-
-    @Override protected Object clone() throws CloneNotSupportedException {
-        return new DataSource(bounds, origin);
     }
 }

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

@@ -552 +552 @@
             DataSet.selListeners.remove(selectionTableModel);
             getLayer().data.removeDataSetListener(memberTableModel);
-            getLayer().listenerDataChanged.remove(memberTableModel);
             memberTable.unlinkAsListener();
             dispose();

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

@@ -44 +44 @@
      */
     static private class DialogContext {
-        public Relation relation;
-        public OsmDataLayer layer;
+        public final Relation relation;
+        public final OsmDataLayer layer;
 
         public DialogContext(OsmDataLayer layer, Relation relation) {
@@ -94 +94 @@
 
     /** the map of open dialogs */
-    private HashMap<DialogContext, RelationEditor> openDialogs;
+    private final HashMap<DialogContext, RelationEditor> openDialogs;
 
     /**

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

@@ -842 +842 @@
             OsmDataLayer l = (OsmDataLayer)oldLayer;
             l.data.removeDataSetListener(this);
-            l.listenerDataChanged.remove(this);
         }
         if (newLayer == null || ! (newLayer instanceof OsmDataLayer)) {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -125 +125 @@
             selectedRect = null;
 
-            if (image == null) {
-                return;
-            }
+            if (image == null)
+                return;
 
             // Calculate the mouse cursor position in image coordinates, so that we can center the zoom
@@ -196 +195 @@
             }
 
-            if (image == null) {
-                return;
-            }
-
-            if (e.getButton() != DRAG_BUTTON) {
-                return;
-            }
+            if (image == null)
+                return;
+
+            if (e.getButton() != DRAG_BUTTON)
+                return;
 
             // Calculate the translation to set the clicked point the center of the view.
@@ -230 +227 @@
             }
 
-            File file;
             Image image;
             Rectangle visibleRect;
 
             synchronized (ImageDisplay.this) {
-                file = ImageDisplay.this.file;
                 image = ImageDisplay.this.image;
                 visibleRect = ImageDisplay.this.visibleRect;
             }
 
-            if (image == null) {
-                return;
-            }
+            if (image == null)
+                return;
 
             if (e.getButton() == DRAG_BUTTON) {
@@ -261 +255 @@
 
         public void mouseDragged(MouseEvent e) {
-            if (! mouseIsDragging && selectedRect == null) {
-                return;
-            }
+            if (! mouseIsDragging && selectedRect == null)
+                return;
 
             File file;
@@ -310 +303 @@
 
         public void mouseReleased(MouseEvent e) {
-            if (! mouseIsDragging && selectedRect == null) {
-                return;
-            }
+            if (! mouseIsDragging && selectedRect == null)
+                return;
 
             File file;
             Image image;
-            Rectangle visibleRect;
 
             synchronized (ImageDisplay.this) {
                 file = ImageDisplay.this.file;
                 image = ImageDisplay.this.image;
-                visibleRect = ImageDisplay.this.visibleRect;
             }
 
@@ -424 +414 @@
     }
 
+    @Override
     public void paintComponent(Graphics g) {
         Image image;
@@ -443 +434 @@
             Dimension size = getSize();
             g.drawString(noImageStr,
-                         (int) ((size.width - noImageSize.getWidth()) / 2),
-                         (int) ((size.height - noImageSize.getHeight()) / 2));
+                    (int) ((size.width - noImageSize.getWidth()) / 2),
+                    (int) ((size.height - noImageSize.getHeight()) / 2));
         } else if (image == null) {
             g.setColor(Color.black);
             String loadingStr;
             if (! errorLoading) {;
-                loadingStr = tr("Loading {0}", file.getName());
+            loadingStr = tr("Loading {0}", file.getName());
             } else {
                 loadingStr = tr("Error on file {0}", file.getName());
@@ -456 +447 @@
             Dimension size = getSize();
             g.drawString(loadingStr,
-                         (int) ((size.width - noImageSize.getWidth()) / 2),
-                         (int) ((size.height - noImageSize.getHeight()) / 2));
+                    (int) ((size.width - noImageSize.getWidth()) / 2),
+                    (int) ((size.height - noImageSize.getHeight()) / 2));
         } else {
             Rectangle target = calculateDrawImageRectangle(visibleRect);
             g.drawImage(image,
-                        target.x, target.y, target.x + target.width, target.y + target.height,
-                        visibleRect.x, visibleRect.y, visibleRect.x + visibleRect.width, visibleRect.y + visibleRect.height,
-                        null);
+                    target.x, target.y, target.x + target.width, target.y + target.height,
+                    visibleRect.x, visibleRect.y, visibleRect.x + visibleRect.width, visibleRect.y + visibleRect.height,
+                    null);
             if (selectedRect != null) {
                 Point topLeft = img2compCoord(visibleRect, selectedRect.x, selectedRect.y);
                 Point bottomRight = img2compCoord(visibleRect,
-                                                  selectedRect.x + selectedRect.width,
-                                                  selectedRect.y + selectedRect.height);
+                        selectedRect.x + selectedRect.width,
+                        selectedRect.y + selectedRect.height);
                 g.setColor(new Color(128, 128, 128, 180));
                 g.fillRect(target.x, target.y, target.width, topLeft.y - target.y);
@@ -482 +473 @@
                 Dimension size = getSize();
                 g.drawString(loadingStr,
-                             (int) ((size.width - noImageSize.getWidth()) / 2),
-                             (int) ((size.height - noImageSize.getHeight()) / 2));
+                        (int) ((size.width - noImageSize.getWidth()) / 2),
+                        (int) ((size.height - noImageSize.getHeight()) / 2));
             }
             if (osdText != null) {
@@ -519 +510 @@
         Rectangle drawRect = calculateDrawImageRectangle(visibleRect);
         return new Point(drawRect.x + ((xImg - visibleRect.x) * drawRect.width) / visibleRect.width,
-                         drawRect.y + ((yImg - visibleRect.y) * drawRect.height) / visibleRect.height);
+                drawRect.y + ((yImg - visibleRect.y) * drawRect.height) / visibleRect.height);
     }
 
@@ -525 +516 @@
         Rectangle drawRect = calculateDrawImageRectangle(visibleRect);
         return new Point(visibleRect.x + ((xComp - drawRect.x) * visibleRect.width) / drawRect.width,
-                         visibleRect.y + ((yComp - drawRect.y) * visibleRect.height) / drawRect.height);
-    }
-
-   private final Point getCenterImgCoord(Rectangle visibleRect) {
+                visibleRect.y + ((yComp - drawRect.y) * visibleRect.height) / drawRect.height);
+    }
+
+    private final Point getCenterImgCoord(Rectangle visibleRect) {
         return new Point(visibleRect.x + visibleRect.width / 2,
-                                 visibleRect.y + visibleRect.height / 2);
+                visibleRect.y + visibleRect.height / 2);
     }
 
@@ -576 +567 @@
         }
 
-        if (image == null) {
+        if (image == null)
             return;
-        }
 
         if (visibleRect.width != image.getWidth(null) || visibleRect.height != image.getHeight(null)) {
@@ -588 +578 @@
             Point center = getCenterImgCoord(visibleRect);
             visibleRect = new Rectangle(center.x - getWidth() / 2, center.y - getHeight() / 2,
-                                        getWidth(), getHeight());
+                    getWidth(), getHeight());
             checkVisibleRectPos(image, visibleRect);
         }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -2 +2 @@
 
 package org.openstreetmap.josm.gui.layer.geoimage;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Graphics2D;
@@ -11 +9 @@
 import java.awt.Toolkit;
 import java.awt.image.BufferedImage;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.CacheFiles;
-import org.openstreetmap.josm.Main;
 
 public class ThumbsLoader implements Runnable {
-        public static final int maxSize = 120;
-        public static final int minSize = 22;
-        volatile boolean stop = false;
-        List<ImageEntry> data;
-        GeoImageLayer layer;
-        MediaTracker tracker;
-        CacheFiles cache;
-        boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false);
+    public static final int maxSize = 120;
+    public static final int minSize = 22;
+    volatile boolean stop = false;
+    List<ImageEntry> data;
+    GeoImageLayer layer;
+    MediaTracker tracker;
+    CacheFiles cache;
+    boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false);
 
-        public ThumbsLoader(GeoImageLayer layer) {
-            this.layer = layer;
-            this.data = new ArrayList<ImageEntry>(layer.data);
-            if (!cacheOff) {
-                cache = new CacheFiles("geoimage-thumbnails", false);
-                cache.setExpire(CacheFiles.EXPIRE_NEVER, false);
-                cache.setMaxSize(120, false);
+    public ThumbsLoader(GeoImageLayer layer) {
+        this.layer = layer;
+        this.data = new ArrayList<ImageEntry>(layer.data);
+        if (!cacheOff) {
+            cache = new CacheFiles("geoimage-thumbnails", false);
+            cache.setExpire(CacheFiles.EXPIRE_NEVER, false);
+            cache.setMaxSize(120, false);
+        }
+    }
+
+    public void run() {
+        System.err.println("Load Thumbnails");
+        tracker = new MediaTracker(Main.map.mapView);
+        for (int i = 0; i < data.size(); i++) {
+            if (stop) return;
+
+            System.err.print("fetching image "+i);
+
+            data.get(i).thumbnail = loadThumb(data.get(i));
+
+            if (Main.map != null && Main.map.mapView != null) {
+                layer.updateOffscreenBuffer = true;
+                Main.map.mapView.repaint();
+            }
+        }
+        try {
+            layer.updateOffscreenBuffer = true;
+        } catch (Exception e) {}
+        Main.map.mapView.repaint();
+        (new Thread() {             // clean up the garbage - shouldn't hurt
+            @Override
+            public void run() {
+                try {
+                    Thread.sleep(200);
+                }
+                catch (InterruptedException ie) {}
+                System.gc();
+            }
+        }).start();
+
+    }
+
+    private BufferedImage loadThumb(ImageEntry entry) {
+        final String cacheIdent = entry.getFile().toString()+":"+maxSize;
+
+        if (!cacheOff) {
+            BufferedImage cached = cache.getImg(cacheIdent);
+            if(cached != null) {
+                System.err.println(" from cache");
+                return cached;
             }
         }
 
-        public void run() {
-            System.err.println("Load Thumbnails");
-            tracker = new MediaTracker(Main.map.mapView);
-            for (int i = 0; i < data.size(); i++) {
-                if (stop) return;
+        Image img = Toolkit.getDefaultToolkit().createImage(entry.getFile().getPath());
+        tracker.addImage(img, 0);
+        try {
+            tracker.waitForID(0);
+        } catch (InterruptedException e) {
+            System.err.println(" InterruptedException");
+            return null;
+        }
+        if (tracker.isErrorID(1) || img.getWidth(null) <= 0 || img.getHeight(null) <= 0) {
+            System.err.println(" Invalid image");
+            return null;
+        }
+        Rectangle targetSize = ImageDisplay.calculateDrawImageRectangle(
+                new Rectangle(0, 0, img.getWidth(null), img.getHeight(null)),
+                new Rectangle(0, 0, maxSize, maxSize));
+        BufferedImage scaledBI = new BufferedImage(targetSize.width, targetSize.height, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = scaledBI.createGraphics();
+        while (!g.drawImage(img, 0, 0, targetSize.width, targetSize.height, null))
+        {
+            try {
+                Thread.sleep(10);
+            } catch(InterruptedException ie) {}
+        }
+        g.dispose();
+        tracker.removeImage(img);
 
-                System.err.print("fetching image "+i);
-
-                data.get(i).thumbnail = loadThumb(data.get(i));
-
-                if (Main.map != null && Main.map.mapView != null) {
-                    try {
-                        layer.updateOffscreenBuffer = true;
-                    } catch (Exception e) {}
-                    Main.map.mapView.repaint();
-                }
-            }
-            try {
-                layer.updateOffscreenBuffer = true;
-            } catch (Exception e) {}
-            Main.map.mapView.repaint();
-            (new Thread() {             // clean up the garbage - shouldn't hurt
-                public void run() {
-                    try {
-                        Thread.sleep(200);
-                    }
-                    catch (InterruptedException ie) {}
-                    System.gc();
-                }
-            }).start();
-
+        if (scaledBI.getWidth() <= 0 || scaledBI.getHeight() <= 0) {
+            System.err.println(" Invalid image");
+            return null;
         }
 
-        private BufferedImage loadThumb(ImageEntry entry) {
-            final String cacheIdent = entry.getFile().toString()+":"+maxSize;
-
-            if (!cacheOff) {
-                BufferedImage cached = cache.getImg(cacheIdent);
-                if(cached != null) {
-                    System.err.println(" from cache");
-                    return cached;
-                }
-            }
-
-            Image img = Toolkit.getDefaultToolkit().createImage(entry.getFile().getPath());
-            tracker.addImage(img, 0);
-            try {
-                tracker.waitForID(0);
-            } catch (InterruptedException e) {
-                System.err.println(" InterruptedException");
-                return null;
-            }
-            if (tracker.isErrorID(1) || img.getWidth(null) <= 0 || img.getHeight(null) <= 0) {
-                System.err.println(" Invalid image");
-                return null;
-            }
-            Rectangle targetSize = ImageDisplay.calculateDrawImageRectangle(
-                new Rectangle(0, 0, img.getWidth(null), img.getHeight(null)),
-                new Rectangle(0, 0, maxSize, maxSize));
-            BufferedImage scaledBI = new BufferedImage(targetSize.width, targetSize.height, BufferedImage.TYPE_INT_RGB);
-            Graphics2D g = scaledBI.createGraphics();
-            while (!g.drawImage(img, 0, 0, targetSize.width, targetSize.height, null))
-            {
-                try {
-                    Thread.sleep(10);
-                } catch(InterruptedException ie) {}
-            }
-            g.dispose();
-            tracker.removeImage(img);
-
-            if (scaledBI == null || scaledBI.getWidth() <= 0 || scaledBI.getHeight() <= 0) {
-                System.err.println(" Invalid image");
-                return null;
-            }
-
-            if (!cacheOff) {
-                cache.saveImg(cacheIdent, scaledBI);
-            }
-
-            System.err.println("");
-            return scaledBI;
+        if (!cacheOff) {
+            cache.saveImg(cacheIdent, scaledBI);
         }
 
+        System.err.println("");
+        return scaledBI;
     }
+
+}

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

@@ -39 +39 @@
             displayedPlugins.clear();
             displayedPlugins.addAll(availablePlugins);
-            this.filterExpression = filter;
+            this.filterExpression = null;
             return;
         }

trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java

@@ -7 +7 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.Date;
 
@@ -124 +125 @@
      */
     public byte[] getData() {
-        if(data == null)
+        if(data == null) {
             loadFromDisk();
+        }
         return data;
     }
@@ -146 +148 @@
             input.read(this.data);
             input.close();
-        } catch(Exception e) {
+        } catch(IOException e) {
             this.data = updateForce();
         }
@@ -160 +162 @@
             output.flush();
             output.close();
-        } catch(Exception e) {}
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
     }
 

trunk/src/org/openstreetmap/josm/io/CacheFiles.java

@@ -43 +43 @@
 
     // If the cache is full, we don't want to delete just one file
-    private final int cleanUpThreshold = 20;
+    private static final int cleanUpThreshold = 20;
     // We don't want to clean after every file-write
-    private final int cleanUpInterval = 5;
+    private static final int cleanUpInterval = 5;
     // Stores how many files have been written
     private int writes = 0;

trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java

@@ -3 +3 @@
 
 import javax.swing.JFrame;
-
-import org.openstreetmap.josm.fixtures.JOSMFixture;
 
 public class ChangesetQueryDialogTest extends JFrame {
@@ -14 +12 @@
 
     public void start() {
-        JOSMFixture fixture = JOSMFixture.createFunctionalTestFixture();
         dialog = new ChangesetQueryDialog(this);
         dialog.initForUserInput();

trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java

@@ -12 +12 @@
 import javax.swing.JTextField;
 
-import org.openstreetmap.josm.fixtures.JOSMFixture;
 import org.openstreetmap.josm.gui.io.UploadStrategySelectionPanel;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
@@ -56 +55 @@
 
     public static void main(String args[]) throws OsmApiInitializationException, OsmTransferCancelledException{
-        JOSMFixture josmFixture = JOSMFixture.createFunctionalTestFixture();
         OsmApi.getOsmApi().initialize(NullProgressMonitor.INSTANCE);
         new UploadStrategySelectionPanelTest().setVisible(true);