Changeset 30454 in osm

Timestamp:

2014-05-19T01:14:55+02:00 (11 years ago)

Author:

donvip

Message:

[josm_turnrestrictions] see #josm8465 - update to Java 7, fix warnings

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions

Files:

• dnd/PrimitiveIdListTransferHandler.java (modified) (2 diffs)
• editor/AdvancedEditorPanel.java (modified) (1 diff)
• editor/JosmSelectionListModel.java (modified) (2 diffs)
• editor/JosmSelectionPanel.java (modified) (4 diffs)
• editor/TurnRestrictionComboBox.java (modified) (1 diff)
• editor/TurnRestrictionComboBoxModel.java (modified) (1 diff)
• editor/TurnRestrictionTypeRenderer.java (modified) (2 diffs)
• editor/ViaList.java (modified) (2 diffs)
• editor/ViaListModel.java (modified) (3 diffs)
• list/AbstractTurnRestrictionsListView.java (modified) (3 diffs)
• list/TurnRestrictionCellRenderer.java (modified) (2 diffs)
• list/TurnRestrictionsInDatasetView.java (modified) (1 diff)
• list/TurnRestrictionsInSelectionView.java (modified) (1 diff)
• list/TurnRestrictionsListDialog.java (modified) (1 diff)
• list/TurnRestrictionsListModel.java (modified) (2 diffs)
• qa/IssueView.java (modified) (1 diff)
• qa/RequiredTagMissingError.java (modified) (2 diffs)
• qa/TurnRestrictionLegSplitRequiredError.java (modified) (2 diffs)
• qa/WrongTurnRestrictionLegTypeError.java (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListTransferHandler.java

@@ -3 +3 @@
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
-import java.util.logging.Logger;
 
 import javax.swing.JComponent;
@@ -21 +20 @@
  */
 public class PrimitiveIdListTransferHandler extends TransferHandler {
-    static private final Logger logger = Logger.getLogger(PrimitiveIdListTransferHandler.class.getName());
+    //static private final Logger logger = Logger.getLogger(PrimitiveIdListTransferHandler.class.getName());
     private PrimitiveIdListProvider provider;
     

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java

@@ -26 +26 @@
     private TurnRestrictionEditorModel model;
     private TagEditorPanel pnlTagEditor;
-    private JPanel pnlRelationMemberEditor;
     private JTable tblRelationMemberEditor;
     private JSplitPane spEditors;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java

@@ -34 +34 @@
  * 
  */
-public class JosmSelectionListModel extends AbstractListModel implements EditLayerChangeListener, SelectionChangedListener, DataSetListener, PrimitiveIdListProvider{
+public class JosmSelectionListModel extends AbstractListModel<OsmPrimitive> implements EditLayerChangeListener, SelectionChangedListener, DataSetListener, PrimitiveIdListProvider{
     //static private final Logger logger = Logger.getLogger(JosmSelectionListModel.class.getName());
     
@@ -54 +54 @@
     }
 
-    public Object getElementAt(int index) {
+    public OsmPrimitive getElementAt(int index) {
         return selection.get(index);
     }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java

@@ -21 +21 @@
 import javax.swing.TransferHandler;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
@@ -41 +42 @@
 public class JosmSelectionPanel extends JPanel {
     /**  the list view */
-    private JList lstSelection;
+    private JList<OsmPrimitive> lstSelection;
     /** the model managing the selection */
     private JosmSelectionListModel model;
@@ -53 +54 @@
     protected void build(OsmDataLayer layer) {
         setLayout(new BorderLayout());
-        lstSelection = new JList(model);
+        lstSelection = new JList<>(model);
         lstSelection.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         lstSelection.setSelectionModel(model.getListSelectionModel());
@@ -136 +137 @@
         @Override
         public boolean canImport(JComponent comp, DataFlavor[] transferFlavors) {
-            // the JOSM selection list is read-only. Don't allow to drop or paste
-            // data on it
+            // the JOSM selection list is read-only. Don't allow to drop or paste data on it
             return false;
         }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBox.java

@@ -8 +8 @@
  * A combo box for selecting a turn restriction type.
  */
-public class TurnRestrictionComboBox extends JComboBox{
+public class TurnRestrictionComboBox extends JComboBox<Object> {
     
     /**

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxModel.java

@@ -19 +19 @@
  *
  */
-public class TurnRestrictionComboBoxModel implements ComboBoxModel, Observer{
+public class TurnRestrictionComboBoxModel implements ComboBoxModel<Object>, Observer{
     //static private final Logger logger = Logger.getLogger(TurnRestrictionComboBoxModel.class.getName());
     

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java

@@ -19 +19 @@
 
 
-public class TurnRestrictionTypeRenderer extends JLabel implements ListCellRenderer{
+public class TurnRestrictionTypeRenderer extends JLabel implements ListCellRenderer<Object> {
  
     final private Map<TurnRestrictionType, ImageIcon> icons = new HashMap<TurnRestrictionType, ImageIcon>();
@@ -69 +69 @@
     }
     
-    public Component getListCellRendererComponent(JList list, Object value,
+    public Component getListCellRendererComponent(JList<? extends Object> list, Object value,
             int index, boolean isSelected, boolean cellHasFocus) {
         

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java

@@ -29 +29 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
@@ -45 +46 @@
  * 
  */
-public class ViaList extends JList{
+public class ViaList extends JList<OsmPrimitive> {
     
     //static private final Logger logger = Logger.getLogger(ViaList.class.getName());

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java

@@ -22 +22 @@
  * 
  */
-public class ViaListModel extends AbstractListModel implements PrimitiveIdListProvider, Observer{
+public class ViaListModel extends AbstractListModel<OsmPrimitive> implements PrimitiveIdListProvider, Observer{
     //static private final Logger logger = Logger.getLogger(ViaListModel.class.getName());
     
@@ -102 +102 @@
     }
     
-    protected List<Integer>  moveDown(List<Integer> rows, int targetRow) {
+    protected List<Integer> moveDown(List<Integer> rows, int targetRow) {
         List<Integer> ret = new ArrayList<Integer>(rows.size());
         int delta = targetRow - rows.get(0);
@@ -218 +218 @@
     }
 
-    public Object getElementAt(int index) {
+    public OsmPrimitive getElementAt(int index) {
         return vias.get(index);
     }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/AbstractTurnRestrictionsListView.java

@@ -6 +6 @@
 
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.osm.Relation;
 
 /**
@@ -16 +17 @@
 abstract class AbstractTurnRestrictionsListView extends JPanel {
     protected TurnRestrictionsListModel model;
-    protected JList lstTurnRestrictions;
+    protected JList<Relation> lstTurnRestrictions;
     
     public TurnRestrictionsListModel getModel(){
@@ -22 +23 @@
     }
     
-    public JList getList() {
+    public JList<Relation> getList() {
         return lstTurnRestrictions;
     }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java

@@ -39 +39 @@
  * 
  */
-public class TurnRestrictionCellRenderer extends JPanel implements ListCellRenderer, TableCellRenderer{
+public class TurnRestrictionCellRenderer extends JPanel implements ListCellRenderer<Relation>, TableCellRenderer{
     //static private final Logger logger = Logger.getLogger(TurnRestrictionCellRenderer.class.getName());
     
@@ -232 +232 @@
     /* interface ListCellRenderer                                                         */
     /* ---------------------------------------------------------------------------------- */
-    public Component getListCellRendererComponent(JList list, Object value,
+    public Component getListCellRendererComponent(JList<? extends Relation> list, Relation value,
             int index, boolean isSelected, boolean cellHasFocus) {
 

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetView.java

@@ -18 +18 @@
  * This is the view for the list of turn restrictions in the current data set.
  */
-public class TurnRestrictionsInDatasetView extends AbstractTurnRestrictionsListView{    
+public class TurnRestrictionsInDatasetView extends AbstractTurnRestrictionsListView {    
     protected void build() {
         DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
         model = new TurnRestrictionsInDatasetListModel(selectionModel);
-        lstTurnRestrictions = new JList(model);
+        lstTurnRestrictions = new JList<>(model);
         lstTurnRestrictions.setSelectionModel(selectionModel);
         lstTurnRestrictions.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInSelectionView.java

@@ -27 +27 @@
         DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
         model = new TurnRestrictionsInSelectionListModel(selectionModel);
-        lstTurnRestrictions = new JList(model);
+        lstTurnRestrictions = new JList<>(model);
         lstTurnRestrictions.setSelectionModel(selectionModel);
         lstTurnRestrictions.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java

@@ -399 +399 @@
         @Override
         public void launch(MouseEvent evt) {
-            JList lst = currentListView.getList();
+            JList<Relation> lst = currentListView.getList();
             if (lst.getSelectedIndices().length == 0) {
                 int idx = lst.locationToIndex(evt.getPoint());

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListModel.java

@@ -21 +21 @@
  * 
  */
-public class TurnRestrictionsListModel extends AbstractListModel {
+public class TurnRestrictionsListModel extends AbstractListModel<Relation> {
     private final ArrayList<Relation> turnrestrictions = new ArrayList<Relation>();
     private DefaultListSelectionModel selectionModel;
@@ -157 +157 @@
     }
 
-    public Object getElementAt(int index) {
+    public Relation getElementAt(int index) {
         return turnrestrictions.get(index);
     }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssueView.java

@@ -30 +30 @@
     private Issue issue;
     private JLabel lblIcon;
-    private StyleSheet styleSheet;
     
      /**

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java

@@ -4 +4 @@
 
 import java.awt.event.ActionEvent;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -15 +14 @@
  */
 public class RequiredTagMissingError extends Issue {
-    static private final Logger logger = Logger.getLogger(RequiredTagMissingError.class.getName());
+    //static private final Logger logger = Logger.getLogger(RequiredTagMissingError.class.getName());
     private String tagKey;
     private String tagValue;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java

@@ -6 +6 @@
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -28 +27 @@
  */
 public class TurnRestrictionLegSplitRequiredError extends Issue{
-    static private final Logger logger = Logger.getLogger(TurnRestrictionLegSplitRequiredError.class.getName());
+    //static private final Logger logger = Logger.getLogger(TurnRestrictionLegSplitRequiredError.class.getName());
     
     private TurnRestrictionLegRole role;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java

@@ -54 +54 @@
                 );              
             break;          
+        default:
+            throw new AssertionError("Unexpected type for leg: "+leg.getType());
         }
         return msg + " " + tr("A way is required instead.");