Changeset 11713 in josm for trunk/src/org/openstreetmap/josm/gui/MapFrame.java

Timestamp:

2017-03-10T02:28:00+01:00 (7 years ago)

Author:

Don-vip

Message:

add Ant target to run PMD (only few rules for now), fix violations

Location:

trunk

Files:

• . (modified) (1 prop)
• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (3 diffs)

trunk

@@ -12 +12 @@
 junit*.properties
 foobar
+pmd-josm.xml

@@ -12 +12 @@
 junit*.properties
 foobar
+pmd-josm.xml

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

@@ -183 +183 @@
     /**
      * Constructs a new {@code MapFrame}.
-     * @param contentPane Ignored. Main content pane is used.
      * @param viewportData the initial viewport of the map. Can be null, then
      * the viewport is derived from the layer data.
-     */
-    public MapFrame(JPanel contentPane, ViewportData viewportData) {
+     * @since 11713
+     */
+    public MapFrame(ViewportData viewportData) {
         setSize(400, 400);
         setLayout(new BorderLayout());
 
-        mapView = new MapView(Main.getLayerManager(), contentPane, viewportData);
+        mapView = new MapView(Main.getLayerManager(), viewportData);
 
         splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true);
@@ -228 +228 @@
         mapModeSelect = new SelectAction(this);
         mapModeSelectLasso = new LassoModeAction();
-        mapModeDraw = new DrawAction(this);
+        mapModeDraw = new DrawAction();
         mapModeZoom = new ZoomAction(this);
 
@@ -235 +235 @@
         addMapMode(new IconToggleButton(mapModeDraw));
         addMapMode(new IconToggleButton(mapModeZoom, true));
-        addMapMode(new IconToggleButton(new DeleteAction(this), true));
+        addMapMode(new IconToggleButton(new DeleteAction(), true));
         addMapMode(new IconToggleButton(new ParallelWayAction(this), true));
-        addMapMode(new IconToggleButton(new ExtrudeAction(this), true));
-        addMapMode(new IconToggleButton(new ImproveWayAccuracyAction(Main.map), false));
+        addMapMode(new IconToggleButton(new ExtrudeAction(), true));
+        addMapMode(new IconToggleButton(new ImproveWayAccuracyAction(), false));
         toolBarActionsGroup.setSelected(allMapModeButtons.get(0).getModel(), true);
         toolBarActions.setFloatable(false);

@@ -12 +12 @@
 junit*.properties
 foobar
+pmd-josm.xml