Changeset 22850 in osm for applications/editors/josm/plugins/videomapping

Timestamp:

2010-08-29T13:26:12+02:00 (14 years ago)

Author:

stoecker

Message:

cleanup build

Location:

applications/editors/josm/plugins/videomapping

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/videomapping/build.xml

@@ -40 +40 @@
       ** should not be necessary to change the following properties
      -->
-        <property name="josm"                   location="../JOSM/dist/josm-custom.jar"/> <!-- patched for my own workbench, will fix if I understand how you have to setup it right-->
+        <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
         <property name="plugin.build.dir"       value="build"/>
         <property name="plugin.src.dir"         value="src"/>
         <!-- this is the directory where the plugin jar is copied to -->
-        <property name="plugin.dist.dir"        value="../JOSM/dist"/>
-        <property name="ant.build.javac.target" value="1.5"/>
+        <property name="plugin.dist.dir"        value="../../dist"/>
+        <property name="ant.build.javac.target" value="1.6"/>
         <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
         <property name="vlcj"                  value="lib/vlcj-1.1.2.jar"/>

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java

@@ -76 +76 @@
                 gpsTimeCode= new SimpleDateFormat("hh:mm:ss");
                 Main.map.mapView.addMouseListener(this);
-                Main.map.mapView.addMouseMotionListener(this);                                                  
-                
+                Main.map.mapView.addMouseMotionListener(this);
         }
 
@@ -96 +95 @@
 
         @Override
-        public Component[] getMenuEntries() {
-        return new Component[]{
-                new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
-                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
-                new JSeparator(),
+        public Action[] getMenuEntries() {
+        return new Action[]{
+                LayerListDialog.getInstance().createActivateLayerAction(this),
+                LayerListDialog.getInstance().createShowHideLayerAction(),
+                LayerListDialog.getInstance().createDeleteLayerAction(),
+                SeparatorLayerAction.INSTANCE,
                 //TODO here my stuff
-                new JSeparator(),
-                new JMenuItem(new LayerListPopup.InfoAction(this))};//TODO here infos about the linked videos
-        }
-          
-
+                SeparatorLayerAction.INSTANCE,
+                new LayerListPopup.InfoAction(this)};//TODO here infos about the linked videos
+        }
 
         @Override
@@ -123 +121 @@
                 
         }
-
-        
         
         @Override

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java

@@ -69 +69 @@
           //TODO What more to store during sessions? Size/Position
           
-
         public VideoMappingPlugin(PluginInformation info) {
                 super(info);