Changeset 13332 in osm for applications/editors/josm/plugins/surveyor
- Timestamp:
- 2009-01-23T22:36:04+01:00 (16 years ago)
- Location:
- applications/editors/josm/plugins/surveyor
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/surveyor/build.xml
r12780 r13332 1 1 <project name="surveyor" default="dist" basedir="."> 2 <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) --> 3 <property environment="env"/> 4 <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm"> 5 <and> 6 <os family="windows"/> 7 </and> 8 </condition> 9 <!-- compilation properties --> 10 <property name="josm.build.dir" value="../../core"/> 11 <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/> 12 <property name="josm" location="../../core/dist/josm-custom.jar" /> 13 <property name="plugin.build.dir" value="build"/> 14 <property name="plugin.dist.dir" value="../../dist"/> 15 <property name="plugin.name" value="${ant.project.name}"/> 16 <property name="plugin.jar" value="../../dist/${plugin.name}.jar"/> 17 <property name="livegpsplugin.jar" value="../../dist/livegps.jar"/> 18 <property name="plugin.description" value="Allow adding markers/nodes on current gps positions."/> 19 <property name="plugin.stage" value="60"/> 20 <property name="plugin.class" value="at.dallermassl.josm.plugin.surveyor.SurveyorPlugin"/> 2 <property name="josm" location="../../core/dist/josm-custom.jar" /> 3 <property name="plugin.dist.dir" value="../../dist"/> 4 <property name="plugin.build.dir" value="build"/> 5 <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> 6 <property name="livegpsplugin.jar" value="${plugin.dist.dir}/livegps.jar"/> 21 7 <property name="ant.build.javac.target" value="1.5"/> 8 <target name="init"> 9 <mkdir dir="${plugin.build.dir}"/> 10 </target> 11 <target name="compile" depends="init"> 12 <echo message="creating ${plugin.jar}"/> 13 <javac srcdir="src" destdir="${plugin.build.dir}" debug="true"> 14 <compilerarg value="-Xlint:deprecation"/> 15 <compilerarg value="-Xlint:unchecked"/> 16 <classpath> 17 <pathelement location="${josm}"/> 18 <pathelement location="${livegpsplugin.jar}"/> 19 </classpath> 20 </javac> 21 </target> 22 22 <target name="dist" depends="compile"> 23 23 <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> … … 29 29 <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/> 30 30 <delete file="REVISION"/> 31 <!-- images -->32 31 <copy todir="${plugin.build.dir}/"> 33 32 <fileset dir="resources"> … … 36 35 </fileset> 37 36 </copy> 38 <!-- create jar file --> 37 <copy todir="${plugin.build.dir}/images" > 38 <fileset dir="images" /> 39 </copy> 39 40 <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}"> 40 41 <manifest> 41 <attribute name="Plugin-Class" value=" ${plugin.class}" />42 <attribute name="Plugin-Description" value=" ${plugin.description}" />43 <attribute name="Plugin-Stage" value=" ${plugin.stage}" />42 <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.surveyor.SurveyorPlugin" /> 43 <attribute name="Plugin-Description" value="Allow adding markers/nodes on current gps positions." /> 44 <attribute name="Plugin-Stage" value="60" /> 44 45 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 45 46 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/> 46 <attribute name="Plugin-Mainversion" value="1180" /> 47 <attribute name="Plugin-Mainversion" value="1326" /> 48 <attribute name="Plugin-Requires" value="livegps" /> 47 49 </manifest> 48 50 </jar> 49 </target>50 <target name="compile" depends="init">51 <echo message="creating ${plugin.jar}"/>52 <mkdir dir="${plugin.build.dir}"/>53 <copy todir="build/images" >54 <fileset dir="images" />55 </copy>56 <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">57 <compilerarg value="-Xlint:deprecation"/>58 <compilerarg value="-Xlint:unchecked"/>59 <classpath>60 <pathelement path="${josm.build.dir}/build"/>61 <fileset dir="${josm.build.dir}/lib">62 <include name="**/*.jar"/>63 </fileset>64 <pathelement location="${livegpsplugin.jar}"/>65 </classpath>66 </javac>67 </target>68 <target name="install" depends="dist">69 <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>70 </target>71 <target name="init">72 <echo>java version: ${java.version}</echo>73 51 </target> 74 52 <target name="clean"> -
applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java
r12778 r13332 22 22 import org.openstreetmap.josm.Main; 23 23 import org.openstreetmap.josm.gui.MainMenu; 24 import org.openstreetmap.josm.plugins.Plugin Proxy;24 import org.openstreetmap.josm.plugins.PluginHandler; 25 25 26 26 /** … … 44 44 super(); 45 45 46 // try to determine if the livegps plugin was already loaded: 47 // PluginInformation pluginInfo = PluginInformation.getLoaded("livegps"); 48 // if (pluginInfo == null) { 49 // JOptionPane.showMessageDialog(null, "Please install wmsplugin"); 50 // return; 51 // } 52 // if (!pluginInfo.version.equals("2")) { 53 // JOptionPane.showMessageDialog(null, "livegps Version 2 required."); 54 // return; 55 // } 56 try { 57 Class.forName("livegps.LiveGpsPlugin"); 58 } catch(ClassNotFoundException cnfe) { 59 String message = 60 tr("SurveyorPlugin depends on LiveGpsPlugin!") + "\n" + 61 tr("LiveGpsPlugin not found, please install and activate.") + "\n" + 62 tr("SurveyorPlugin is disabled for the moment"); 63 JOptionPane.showMessageDialog(Main.parent, message, tr("SurveyorPlugin"), JOptionPane.ERROR_MESSAGE); 64 return; 65 } 66 67 68 LiveGpsPlugin gpsPlugin = null; 69 Iterator<PluginProxy> proxyIter = Main.plugins.iterator(); 70 while(proxyIter.hasNext()) { 71 Object plugin = proxyIter.next().plugin; 72 if(plugin instanceof LiveGpsPlugin) { 73 gpsPlugin = (LiveGpsPlugin) plugin; 74 break; 75 } 76 } 46 LiveGpsPlugin gpsPlugin = (LiveGpsPlugin) PluginHandler.getPlugin("livegps"); 77 47 if(gpsPlugin == null) 78 48 throw new IllegalStateException(tr("SurveyorPlugin needs LiveGpsPlugin, but could not find it!"));
Note:
See TracChangeset
for help on using the changeset viewer.