Changeset 22850 in osm

Timestamp:

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

Author:

stoecker

Message:

cleanup build

Location:

applications/editors/josm/plugins

Files:

• OpeningHoursEditor (modified) (1 prop)
• alignways (modified) (1 prop)
• build.xml (modified) (10 diffs)
• photo_geotagging/build.xml (modified) (1 diff)
• roadsigns (modified) (1 prop)
• toms (modified) (1 prop)
• videomapping/build.xml (modified) (1 diff)
• videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java (modified) (3 diffs)
• videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java (modified) (1 diff)
• waypoint_search (modified) (1 prop)
• waypoint_search/bin (deleted)
• waypoint_search/resources (deleted)

applications/editors/josm/plugins/build.xml

@@ -9 +9 @@
         <mkdir dir="../dist"/>
         <ant antfile="build.xml" target="dist" dir="addrinterpolation"/>
+        <ant antfile="build.xml" target="dist" dir="alignways"/>
         <ant antfile="build.xml" target="dist" dir="buildings_tools"/>
         <ant antfile="build.xml" target="dist" dir="cadastre-fr"/>
@@ -16 +17 @@
         <ant antfile="build.xml" target="dist" dir="dataimport"/>
         <ant antfile="build.xml" target="dist" dir="DirectUpload"/>
+        <ant antfile="build.xml" target="dist" dir="download_along"/>
         <ant antfile="build.xml" target="dist" dir="editgpx"/>
+        <ant antfile="build.xml" target="dist" dir="ext_tools"/>
         <ant antfile="build.xml" target="dist" dir="globalsat"/>
         <ant antfile="build.xml" target="dist" dir="graphview"/>
@@ -38 +41 @@
         <ant antfile="build.xml" target="dist" dir="remotecontrol"/>
         <ant antfile="build.xml" target="dist" dir="reverter"/>
+        <ant antfile="build.xml" target="dist" dir="roadsigns"/>
         <ant antfile="build.xml" target="dist" dir="routes"/>
         <ant antfile="build.xml" target="dist" dir="routing"/>
+        <ant antfile="build.xml" target="dist" dir="simplifyarea"/>
         <ant antfile="build.xml" target="dist" dir="slippymap"/>
         <ant antfile="build.xml" target="dist" dir="surveyor"/>
@@ -45 +50 @@
         <ant antfile="build.xml" target="dist" dir="tagging-preset-tester"/>
         <ant antfile="build.xml" target="dist" dir="terracer"/>
+        <ant antfile="build.xml" target="dist" dir="toms"/>
         <ant antfile="build.xml" target="dist" dir="touchscreenhelper"/>
         <ant antfile="build.xml" target="dist" dir="tracer"/>
@@ -53 +59 @@
         <ant antfile="build.xml" target="dist" dir="walkingpapers"/>
         <ant antfile="build.xml" target="dist" dir="waydownloader"/>
+        <ant antfile="build.xml" target="dist" dir="waypoint_search"/>
         <ant antfile="build.xml" target="dist" dir="wayselector"/>
         <ant antfile="build.xml" target="dist" dir="wmsplugin"/>
@@ -63 +70 @@
     <target name="clean">
         <ant antfile="build.xml" target="clean" dir="addrinterpolation"/>
+        <ant antfile="build.xml" target="clean" dir="alignways"/>
         <ant antfile="build.xml" target="clean" dir="buildings_tools"/>
         <ant antfile="build.xml" target="clean" dir="cadastre-fr"/>
@@ -70 +78 @@
         <ant antfile="build.xml" target="clean" dir="dataimport"/>
         <ant antfile="build.xml" target="clean" dir="DirectUpload"/>
+        <ant antfile="build.xml" target="clean" dir="download_along"/>
         <ant antfile="build.xml" target="clean" dir="duplicateway"/>
         <ant antfile="build.xml" target="clean" dir="editgpx"/>
+        <ant antfile="build.xml" target="clean" dir="ext_tools"/>
         <ant antfile="build.xml" target="clean" dir="globalsat"/>
         <ant antfile="build.xml" target="clean" dir="graphview"/>
@@ -94 +104 @@
         <ant antfile="build.xml" target="clean" dir="remotecontrol"/>
         <ant antfile="build.xml" target="clean" dir="reverter"/>
+        <ant antfile="build.xml" target="clean" dir="roadsigns"/>
         <ant antfile="build.xml" target="clean" dir="routes"/>
         <ant antfile="build.xml" target="clean" dir="routing"/>
+        <ant antfile="build.xml" target="clean" dir="simplifyarea"/>
         <ant antfile="build.xml" target="clean" dir="slippymap"/>
         <ant antfile="build.xml" target="clean" dir="surveyor"/>
@@ -101 +113 @@
         <ant antfile="build.xml" target="clean" dir="tagging-preset-tester"/>
         <ant antfile="build.xml" target="clean" dir="terracer"/>
+        <ant antfile="build.xml" target="clean" dir="toms"/>
         <ant antfile="build.xml" target="clean" dir="touchscreenhelper"/>
         <ant antfile="build.xml" target="clean" dir="tracer"/>
@@ -109 +122 @@
         <ant antfile="build.xml" target="clean" dir="walkingpapers"/>
         <ant antfile="build.xml" target="clean" dir="waydownloader"/>
+        <ant antfile="build.xml" target="clean" dir="waypoint_search"/>
         <ant antfile="build.xml" target="clean" dir="wayselector"/>
         <ant antfile="build.xml" target="clean" dir="wmsplugin"/>

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

@@ -59 +59 @@
         <target name="compile" depends="init">
                 <echo message="compiling sources for  ${plugin.jar} ... "/>
-                <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+                <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" encoding="iso-8859-1">
                         <compilerarg value="-Xlint:deprecation"/>
                         <compilerarg value="-Xlint:unchecked"/>

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);