Changeset 7021 in josm for trunk/src/org

Timestamp:

2014-04-29T01:18:18+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - enable -Xlint:cast and fix associated warnings

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• OsmPrimitivRenderer.java (modified) (1 diff)
• dialogs/RelationListDialog.java (modified) (1 diff)
• dialogs/SelectionListDialog.java (modified) (1 diff)
• download/BookmarkSelection.java (modified) (2 diffs)
• layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• preferences/ToolbarPreferences.java (modified) (3 diffs)
• preferences/display/LafPreference.java (modified) (1 diff)
• preferences/plugin/PluginPreference.java (modified) (1 diff)
• preferences/projection/ProjectionPreference.java (modified) (2 diffs)
• tagging/ac/AutoCompletingComboBox.java (modified) (2 diffs)
• widgets/ComboBoxHistory.java (modified) (2 diffs)

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

@@ -45 +45 @@
     public Component getListCellRendererComponent(JList<? extends OsmPrimitive> list, OsmPrimitive value, int index, boolean isSelected, boolean cellHasFocus) {
         Component def = defaultListCellRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-        return renderer(def, (OsmPrimitive) value);
+        return renderer(def, value);
     }
 

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

@@ -316 +316 @@
 
         protected void setCurrentRelationAsSelection() {
-            Main.main.getCurrentDataSet().setSelected((Relation)displaylist.getSelectedValue());
+            Main.main.getCurrentDataSet().setSelected(displaylist.getSelectedValue());
         }
 

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

@@ -203 +203 @@
                 OsmDataLayer layer = Main.main.getEditLayer();
                 if (layer == null) return;
-                layer.data.setSelected(Collections.singleton((OsmPrimitive)model.getElementAt(idx)));
+                layer.data.setSelected(Collections.singleton(model.getElementAt(idx)));
             } else if (highlightEnabled && Main.isDisplayingMapView()) {
-                if (helper.highlightOnly((OsmPrimitive)model.getElementAt(idx))) {
+                if (helper.highlightOnly(model.getElementAt(idx))) {
                     Main.map.mapView.repaint();
                 }

trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

@@ -114 +114 @@
             @Override
             public void valueChanged(ListSelectionEvent e) {
-                Bookmark b = (Bookmark)bookmarks.getSelectedValue();
+                Bookmark b = bookmarks.getSelectedValue();
                 if (b != null) {
                     gui.boundingBoxChanged(b.getArea(),BookmarkSelection.this);
@@ -282 +282 @@
             if (idx < 0 || idx >= bookmarks.getModel().getSize())
                 return;
-            Bookmark b = (Bookmark)bookmarks.getModel().getElementAt(idx);
+            Bookmark b = bookmarks.getModel().getElementAt(idx);
             parent.startDownload(b.getArea());
         }

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

@@ -1175 +1175 @@
         // Time between the track point and the previous one, 5 sec if first point, i.e. photos take
         // 5 sec before the first track point can be assumed to be take at the starting position
-        long interval = prevWpTime > 0 ? ((long)Math.abs(curWpTime - prevWpTime)) : 5*1000;
+        long interval = prevWpTime > 0 ? (Math.abs(curWpTime - prevWpTime)) : 5*1000;
         int ret = 0;
 

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -623 +623 @@
                 @Override
                 public Component getListCellRendererComponent(JList<? extends ActionDefinition> list,
-                        ActionDefinition value, int index, boolean isSelected, boolean cellHasFocus) {
+                        ActionDefinition action, int index, boolean isSelected, boolean cellHasFocus) {
                     String s;
                     Icon i;
-                    ActionDefinition action = (ActionDefinition)value;
                     if (!action.isSeparator()) {
                         s = action.getDisplayName();
@@ -646 +645 @@
                     if (sel) {
                         actionsTree.clearSelection();
-                        ActionDefinition action = (ActionDefinition) selected.get(selectedList.getSelectedIndex());
+                        ActionDefinition action = selected.get(selectedList.getSelectedIndex());
                         actionParametersModel.setCurrentAction(action);
                         actionParametersPanel.setVisible(actionParametersModel.getRowCount() > 0);
@@ -864 +863 @@
             ActionParser parser = new ActionParser(null);
             for (int i = 0; i < selected.size(); ++i) {
-                ActionDefinition action = (ActionDefinition)selected.get(i);
+                ActionDefinition action = selected.get(i);
                 if (action.isSeparator()) {
                     t.add("|");

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -78 +78 @@
         String laf = Main.pref.get("laf", Main.platform.getDefaultStyle());
         for (int i = 0; i < lafCombo.getItemCount(); ++i) {
-            if (((LookAndFeelInfo)lafCombo.getItemAt(i)).getClassName().equals(laf)) {
+            if (lafCombo.getItemAt(i).getClassName().equals(laf)) {
                 lafCombo.setSelectedIndex(i);
                 break;

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

@@ -567 +567 @@
             List<String> ret = new ArrayList<>(model.getSize());
             for (int i=0; i< model.getSize();i++){
-                ret.add((String)model.get(i));
+                ret.add(model.get(i));
             }
             return ret;

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -300 +300 @@
 
         for (int i = 0; i < coordinatesCombo.getItemCount(); ++i) {
-            if (((CoordinateFormat)coordinatesCombo.getItemAt(i)).name().equals(PROP_COORDINATES.get())) {
+            if (coordinatesCombo.getItemAt(i).name().equals(PROP_COORDINATES.get())) {
                 coordinatesCombo.setSelectedIndex(i);
                 break;
@@ -445 +445 @@
         ProjectionChoice pc = null;
         for (int i = 0; i < projectionCombo.getItemCount(); ++i) {
-            ProjectionChoice pc1 = (ProjectionChoice) projectionCombo.getItemAt(i);
+            ProjectionChoice pc1 = projectionCombo.getItemAt(i);
             pc1.setPreferences(getSubprojectionPreference(pc1));
             if (pc1.getId().equals(PROP_PROJECTION.get())) {

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -136 +136 @@
             AutoCompletionListItem bestItem = null;
             for (int i = 0, n = model.getSize(); i < n; i++) {
-                AutoCompletionListItem currentItem = (AutoCompletionListItem) model.getElementAt(i);
+                AutoCompletionListItem currentItem = model.getElementAt(i);
                 if (currentItem.getValue().equals(pattern))
                     return currentItem;
@@ -224 +224 @@
             // find the string in the model or create a new item
             for (int i=0; i< getModel().getSize(); i++) {
-                AutoCompletionListItem acItem = (AutoCompletionListItem) getModel().getElementAt(i);
+                AutoCompletionListItem acItem = getModel().getElementAt(i);
                 if (s.equals(acItem.getValue())) {
                     super.setSelectedItem(acItem);

trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java

@@ -29 +29 @@
     @Override
     public void addElement(AutoCompletionListItem o) {
-        String newEntry = ((AutoCompletionListItem)o).getValue();
+        String newEntry = o.getValue();
 
         // if history contains this object already, delete it,
         // so that it looks like a move to the top
         for (int i = 0; i < getSize(); i++) {
-            String oldEntry = ((AutoCompletionListItem) getElementAt(i)).getValue();
+            String oldEntry = getElementAt(i).getValue();
             if(oldEntry.equals(newEntry)) {
                 removeElementAt(i);
@@ -75 +75 @@
             public AutoCompletionListItem next() {
                 position++;
-                return (AutoCompletionListItem)getElementAt(position);
+                return getElementAt(position);
             }
         };