Changeset 29854 in osm for applications/editors/josm/plugins/graphview/src/org

Timestamp:

2013-08-21T03:47:16+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:

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

Files:

• core/graph/GraphEdge.java (modified) (1 diff)
• core/graph/TSBasedWayGraph.java (modified) (2 diffs)
• core/transition/GenericTransitionStructure.java (modified) (2 diffs)
• plugin/dialogs/AccessParameterDialog.java (modified) (2 diffs)
• plugin/dialogs/GraphViewDialog.java (modified) (2 diffs)

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/GraphEdge.java

@@ -2 +2 @@
 
 import java.util.Collection;
-import java.util.List;
 
 import org.openstreetmap.josm.plugins.graphview.core.property.GraphEdgePropertyType;
-import org.openstreetmap.josm.plugins.graphview.core.transition.Segment;
 
 /**

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/TSBasedWayGraph.java

@@ -89 +89 @@
         }
         public <V> V getPropertyValue(GraphEdgePropertyType<V> property) {
+            @SuppressWarnings("unchecked")
             V result = (V) properties.get(property);
             return result;
@@ -429 +430 @@
 
         if (!objectSetMap.containsKey(object)) {
-            @SuppressWarnings("unchecked") //no set with generic parameter can be created directly
-            Set<T> set = new HashSet();
+            Set<T> set = new HashSet<T>();
             set.add(object);
             objectSetMap.put(object, set);
         }
-
     }
 

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/transition/GenericTransitionStructure.java

@@ -66 +66 @@
         }
 
-        public <P> void setProperty(RoadPropertyType<P> property, P value) {
+        /*public <P> void setProperty(RoadPropertyType<P> property, P value) {
             properties.put(property, value);
-        }
+        }*/
         public Collection<RoadPropertyType<?>> getAvailableProperties() {
             return properties.keySet();
@@ -102 +102 @@
             return node2;
         }
-        public <P> void setProperty(RoadPropertyType<P> property, P value) {
+        /*public <P> void setProperty(RoadPropertyType<P> property, P value) {
             properties.put(property, value);
-        }
+        }*/
         public Collection<RoadPropertyType<?>> getAvailableProperties() {
             return properties.keySet();

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.graphview.plugin.dialogs;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import static org.openstreetmap.josm.plugins.graphview.core.property.VehiclePropertyTypes.MAX_INCLINE_DOWN;
@@ -7 +5 @@
 import static org.openstreetmap.josm.plugins.graphview.core.property.VehiclePropertyTypes.MAX_TRACKTYPE;
 import static org.openstreetmap.josm.plugins.graphview.core.property.VehiclePropertyTypes.SURFACE_BLACKLIST;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Frame;

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.GridBagConstraints;
@@ -28 +27 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.plugins.graphview.core.access.AccessRulesetReader;
 import org.openstreetmap.josm.plugins.graphview.core.visualisation.ColorScheme;