Changeset 29216 in osm for applications/editors
- Timestamp:
- 2013-01-29T23:17:19+01:00 (12 years ago)
- Location:
- applications/editors/josm/plugins/reverter
- Files:
-
- 2 edited
-
build.xml (modified) (1 diff)
-
src/reverter/RevertChangesetHandler.java (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/reverter/build.xml
r28820 r29216 1 1 <?xml version="1.0" encoding="utf-8"?> 2 <!--3 ** This is a template build file for a JOSM plugin.4 **5 ** Maintaining versions6 ** ====================7 ** see README.template8 **9 ** Usage10 ** =====11 ** To build it run12 **13 ** > ant dist14 **15 ** To install the generated plugin locally (in you default plugin directory) run16 **17 ** > ant install18 **19 ** The generated plugin jar is not automatically available in JOSMs plugin configuration20 ** dialog. You have to check it in first.21 **22 ** Use the ant target 'publish' to check in the plugin and make it available to other23 ** JOSM users:24 ** set the properties commit.message and plugin.main.version25 ** and run26 ** > ant publish27 **28 **29 -->30 2 <project name="reverter" default="dist" basedir="."> 31 3 <!-- enter the SVN commit message --> 32 4 <property name="commit.message" value="Reverter: Update MultiOsmReader to support null data after redaction"/> 33 5 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value="4980"/> 35 <!-- 36 ************************************************ 37 ** should not be necessary to change the following properties 38 --> 39 <property name="josm" location="../../core/dist/josm-custom.jar"/> 40 <property name="plugin.build.dir" value="build"/> 41 <property name="plugin.src.dir" value="src"/> 42 <!-- this is the directory where the plugin jar is copied to --> 43 <property name="plugin.dist.dir" value="../../dist"/> 44 <property name="ant.build.javac.target" value="1.5"/> 45 <property name="plugin.dist.dir" value="../../dist"/> 46 <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> 47 <!-- 48 ********************************************************** 49 ** init - initializes the build 50 ********************************************************** 6 <property name="plugin.main.version" value="5680"/> 7 8 <!-- Configure these properties (replace "..." accordingly). 9 See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins 51 10 --> 52 <target name="init"> 53 <mkdir dir="${plugin.build.dir}"/> 54 </target> 55 <!-- 56 ********************************************************** 57 ** compile - complies the source tree 58 ********************************************************** 59 --> 60 <target name="compile" depends="init"> 61 <echo message="compiling sources for ${plugin.jar} ... "/> 62 <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}"> 63 <compilerarg value="-Xlint:deprecation"/> 64 <compilerarg value="-Xlint:unchecked"/> 65 </javac> 66 </target> 67 <!-- 68 ********************************************************** 69 ** dist - creates the plugin jar 70 ********************************************************** 71 --> 72 <target name="dist" depends="compile,revision"> 73 <echo message="creating ${ant.project.name}.jar ... "/> 74 <copy todir="${plugin.build.dir}/resources"> 75 <fileset dir="resources"/> 76 </copy> 77 <copy todir="${plugin.build.dir}/images"> 78 <fileset dir="images"/> 79 </copy> 80 <copy todir="${plugin.build.dir}/data"> 81 <fileset dir="data"/> 82 </copy> 83 <copy todir="${plugin.build.dir}"> 84 <fileset dir="."> 85 <include name="README"/> 86 <include name="LICENSE"/> 87 </fileset> 88 </copy> 89 <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}"> 90 <!-- 91 ************************************************ 92 ** configure these properties. Most of them will be copied to the plugins 93 ** manifest file. Property values will also show up in the list available 94 ** plugins: http://josm.openstreetmap.de/wiki/Plugins. 95 ** 96 ************************************************ 97 --> 98 <manifest> 99 <attribute name="Author" value="Upliner"/> 100 <attribute name="Plugin-Class" value="reverter.ReverterPlugin"/> 101 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/> 102 <attribute name="Plugin-Description" value="Plugin for reverting changesets"/> 103 <attribute name="Plugin-Icon" value="images/revert-changeset.png"/> 104 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/Reverter"/> 105 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/> 106 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 107 </manifest> 108 </jar> 109 </target> 110 <!-- 111 ********************************************************** 112 ** revision - extracts the current revision number for the 113 ** file build.number and stores it in the XML property 114 ** version.* 115 ********************************************************** 116 --> 117 <target name="revision"> 118 <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> 119 <env key="LANG" value="C"/> 120 <arg value="info"/> 121 <arg value="--xml"/> 122 <arg value="."/> 123 </exec> 124 <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/> 125 <delete file="REVISION"/> 126 </target> 127 <!-- 128 ********************************************************** 129 ** clean - clean up the build environment 130 ********************************************************** 131 --> 132 <target name="clean"> 133 <delete dir="${plugin.build.dir}"/> 134 <delete file="${plugin.jar}"/> 135 </target> 136 <!-- 137 ********************************************************** 138 ** install - install the plugin in your local JOSM installation 139 ********************************************************** 140 --> 141 <target name="install" depends="dist"> 142 <property environment="env"/> 143 <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins"> 144 <and> 145 <os family="windows"/> 146 </and> 147 </condition> 148 <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/> 149 </target> 150 <!-- 151 ************************** Publishing the plugin *********************************** 152 --> 153 <!-- 154 ** extracts the JOSM release for the JOSM version in ../core and saves it in the 155 ** property ${coreversion.info.entry.revision} 156 ** 157 --> 158 <target name="core-info"> 159 <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false"> 160 <env key="LANG" value="C"/> 161 <arg value="info"/> 162 <arg value="--xml"/> 163 <arg value="../../core"/> 164 </exec> 165 <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/> 166 <echo>Building against core revision ${coreversion.info.entry.revision}.</echo> 167 <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo> 168 <delete file="core.info.xml"/> 169 </target> 170 <!-- 171 ** commits the source tree for this plugin 172 --> 173 <target name="commit-current"> 174 <echo>Commiting the plugin source with message '${commit.message}' ...</echo> 175 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 176 <env key="LANG" value="C"/> 177 <arg value="commit"/> 178 <arg value="-m '${commit.message}'"/> 179 <arg value="."/> 180 </exec> 181 </target> 182 <!-- 183 ** updates (svn up) the source tree for this plugin 184 --> 185 <target name="update-current"> 186 <echo>Updating plugin source ...</echo> 187 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 188 <env key="LANG" value="C"/> 189 <arg value="up"/> 190 <arg value="."/> 191 </exec> 192 <echo>Updating ${plugin.jar} ...</echo> 193 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 194 <env key="LANG" value="C"/> 195 <arg value="up"/> 196 <arg value="../dist/${plugin.jar}"/> 197 </exec> 198 </target> 199 <!-- 200 ** commits the plugin.jar 201 --> 202 <target name="commit-dist"> 203 <echo> 204 ***** Properties of published ${plugin.jar} ***** 205 Commit message : '${commit.message}' 206 Plugin-Mainversion: ${plugin.main.version} 207 JOSM build version: ${coreversion.info.entry.revision} 208 Plugin-Version : ${version.entry.commit.revision} 209 ***** / Properties of published ${plugin.jar} ***** 11 <property name="plugin.author" value="Upliner"/> 12 <property name="plugin.class" value="reverter.ReverterPlugin"/> 13 <property name="plugin.description" value="Plugin for reverting changesets"/> 14 <property name="plugin.icon" value="images/revert-changeset.png"/> 15 <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/Reverter"/> 16 <!--<property name="plugin.early" value="..."/>--> 17 <!--<property name="plugin.requires" value="..."/>--> 18 <property name="plugin.stage" value="5"/> 210 19 211 Now commiting ${plugin.jar} ... 212 </echo> 213 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 214 <env key="LANG" value="C"/> 215 <arg value="-m '${commit.message}'"/> 216 <arg value="commit"/> 217 <arg value="${plugin.jar}"/> 218 </exec> 219 </target> 220 <!-- ** make sure svn is present as a command line tool ** --> 221 <target name="ensure-svn-present"> 222 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code"> 223 <env key="LANG" value="C"/> 224 <arg value="--version"/> 225 </exec> 226 <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system."> 227 <!-- return code not set at all? Most likely svn isn't installed --> 228 <condition> 229 <not> 230 <isset property="svn.exit.code"/> 231 </not> 232 </condition> 233 </fail> 234 <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system."> 235 <!-- error code from SVN? Most likely svn is not what we are looking on this system --> 236 <condition> 237 <isfailure code="${svn.exit.code}"/> 238 </condition> 239 </fail> 240 </target> 241 <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist"> 242 </target> 20 <!-- ** include targets that all plugins have in common ** --> 21 <import file="../build-common.xml"/> 243 22 </project> -
applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetHandler.java
r28089 r29216 11 11 public static final String permissionKey = "remotecontrol.permission.revert_changeset"; 12 12 public static final boolean permissionDefault = true; 13 14 private int changesetId; 13 15 14 16 @Override … … 17 19 try 18 20 { 19 int changesetId = Integer.parseInt(args.get("id"));20 21 Main.worker.submit(new RevertChangesetTask(changesetId, ChangesetReverter.RevertType.FULL, true)); 21 22 } catch (Exception ex) { … … 41 42 return tr("Remote Control has been asked to revert a changeset."); 42 43 } 44 45 @Override 46 protected void validateRequest() throws RequestHandlerBadRequestException { 47 try { 48 changesetId = Integer.parseInt(args.get("id")); 49 } catch (NumberFormatException e) { 50 throw new RequestHandlerBadRequestException("NumberFormatException: "+e.getMessage()); 51 } 52 } 43 53 }
Note:
See TracChangeset
for help on using the changeset viewer.
