Changeset 23442 in osm for applications/editors


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/videomapping/.classpath

    r22691 r23442  
    44        <classpathentry kind="src" path="test"/>
    55        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
    6         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    7         <classpathentry kind="lib" path="D:/Projekte/Studium/GeoProjekt/working/VideoMapping/lib/jna.jar"/>
    8         <classpathentry kind="lib" path="D:/Projekte/Studium/GeoProjekt/working/VideoMapping/lib/vlcj-1.1.2.jar">
    9                 <attributes>
    10                         <attribute name="javadoc_location" value="jar:file:/D:/Projekte/Studium/GeoProjekt/working/vlcj/vlcj-1.1.2.jar!/"/>
    11                 </attributes>
    12         </classpathentry>
    13         <classpathentry kind="lib" path="D:/Projekte/Studium/GeoProjekt/working/VideoMapping/lib/log4j.jar"/>
     6        <classpathentry kind="lib" path="/core/dist/josm-custom.jar"/>
     7        <classpathentry kind="lib" path="lib/jna.jar"/>
     8        <classpathentry kind="lib" path="lib/log4j.jar"/>
     9        <classpathentry kind="lib" path="lib/vlcj-1.1.2.jar"/>
     10        <classpathentry combineaccessrules="false" kind="src" path="/core"/>
    1411        <classpathentry kind="output" path="bin"/>
    1512</classpath>
  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java

    r23193 r23442  
    5151import org.openstreetmap.josm.tools.Shortcut;
    5252
    53 import com.sun.jna.StringArray;
    54 
    5553//Basic rendering and GPS layer interaction
    5654public class PositionLayer extends Layer implements MouseListener,MouseMotionListener {
     
    9694
    9795    @Override
    98     public Component[] getMenuEntries() {
    99         return new Component[]{
    100                 new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
    101                 new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
    102                 new JSeparator(),
     96        public Action[] getMenuEntries() {
     97        return new Action[]{
     98                LayerListDialog.getInstance().createActivateLayerAction(this),
     99                LayerListDialog.getInstance().createShowHideLayerAction(),
     100                LayerListDialog.getInstance().createDeleteLayerAction(),
     101                SeparatorLayerAction.INSTANCE,
    103102                //TODO here my stuff
    104                 new JSeparator(),
    105                 new JMenuItem(new LayerListPopup.InfoAction(this))};//TODO here infos about the linked videos
    106     }
     103                SeparatorLayerAction.INSTANCE,
     104                new LayerListPopup.InfoAction(this)};//TODO here infos about the linked videos
     105        }
     106
    107107     
    108108
Note: See TracChangeset for help on using the changeset viewer.