Changeset 18678 in osm for applications/editors/josm/plugins
- Timestamp:
- 2009-11-18T20:46:28+01:00 (15 years ago)
- Location:
- applications/editors/josm/plugins/remotecontrol
- Files:
-
- 2 edited
-
build.xml (modified) (3 diffs)
-
src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/remotecontrol/build.xml
r18503 r18678 1 <?xml version="1.0" encoding="UTF-8"?> 2 <!-- 3 ** This is the build file for the remotecontrol plugin 4 ** 5 ** Maintaining versions 6 ** ==================== 7 ** see README.template 8 ** 9 ** Usage 10 ** ===== 11 ** To build it run 12 ** 13 ** > ant dist 14 ** 15 ** To install the generated plugin locally (in your default plugin directory) run 16 ** 17 ** > ant install 18 ** 19 ** To build against the core in ../../core, create a correct manifest and deploy to 20 ** SVN, 21 ** set the properties commit.message and plugin.main.version 22 ** and run 23 ** > ant publish 24 ** 25 ** 26 --> 1 27 <project name="remotecontrol" default="dist" basedir="."> 28 29 <!-- set before publising --> 30 <property name="commit.message" value="Fixed JOSM issue #3340" /> 31 <property name="plugin.main.version" value="2401" /> 32 2 33 <property name="josm" location="../../core/dist/josm-custom.jar"/> 3 34 <property name="plugin.dist.dir" value="../../dist"/> … … 26 57 <attribute name="Plugin-Description" value="Let other applications send commands to JOSM."/> 27 58 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/RemoteControl"/> 28 <attribute name="Plugin-Mainversion" value=" 2401"/>59 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/> 29 60 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 30 61 </manifest> … … 54 85 <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/> 55 86 </target> 87 88 <!-- 89 ************************** Publishing the plugin *********************************** 90 --> 91 <!-- 92 ** extracts the JOSM release for the JOSM version in ../core and saves it in the 93 ** property ${coreversion.info.entry.revision} 94 ** 95 --> 96 <target name="core-info"> 97 <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false"> 98 <env key="LANG" value="C"/> 99 <arg value="info"/> 100 <arg value="--xml"/> 101 <arg value="../../core"/> 102 </exec> 103 <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/> 104 <echo>Building against core revision ${coreversion.info.entry.revision}.</echo> 105 <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo> 106 <delete file="core.info.xml" /> 107 </target> 108 109 <!-- 110 ** commits the source tree for this plugin 111 --> 112 <target name="commit-current"> 113 <echo>Commiting the plugin source with message '${commit.message}' ...</echo> 114 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 115 <env key="LANG" value="C"/> 116 <arg value="commit"/> 117 <arg value="-m '${commit.message}'"/> 118 <arg value="."/> 119 </exec> 120 </target> 121 122 <!-- 123 ** updates (svn up) the source tree for this plugin 124 --> 125 <target name="update-current"> 126 <echo>Updating plugin source ...</echo> 127 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 128 <env key="LANG" value="C"/> 129 <arg value="up"/> 130 <arg value="."/> 131 </exec> 132 <echo>Updating ${plugin.jar} ...</echo> 133 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 134 <env key="LANG" value="C"/> 135 <arg value="up"/> 136 <arg value="../dist/${plugin.jar}"/> 137 </exec> 138 </target> 139 140 <!-- 141 ** commits the plugin.jar 142 --> 143 <target name="commit-dist"> 144 <echo> 145 ***** Properties of published ${plugin.jar} ***** 146 Commit message : '${commit.message}' 147 Plugin-Mainversion: ${plugin.main.version} 148 JOSM build version: ${coreversion.info.entry.revision} 149 Plugin-Version : ${version.entry.commit.revision} 150 ***** / Properties of published ${plugin.jar} ***** 151 152 Now commiting ${plugin.jar} ... 153 </echo> 154 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 155 <env key="LANG" value="C"/> 156 <arg value="-m '${commit.message}'"/> 157 <arg value="commit"/> 158 <arg value="${plugin.jar}"/> 159 </exec> 160 </target> 161 162 <target name="publish" depends="core-info,commit-current,update-current,clean,dist,commit-dist"> 163 </target> 56 164 </project> -
applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java
r18417 r18678 211 211 new LatLon(maxlat, maxlon)); 212 212 213 Main.worker.execute(new Runnable() { 214 public void run() { 215 BoundingXYVisitor bbox = new BoundingXYVisitor(); 216 bbox.visit(bounds); 217 Main.map.mapView.recalculateCenterScale(bbox); 218 } 219 }); 213 // make sure this isn't called unless there *is* a MapView 214 // 215 if (Main.map != null && Main.map.mapView != null) { 216 Main.worker.execute(new Runnable() { 217 public void run() { 218 BoundingXYVisitor bbox = new BoundingXYVisitor(); 219 bbox.visit(bounds); 220 Main.map.mapView.recalculateCenterScale(bbox); 221 } 222 }); 223 } 220 224 } 221 225 } else if (command.equals("/add_node")) {
Note:
See TracChangeset
for help on using the changeset viewer.
