Changeset 11881 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-04-10T03:57:16+02:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - BC_UNCONFIRMED_CAST_OF_RETURN

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/WMTSTileSource.java (modified) (1 diff)
• gui/SplashScreen.java (modified) (3 diffs)
• gui/dialogs/LayerListDialog.java (modified) (5 diffs)
• gui/dialogs/MapPaintDialog.java (modified) (7 diffs)
• gui/dialogs/layer/LayerListTransferHandler.java (modified) (1 diff)
• gui/dialogs/relation/MemberTransferHandler.java (modified) (1 diff)
• gui/dialogs/relation/RelationDialogManager.java (modified) (2 diffs)
• gui/widgets/ScrollableTable.java (added)

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -291 +291 @@
             }
         } else {
-            this.defaultLayer = (WMTSDefaultLayer) info.getDefaultLayers().iterator().next();
+            DefaultLayer defLayer = info.getDefaultLayers().iterator().next();
+            if (defLayer instanceof WMTSDefaultLayer) {
+                this.defaultLayer = (WMTSDefaultLayer) defLayer;
+            } else {
+                this.defaultLayer = null;
+            }
         }
         if (this.layers.isEmpty())

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

@@ -6 +6 @@
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
@@ -17 +18 @@
 
 import javax.swing.BorderFactory;
+import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -57 +59 @@
 
         // Add a nice border to the main splash screen
-        JPanel contentPane = (JPanel) this.getContentPane();
+        Container contentPane = this.getContentPane();
         Border margin = new EtchedBorder(1, Color.white, Color.gray);
-        contentPane.setBorder(margin);
+        if (contentPane instanceof JComponent) {
+            ((JComponent) contentPane).setBorder(margin);
+        }
 
         // Add a margin from the border to the content

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

@@ -9 +9 @@
 import java.awt.Font;
 import java.awt.GraphicsEnvironment;
-import java.awt.Point;
-import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
@@ -33 +31 @@
 import javax.swing.JLabel;
 import javax.swing.JTable;
-import javax.swing.JViewport;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
@@ -73 +70 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.gui.widgets.ScrollableTable;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
@@ -1096 +1094 @@
      * This component displays a list of layers and provides the methods needed by {@link LayerListModel}.
      */
-    static class LayerList extends JTable {
+    static class LayerList extends ScrollableTable {
 
         LayerList(LayerListModel dataModel) {
@@ -1108 +1106 @@
         }
 
-        public void scrollToVisible(int row, int col) {
-            if (!(getParent() instanceof JViewport))
-                return;
-            JViewport viewport = (JViewport) getParent();
-            Rectangle rect = getCellRect(row, col, true);
-            Point pt = viewport.getViewPosition();
-            rect.setLocation(rect.x - pt.x, rect.y - pt.y);
-            viewport.scrollRectToVisible(rect);
-        }
-
         @Override
         public LayerListModel getModel() {

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

@@ -10 +10 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-import java.awt.Point;
-import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -41 +39 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
-import javax.swing.JViewport;
 import javax.swing.ListSelectionModel;
 import javax.swing.SingleSelectionModel;
@@ -54 +51 @@
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableModel;
 
 import org.openstreetmap.josm.Main;
@@ -77 +73 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.gui.widgets.ScrollableTable;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageOverlay;
@@ -91 +88 @@
 public class MapPaintDialog extends ToggleDialog {
 
-    protected StylesTable tblStyles;
+    protected ScrollableTable tblStyles;
     protected StylesModel model;
     protected final DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
@@ -138 +135 @@
         cbWireframe.setBorder(new EmptyBorder(new Insets(1, 1, 1, 1)));
 
-        tblStyles = new StylesTable(model);
+        tblStyles = new ScrollableTable(model);
         tblStyles.setSelectionModel(selectionModel);
         tblStyles.addMouseListener(new PopupMenuHandler());
@@ -176 +173 @@
                 new SideButton(PREFERENCE_ACTION, false)
         ));
-    }
-
-    protected static class StylesTable extends JTable {
-
-        public StylesTable(TableModel dm) {
-            super(dm);
-        }
-
-        public void scrollToVisible(int row, int col) {
-            if (!(getParent() instanceof JViewport))
-                return;
-            JViewport viewport = (JViewport) getParent();
-            Rectangle rect = getCellRect(row, col, true);
-            Point pt = viewport.getViewPosition();
-            rect.setLocation(rect.x - pt.x, rect.y - pt.y);
-            viewport.scrollRectToVisible(rect);
-        }
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerListTransferHandler.java

@@ -92 +92 @@
             int dropLocation;
             if (support.isDrop()) {
-                JTable.DropLocation dl = (JTable.DropLocation) support.getDropLocation();
-                dropLocation = dl.getRow();
+                DropLocation dl = support.getDropLocation();
+                if (dl instanceof JTable.DropLocation) {
+                    dropLocation = ((JTable.DropLocation) dl).getRow();
+                } else {
+                    dropLocation = 0;
+                }
             } else {
                 dropLocation = layers.getLayers().get(0).getDefaultLayerPosition().getPosition(layers.getManager());

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

@@ -61 +61 @@
         final int insertRow;
         if (support.isDrop()) {
-            insertRow = ((JTable.DropLocation) support.getDropLocation()).getRow();
+            DropLocation dl = support.getDropLocation();
+            if (dl instanceof JTable.DropLocation) {
+                insertRow = ((JTable.DropLocation) dl).getRow();
+            } else {
+                insertRow = 0;
+            }
         } else {
             int selection = destination.getSelectedRow();

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

@@ -3 +3 @@
 
 import java.awt.Point;
+import java.awt.Window;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -194 +195 @@
     @Override
     public void windowClosed(WindowEvent e) {
-        RelationEditor editor = (RelationEditor) e.getWindow();
-        for (Iterator<Entry<DialogContext, RelationEditor>> it = openDialogs.entrySet().iterator(); it.hasNext();) {
-            if (editor.equals(it.next().getValue())) {
-                it.remove();
-                break;
+        Window w = e.getWindow();
+        if (w instanceof RelationEditor) {
+            RelationEditor editor = (RelationEditor) w;
+            for (Iterator<Entry<DialogContext, RelationEditor>> it = openDialogs.entrySet().iterator(); it.hasNext();) {
+                if (editor.equals(it.next().getValue())) {
+                    it.remove();
+                    break;
+                }
             }
         }