Index: trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 7020) +++ trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 7021) @@ -45,5 +45,5 @@ public Component getListCellRendererComponent(JList 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); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 7020) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 7021) @@ -316,5 +316,5 @@ protected void setCurrentRelationAsSelection() { - Main.main.getCurrentDataSet().setSelected((Relation)displaylist.getSelectedValue()); + Main.main.getCurrentDataSet().setSelected(displaylist.getSelectedValue()); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 7020) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 7021) @@ -203,7 +203,7 @@ 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(); } Index: trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 7020) +++ trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 7021) @@ -114,5 +114,5 @@ @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,5 +282,5 @@ 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()); } Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 7020) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 7021) @@ -1175,5 +1175,5 @@ // 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; Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 7020) +++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 7021) @@ -623,8 +623,7 @@ @Override public Component getListCellRendererComponent(JList 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,5 +645,5 @@ 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,5 +863,5 @@ 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("|"); Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 7020) +++ trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 7021) @@ -78,5 +78,5 @@ 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; Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 7020) +++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 7021) @@ -567,5 +567,5 @@ List 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; Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 7020) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 7021) @@ -300,5 +300,5 @@ 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,5 +445,5 @@ 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())) { Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 7020) +++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 7021) @@ -136,5 +136,5 @@ 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,5 +224,5 @@ // 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); Index: trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java (revision 7020) +++ trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java (revision 7021) @@ -29,10 +29,10 @@ @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,5 +75,5 @@ public AutoCompletionListItem next() { position++; - return (AutoCompletionListItem)getElementAt(position); + return getElementAt(position); } };