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

Timestamp:

2010-10-02T16:30:22+02:00 (14 years ago)

Author:

guardian

Message:

reintegrated fix from 22850

Location:

applications/editors/josm/plugins/videomapping

Files:

• .classpath (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java (modified) (2 diffs)

applications/editors/josm/plugins/videomapping/.classpath

@@ -4 +4 @@
         <classpathentry kind="src" path="test"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-        <classpathentry kind="lib" path="D:/Projekte/Studium/GeoProjekt/working/VideoMapping/lib/jna.jar"/>
-        <classpathentry kind="lib" path="D:/Projekte/Studium/GeoProjekt/working/VideoMapping/lib/vlcj-1.1.2.jar">
-                <attributes>
-                        <attribute name="javadoc_location" value="jar:file:/D:/Projekte/Studium/GeoProjekt/working/vlcj/vlcj-1.1.2.jar!/"/>
-                </attributes>
-        </classpathentry>
-        <classpathentry kind="lib" path="D:/Projekte/Studium/GeoProjekt/working/VideoMapping/lib/log4j.jar"/>
+        <classpathentry kind="lib" path="/core/dist/josm-custom.jar"/>
+        <classpathentry kind="lib" path="lib/jna.jar"/>
+        <classpathentry kind="lib" path="lib/log4j.jar"/>
+        <classpathentry kind="lib" path="lib/vlcj-1.1.2.jar"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/core"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -51 +51 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-import com.sun.jna.StringArray;
-
 //Basic rendering and GPS layer interaction
 public class PositionLayer extends Layer implements MouseListener,MouseMotionListener {
@@ -96 +94 @@
 
     @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
+        }
+