Changeset 18670 in osm for applications/editors/josm/plugins
- Timestamp:
- 2009-11-18T15:10:36+01:00 (15 years ago)
- Location:
- applications/editors/josm/plugins/wmsplugin
- Files:
-
- 3 edited
-
build.xml (modified) (4 diffs)
-
src/wmsplugin/WMSAdjustAction.java (modified) (3 diffs)
-
src/wmsplugin/WMSLayer.java (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/wmsplugin/build.xml
r18597 r18670 19 19 ** SVN, run 20 20 ** - set the property commit.message 21 ** - set the property josm.reference.releaseto lowest JOSM release number this21 ** - set the property plugin.main.version to lowest JOSM release number this 22 22 ** plugin build is compatible with 23 23 ** > ant deploy … … 26 26 --> 27 27 <project name="wmsplugin" default="dist" basedir="."> 28 <property name="josm" location="../../core/dist/josm-custom.jar"/> 28 29 30 <property name="commit.message" value="Updated build.xml" /> 31 <property name="plugin.main.version" value="2450" /> 32 33 34 <property name="josm" location="../../core/dist/josm-custom.jar"/> 29 35 <property name="plugin.dist.dir" value="../../dist"/> 30 36 <property name="plugin.build.dir" value="build"/> 31 37 <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> 32 38 <property name="ant.build.javac.target" value="1.5"/> 33 <property name="commit.message" value="fixing JOSM issue #3186" />34 <property name="josm.reference.release" value="2450" />35 39 36 40 <target name="init"> … … 56 60 <attribute name="Plugin-Description" value="Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."/> 57 61 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/WMSPlugin"/> 58 <attribute name="Plugin-Mainversion" value="${ josm.reference.release}"/>62 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/> 59 63 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 60 64 <attribute name="de_Plugin-Link" value="http://wiki.openstreetmap.org/wiki/DE:JOSM/Plugins/WMSPlugin"/> … … 86 90 </target> 87 91 88 <target name="core-info"> 89 <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false"> 90 <env key="LANG" value="C"/> 91 <arg value="info"/> 92 <arg value="--xml"/> 93 <arg value="../../core"/> 94 </exec> 95 <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/> 96 <echo>Building against core revision ${coreversion.info.entry.revision} ...</echo> 97 <delete file="core.info.xml" /> 98 </target> 92 <!-- 93 ************************** Publishing the plugin *********************************** 94 --> 95 <!-- 96 ** extracts the JOSM release for the JOSM version in ../core and saves it in the 97 ** property ${coreversion.info.entry.revision} 98 ** 99 --> 100 <target name="core-info"> 101 <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false"> 102 <env key="LANG" value="C"/> 103 <arg value="info"/> 104 <arg value="--xml"/> 105 <arg value="../../core"/> 106 </exec> 107 <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/> 108 <echo>Building against core revision ${coreversion.info.entry.revision}.</echo> 109 <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo> 110 <delete file="core.info.xml" /> 111 </target> 99 112 100 101 <target name="commit-current"> 102 <echo>Commiting the plugin source ...</echo> 103 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 104 <env key="LANG" value="C"/> 105 <arg value="commit"/> 106 <arg value="-m "${commit.message}""/> 107 <arg value="."/> 108 </exec> 109 </target> 110 111 112 <target name="update-current"> 113 <echo>Updating basedir ...</echo> 114 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 115 <env key="LANG" value="C"/> 116 <arg value="up"/> 117 <arg value="."/> 118 </exec> 119 <echo>Updating ${plugin.jar} ...</echo> 120 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 121 <env key="LANG" value="C"/> 122 <arg value="up"/> 123 <arg value="${plugin.jar}"/> 124 </exec> 125 </target> 126 127 <target name="commit-dist"> 128 <echo>Commiting ${plugin.jar} ...</echo> 113 <!-- 114 ** commits the source tree for this plugin 115 --> 116 <target name="commit-current"> 117 <echo>Commiting the plugin source with message '${commit.message}' ...</echo> 129 118 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 130 119 <env key="LANG" value="C"/> 131 120 <arg value="commit"/> 132 <arg value="-m "${commit.message}""/>133 <arg value=" ${plugin.jar}"/>134 </exec> 135 121 <arg value="-m '${commit.message}'"/> 122 <arg value="."/> 123 </exec> 124 </target> 136 125 137 <target name="deploy" depends="core-info,commit-current,update-current,clean,dist,commit-dist"> 138 </target> 126 <!-- 127 ** updates (svn up) the source tree for this plugin 128 --> 129 <target name="update-current"> 130 <echo>Updating plugin source ...</echo> 131 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 132 <env key="LANG" value="C"/> 133 <arg value="up"/> 134 <arg value="."/> 135 </exec> 136 <echo>Updating ${plugin.jar} ...</echo> 137 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 138 <env key="LANG" value="C"/> 139 <arg value="up"/> 140 <arg value="../dist/${plugin.jar}"/> 141 </exec> 142 </target> 143 144 <!-- 145 ** commits the plugin.jar 146 --> 147 <target name="commit-dist"> 148 <echo> 149 ***** Properties of published ${plugin.jar} ***** 150 Commit message : '${commit.message}' 151 Plugin-Mainversion: ${plugin.main.version} 152 JOSM build version: ${coreversion.info.entry.revision} 153 Plugin-Version : ${version.entry.commit.revision} 154 ***** / Properties of published ${plugin.jar} ***** 155 156 Now commiting ${plugin.jar} ... 157 </echo> 158 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 159 <env key="LANG" value="C"/> 160 <arg value="-m '${commit.message}'"/> 161 <arg value="commit"/> 162 <arg value="${plugin.jar}"/> 163 </exec> 164 </target> 165 166 <target name="publish" depends="core-info,commit-current,update-current,clean,dist,commit-dist"> 167 </target> 139 168 </project> -
applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java
r17552 r18670 10 10 import java.awt.event.MouseMotionListener; 11 11 import java.util.List; 12 import java.util.logging.Logger; 12 13 13 14 import javax.swing.DefaultComboBoxModel; … … 30 31 31 32 32 public class WMSAdjustAction extends MapMode implements 33 MouseListener, MouseMotionListener{ 34 33 public class WMSAdjustAction extends MapMode implements MouseListener, MouseMotionListener{ 34 static private final Logger logger = Logger.getLogger(WMSAdjustAction.class.getName()); 35 35 36 GeorefImage selectedImage; 36 37 boolean mouseDown; … … 212 213 } 213 214 214 215 216 215 @Override 217 216 protected void updateEnabledState() { -
applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java
r18597 r18670 91 91 92 92 executor = Executors.newFixedThreadPool(3); 93 if ( !baseURL.startsWith("html:") && !WMSGrabber.isUrlWithPatterns(baseURL)) {93 if (baseURL != null && !baseURL.startsWith("html:") && !WMSGrabber.isUrlWithPatterns(baseURL)) { 94 94 if (!(baseURL.endsWith("&") || baseURL.endsWith("?"))) { 95 95 if (!confirmMalformedUrl(baseURL)) {
Note:
See TracChangeset
for help on using the changeset viewer.
