Changeset 32513 in osm for applications


Ignore:
Timestamp:
2016-07-02T00:12:58+02:00 (9 years ago)
Author:
donvip
Message:

remove calls to deprecated methods, add license header

Location:
applications/editors/josm/plugins/videomapping
Files:
12 edited

Legend:

Unmodified
Added
Removed

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

    r31923 r32513  
    55    <property name="commit.message" value="fix after JOSM update"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="7001"/>
     7    <property name="plugin.main.version" value="10279"/>
    88    <property name="plugin.author" value="Matthias Meißer"/>
    99    <property name="plugin.class" value="org.openstreetmap.josm.plugins.videomapping.VideoPlugin"/>

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoObserver.java

    r23529 r32513  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.videomapping;
    23

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java

    r32346 r32513  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.videomapping;
    23
    … …  
    2728import org.openstreetmap.josm.Main;
    2829import org.openstreetmap.josm.actions.JosmAction;
    29 import org.openstreetmap.josm.gui.MapView;
    30 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
    3130import org.openstreetmap.josm.gui.layer.GpxLayer;
    3231import org.openstreetmap.josm.gui.layer.Layer;
     32import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
     33import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
     34import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
     35import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
     36import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
     37import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
    3338import org.openstreetmap.josm.plugins.Plugin;
    3439import org.openstreetmap.josm.plugins.PluginInformation;
    … …  
    3944import uk.co.caprica.vlcj.player.DeinterlaceMode;
    4045
    41   /**
     46/**
     47 * This Plugin allows you to link multiple videos against a GPS track and playback both synchronously
    4248 * @author Matthias Meißer (digi_c at arcor dot de)
    43  * @ released under GPL
    44  * This Plugin allows you to link multiple videos against a GPS track and playback both synchronously
    4549 */
    46 
    47 //Here we manage properties and start the other classes
    48 public class VideoPlugin extends Plugin implements LayerChangeListener{
     50public class VideoPlugin extends Plugin implements LayerChangeListener, ActiveLayerChangeListener {
    4951    private JMenu VMenu,VDeinterlacer;
    5052    private JosmAction VAdd,/*VRemove,*/VStart,Vbackward,Vforward,VJump,Vfaster,Vslower,Vloop;
    … …  
    6971        super(info);
    7072        VideoEngine.setupPlayer();
    71         MapView.addLayerChangeListener(this);                           
     73        Main.getLayerManager().addLayerChangeListener(this);                           
     74        Main.getLayerManager().addActiveLayerChangeListener(this);                           
    7275        createMenusAndShortCuts();
    7376        enableVideoControlMenus(false);
    … …  
    330333    }
    331334
     335    private void handleLayer(Layer l) {
     336        VMenu.setEnabled(true);
     337        if (l instanceof GpxLayer) {
     338            VAdd.setEnabled(true);
     339            gpsLayer = (GpxLayer) l;           
     340            //TODO append to GPS Layer menu
     341        }   
     342    }
     343   
    332344    @Override
    333     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
    334         VMenu.setEnabled(true);
    335         if (newLayer instanceof GpxLayer)
    336         {
    337             VAdd.setEnabled(true);
    338             gpsLayer=((GpxLayer) newLayer);           
    339             //TODO append to GPS Layer menu
    340         }       
     345    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
     346        handleLayer(Main.getLayerManager().getActiveLayer()); 
    341347    }
    342348
    343349    @Override
    344     public void layerAdded(Layer arg0) {
    345         activeLayerChange(null,arg0);
     350    public void layerOrderChanged(LayerOrderChangeEvent e) {
     351        // Do nothing
    346352    }
    347353
    348354    @Override
    349     public void layerRemoved(Layer arg0) {
    350         if(arg0 instanceof VideoPositionLayer)
    351                 enableVideoControlMenus(false);
    352         activeLayerChange(null,arg0);
     355    public void layerAdded(LayerAddEvent e) {
     356        handleLayer(e.getAddedLayer());
     357    }
     358
     359    @Override
     360    public void layerRemoving(LayerRemoveEvent e) {
     361        if (e.getRemovedLayer() instanceof VideoPositionLayer)
     362            enableVideoControlMenus(false);
     363        handleLayer(e.getRemovedLayer());
    353364    }
    354365  }

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java

    r30737 r32513  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.videomapping;
    23
    … …  
    89import java.awt.Rectangle;
    910import java.awt.event.MouseEvent;
    10 import java.awt.event.MouseListener;
    11 import java.awt.event.MouseMotionListener;
    1211import java.text.DateFormat;
    1312import java.text.SimpleDateFormat;
    … …  
    3736
    3837//Basic rendering and GPS layer interaction
    39 public class VideoPositionLayer extends Layer implements MouseListener,MouseMotionListener {
     38public class VideoPositionLayer extends Layer {
    4039    private List<WayPoint> gpsTrack;
    4140    private ImageIcon layerIcon;
    … …  
    5150        gpsTrack=importGPSLayer(gpsLayer.data);
    5251        gpsTimeFormat= new SimpleDateFormat("HH:mm:ss");
    53         Main.map.mapView.addMouseListener(this);
    54         Main.map.mapView.addMouseMotionListener(this);
    5552        iconPosition=gpsTrack.get(0);
    56         Main.main.addLayer(this);       
     53        Main.getLayerManager().addLayer(this);       
    5754    }
    5855
    … …  
    293290    public void visitBoundingBox(BoundingXYVisitor arg0) {
    294291    }
    295 
    296     public void mouseClicked(MouseEvent arg0) {
    297     }
    298 
    299     public void mouseEntered(MouseEvent arg0) {
    300     }
    301 
    302     public void mouseExited(MouseEvent arg0) {
    303     }
    304 
    305     public void mousePressed(MouseEvent e) {
    306     }
    307 
    308     public void mouseDragged(MouseEvent arg0) {
    309     }
    310 
    311     public void mouseMoved(MouseEvent arg0) {
    312     }
    313292   
    314293    public void setGPSVideoPlayer(GPSVideoPlayer player) {
    … …  
    321300
    322301    public void unload() {
    323         Main.main.removeLayer(this);
     302        Main.getLayerManager().removeLayer(this);
    324303    }
    325304}

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideo.java

    r30639 r32513  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.videomapping.video;
    23import java.io.File;

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java

    r30737 r32513  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.videomapping.video;
    23import static org.openstreetmap.josm.tools.I18n.tr;

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/Video.java

    r28924 r32513  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.videomapping.video;
    23

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java

    r31877 r32513  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.videomapping.video;
    23

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoObserversEvents.java

    r25896 r32513  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.videomapping.video;
    23

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java

    r30737 r32513  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.videomapping.video;
    23import static org.openstreetmap.josm.tools.I18n.tr;

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayerObserver.java

    r29769 r32513  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.videomapping.video;
    23

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideosObserver.java

    r29769 r32513  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.plugins.videomapping.video;
    23
Note: See TracChangeset for help on using the changeset viewer.