Changeset 30550 in osm for applications/editors/josm/plugins/alignways
- Timestamp:
- 2014-08-04T02:45:06+02:00 (10 years ago)
- Location:
- applications/editors/josm/plugins/alignways
- Files:
-
- 1 added
- 2 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/alignways/.classpath
r30416 r30550 2 2 <classpath> 3 3 <classpathentry kind="src" path="src"/> 4 <classpathentry kind="src" path="test/unit"/> 4 5 <classpathentry combineaccessrules="false" exported="true" kind="src" path="/JOSM"/> 5 6 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> 6 <classpathentry kind="lib" path="lib"/>7 7 <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> 8 8 <classpathentry kind="output" path="build"/> -
applications/editors/josm/plugins/alignways/build.xml
r30530 r30550 5 5 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 6 6 <property name="plugin.main.version" value="7001"/> 7 <!-- 8 ************************************************ ** should not be9 necessary to change the following properties7 8 <!-- Configure these properties (replace "..." accordingly). 9 See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins 10 10 --> 11 <property name="josm" location="../../core/dist/josm-custom.jar"/> 12 <property name="plugin.build.dir" value="build"/> 13 <property name="plugin.src.dir" value="src"/> 14 <property name="plugin.lib.dir" value="lib"/> 15 <!-- this is the directory where the plugin jar is copied to --> 16 <property name="plugin.dist.dir" value="../../dist"/> 17 <property name="ant.build.javac.target" value="1.7"/> 18 <property name="plugin.dist.dir" value="../../dist"/> 19 <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> 20 <!-- 21 ********************************************************** ** init - 22 initializes the build 23 ********************************************************** 24 --> 25 <target name="init"> 26 <mkdir dir="${plugin.build.dir}"/> 27 </target> 28 <!-- 29 ********************************************************** ** compile 30 - complies the source tree 31 ********************************************************** 32 --> 33 <target name="compile" depends="init"> 34 <echo message="compiling sources for ${plugin.jar} ... "/> 35 <javac srcdir="src" classpath="${josm};${plugin.lib.dir}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false"> 36 <compilerarg value="-Xlint:deprecation"/> 37 <compilerarg value="-Xlint:unchecked"/> 38 </javac> 39 <copy todir="${plugin.build.dir}"> 40 <fileset dir="lib"/> 41 </copy> 42 </target> 43 <!-- 44 ********************************************************** ** dist - 45 creates the plugin jar 46 ********************************************************** 47 --> 48 <target name="dist" depends="compile,revision"> 49 <echo message="creating ${ant.project.name}.jar ... "/> 50 <copy todir="${plugin.build.dir}/resources"> 51 <fileset dir="resources"/> 52 </copy> 53 <copy todir="${plugin.build.dir}/images"> 54 <fileset dir="images"/> 55 </copy> 56 <copy todir="${plugin.build.dir}/data"> 57 <fileset dir="data"/> 58 </copy> 59 <copy todir="${plugin.build.dir}"> 60 <fileset dir="."> 61 <include name="README"/> 62 <include name="LICENSE"/> 63 </fileset> 64 </copy> 65 <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}"> 66 <!-- 67 ************************************************ ** configure these 68 properties. Most of them will be copied to the plugins ** manifest 69 file. Property values will also show up in the list available ** 70 plugins: http://josm.openstreetmap.de/wiki/Plugins. ** 71 ************************************************ 72 --> 73 <manifest> 74 <attribute name="Author" value="Attila Szász"/> 75 <attribute name="Plugin-Class" value="com.tilusnet.josm.plugins.alignways.AlignWaysPlugin"/> 76 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/> 77 <attribute name="Plugin-Description" value="Makes a pair of selected way segments parallel by rotating one of them around a chosen pivot."/> 78 <attribute name="Plugin-Icon" value="images/alignways.png"/> 79 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/> 80 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 81 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AlignWayS"/> 82 </manifest> 83 </jar> 84 </target> 85 <!-- 86 ********************************************************** ** revision 87 - extracts the current revision number for the ** file build.number 88 and stores it in the XML property ** version.* 89 ********************************************************** 90 --> 91 <target name="revision"> 92 <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> 93 <env key="LANG" value="C"/> 94 <arg value="info"/> 95 <arg value="--xml"/> 96 <arg value="."/> 97 </exec> 98 <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/> 99 <delete file="REVISION"/> 100 </target> 101 <!-- 102 ********************************************************** ** clean - 103 clean up the build environment 104 ********************************************************** 105 --> 106 <target name="clean"> 107 <delete dir="${plugin.build.dir}"/> 108 <delete file="${plugin.jar}"/> 109 </target> 110 <!-- 111 ********************************************************** ** install 112 - install the plugin in your local JOSM installation 113 ********************************************************** 114 --> 115 <target name="install" depends="dist"> 116 <property environment="env"/> 117 <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins"> 118 <and> 119 <os family="windows"/> 120 </and> 121 </condition> 122 <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/> 123 </target> 124 <!-- 125 ************************** Publishing the plugin 126 *********************************** 127 --> 128 <!-- 129 ** extracts the JOSM release for the JOSM version in ../core and saves 130 it in the ** property ${coreversion.info.entry.revision} ** 131 --> 132 <target name="core-info"> 133 <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false"> 134 <env key="LANG" value="C"/> 135 <arg value="info"/> 136 <arg value="--xml"/> 137 <arg value="../../core"/> 138 </exec> 139 <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/> 140 <echo>Building against core revision 141 ${coreversion.info.entry.revision}.</echo> 142 <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo> 143 <delete file="core.info.xml"/> 144 </target> 145 <!-- 146 ** commits the source tree for this plugin 147 --> 148 <target name="commit-current"> 149 <echo>Commiting the plugin source with message '${commit.message}' ...</echo> 150 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 151 <env key="LANG" value="C"/> 152 <arg value="commit"/> 153 <arg value="-m '${commit.message}'"/> 154 <arg value="."/> 155 </exec> 156 </target> 157 <!-- 158 ** updates (svn up) the source tree for this plugin 159 --> 160 <target name="update-current"> 161 <echo>Updating plugin source ...</echo> 162 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 163 <env key="LANG" value="C"/> 164 <arg value="up"/> 165 <arg value="."/> 166 </exec> 167 <echo>Updating ${plugin.jar} ...</echo> 168 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 169 <env key="LANG" value="C"/> 170 <arg value="up"/> 171 <arg value="../dist/${plugin.jar}"/> 172 </exec> 173 </target> 174 <!-- 175 ** commits the plugin.jar 176 --> 177 <target name="commit-dist"> 178 <echo> 179 ***** Properties of published ${plugin.jar} ***** 180 Commit message 181 : '${commit.message}' 182 Plugin-Mainversion: ${plugin.main.version} 183 JOSM 184 build version: ${coreversion.info.entry.revision} 185 Plugin-Version : 186 ${version.entry.commit.revision} 187 ***** / Properties of published 188 ${plugin.jar} ***** 11 <property name="plugin.author" value="Attila Szász"/> 12 <property name="plugin.class" value="com.tilusnet.josm.plugins.alignways.AlignWaysPlugin"/> 13 <property name="plugin.description" value="Makes a pair of selected way segments parallel by rotating one of them around a chosen pivot."/> 14 <property name="plugin.icon" value="images/alignways.png"/> 15 <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AlignWayS"/> 189 16 190 Now commiting ${plugin.jar} ... 191 </echo> 192 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 193 <env key="LANG" value="C"/> 194 <arg value="-m '${commit.message}'"/> 195 <arg value="commit"/> 196 <arg value="${plugin.jar}"/> 197 </exec> 198 </target> 199 <!-- ** make sure svn is present as a command line tool ** --> 200 <target name="ensure-svn-present"> 201 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code"> 202 <env key="LANG" value="C"/> 203 <arg value="--version"/> 204 </exec> 205 <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system."> 206 <!-- return code not set at all? Most likely svn isn't installed --> 207 <condition> 208 <not> 209 <isset property="svn.exit.code"/> 210 </not> 211 </condition> 212 </fail> 213 <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system."> 214 <!-- 215 error code from SVN? Most likely svn is not what we are looking on 216 this system 217 --> 218 <condition> 219 <isfailure code="${svn.exit.code}"/> 220 </condition> 221 </fail> 222 </target> 223 <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist"> 224 </target> 17 <!-- ** include targets that all plugins have in common ** --> 18 <import file="../build-common.xml"/> 225 19 </project> -
applications/editors/josm/plugins/alignways/nbproject/project.xml
r30416 r30550 70 70 <compilation-unit> 71 71 <package-root>src</package-root> 72 <classpath mode="compile">../../core/src ;lib</classpath>72 <classpath mode="compile">../../core/src</classpath> 73 73 <source-level>1.7</source-level> 74 74 </compilation-unit> -
applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysTipsPanel.java
r28624 r30550 9 9 import java.awt.Dimension; 10 10 11 import javax.swing.GroupLayout; 11 12 import javax.swing.ImageIcon; 12 13 import javax.swing.JCheckBox; … … 15 16 import javax.swing.JScrollPane; 16 17 import javax.swing.JSeparator; 18 import javax.swing.LayoutStyle; 17 19 import javax.swing.ScrollPaneConstants; 18 20 import javax.swing.SwingConstants; 19 20 import org.jdesktop.layout.GroupLayout;21 import org.jdesktop.layout.LayoutStyle;22 21 23 22 /** … … 64 63 Title.setLayout(TitleLayout); 65 64 TitleLayout.setHorizontalGroup( 66 TitleLayout.createParallelGroup(GroupLayout. LEADING)67 .add (GroupLayout.TRAILING, TitleLayout.createSequentialGroup()68 .add (WelcomeTo, GroupLayout.DEFAULT_SIZE, 396, Short.MAX_VALUE)69 .addPreferredGap(LayoutStyle. RELATED)70 .add (Icon, GroupLayout.PREFERRED_SIZE, 132, GroupLayout.PREFERRED_SIZE))65 TitleLayout.createParallelGroup(GroupLayout.Alignment.LEADING) 66 .addGroup(GroupLayout.Alignment.TRAILING, TitleLayout.createSequentialGroup() 67 .addComponent(WelcomeTo, GroupLayout.DEFAULT_SIZE, 396, Short.MAX_VALUE) 68 .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) 69 .addComponent(Icon, GroupLayout.PREFERRED_SIZE, 132, GroupLayout.PREFERRED_SIZE)) 71 70 ); 72 71 TitleLayout.setVerticalGroup( 73 TitleLayout.createParallelGroup(GroupLayout. LEADING)74 .add (TitleLayout.createSequentialGroup()75 .add (Icon)72 TitleLayout.createParallelGroup(GroupLayout.Alignment.LEADING) 73 .addGroup(TitleLayout.createSequentialGroup() 74 .addComponent(Icon) 76 75 .addContainerGap()) 77 .add (WelcomeTo, GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE)76 .addComponent(WelcomeTo, GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE) 78 77 ); 79 78 … … 110 109 steps.setLayout(stepsLayout); 111 110 stepsLayout.setHorizontalGroup( 112 stepsLayout.createParallelGroup(GroupLayout. LEADING)113 .add (stepsLayout.createSequentialGroup()114 .addContainerGap() 115 .add (stepsLayout.createParallelGroup(GroupLayout.TRAILING)116 .add (GroupLayout.LEADING, lastHint, 0, 0, Short.MAX_VALUE)117 .add (GroupLayout.LEADING, step04, 0, 0, Short.MAX_VALUE)118 .add (GroupLayout.LEADING, step03, 0, 0, Short.MAX_VALUE)119 .add (GroupLayout.LEADING, step02, 0, 0, Short.MAX_VALUE)120 .add (GroupLayout.LEADING, step01, GroupLayout.DEFAULT_SIZE, 496, Short.MAX_VALUE))121 .add (18, 18, 18))111 stepsLayout.createParallelGroup(GroupLayout.Alignment.LEADING) 112 .addGroup(stepsLayout.createSequentialGroup() 113 .addContainerGap() 114 .addGroup(stepsLayout.createParallelGroup(GroupLayout.Alignment.TRAILING) 115 .addComponent(lastHint, GroupLayout.Alignment.LEADING, 0, 0, Short.MAX_VALUE) 116 .addComponent(step04, GroupLayout.Alignment.LEADING, 0, 0, Short.MAX_VALUE) 117 .addComponent(step03, GroupLayout.Alignment.LEADING, 0, 0, Short.MAX_VALUE) 118 .addComponent(step02, GroupLayout.Alignment.LEADING, 0, 0, Short.MAX_VALUE) 119 .addComponent(step01, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, 496, Short.MAX_VALUE)) 120 .addGap(18, 18, 18)) 122 121 ); 123 122 stepsLayout.setVerticalGroup( 124 stepsLayout.createParallelGroup(GroupLayout. LEADING)125 .add (stepsLayout.createSequentialGroup()126 .add (step01, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)127 .addPreferredGap(LayoutStyle. RELATED)128 .add (step02, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)129 .addPreferredGap(LayoutStyle. RELATED)130 .add (step03, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)131 .addPreferredGap(LayoutStyle. RELATED)132 .add (step04, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)133 .addPreferredGap(LayoutStyle. RELATED)134 .add (lastHint, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)123 stepsLayout.createParallelGroup(GroupLayout.Alignment.LEADING) 124 .addGroup(stepsLayout.createSequentialGroup() 125 .addComponent(step01, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) 126 .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) 127 .addComponent(step02, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) 128 .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) 129 .addComponent(step03, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) 130 .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) 131 .addComponent(step04, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) 132 .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) 133 .addComponent(lastHint, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) 135 134 .addContainerGap(22, Short.MAX_VALUE)) 136 135 ); … … 143 142 Intro.setLayout(IntroLayout); 144 143 IntroLayout.setHorizontalGroup( 145 IntroLayout.createParallelGroup(GroupLayout. LEADING)146 .add (IntroLayout.createSequentialGroup()147 .addContainerGap() 148 .add (dontShow, GroupLayout.PREFERRED_SIZE, 245, GroupLayout.PREFERRED_SIZE)144 IntroLayout.createParallelGroup(GroupLayout.Alignment.LEADING) 145 .addGroup(IntroLayout.createSequentialGroup() 146 .addContainerGap() 147 .addComponent(dontShow, GroupLayout.PREFERRED_SIZE, 245, GroupLayout.PREFERRED_SIZE) 149 148 .addContainerGap(283, Short.MAX_VALUE)) 150 .add (scrollableSteps, GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE)151 .add (introText, GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE)149 .addComponent(scrollableSteps, GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE) 150 .addComponent(introText, GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE) 152 151 ); 153 152 IntroLayout.setVerticalGroup( 154 IntroLayout.createParallelGroup(GroupLayout. LEADING)155 .add (GroupLayout.TRAILING, IntroLayout.createSequentialGroup()156 .add (introText, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)157 .addPreferredGap(LayoutStyle. RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)158 .add (scrollableSteps, GroupLayout.PREFERRED_SIZE, 209, GroupLayout.PREFERRED_SIZE)159 .addPreferredGap(LayoutStyle. UNRELATED)160 .add (dontShow)153 IntroLayout.createParallelGroup(GroupLayout.Alignment.LEADING) 154 .addGroup(GroupLayout.Alignment.TRAILING, IntroLayout.createSequentialGroup() 155 .addComponent(introText, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) 156 .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 157 .addComponent(scrollableSteps, GroupLayout.PREFERRED_SIZE, 209, GroupLayout.PREFERRED_SIZE) 158 .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) 159 .addComponent(dontShow) 161 160 .addContainerGap()) 162 161 ); … … 165 164 this.setLayout(layout); 166 165 layout.setHorizontalGroup( 167 layout.createParallelGroup(GroupLayout. LEADING)168 .add (GroupLayout.TRAILING, layout.createSequentialGroup()169 .addContainerGap() 170 .add (layout.createParallelGroup(GroupLayout.TRAILING)171 .add (GroupLayout.LEADING, separator, GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE)172 .add (Title, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)173 .add (Intro, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))166 layout.createParallelGroup(GroupLayout.Alignment.LEADING) 167 .addGroup(GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() 168 .addContainerGap() 169 .addGroup(layout.createParallelGroup(GroupLayout.Alignment.TRAILING) 170 .addComponent(separator, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE) 171 .addComponent(Title, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 172 .addComponent(Intro, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) 174 173 .addContainerGap()) 175 174 ); 176 175 layout.setVerticalGroup( 177 layout.createParallelGroup(GroupLayout. LEADING)178 .add (layout.createSequentialGroup()179 .addContainerGap() 180 .add (Title, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)181 .addPreferredGap(LayoutStyle. UNRELATED)182 .add (separator, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)183 .addPreferredGap(LayoutStyle. RELATED)184 .add (Intro, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)176 layout.createParallelGroup(GroupLayout.Alignment.LEADING) 177 .addGroup(layout.createSequentialGroup() 178 .addContainerGap() 179 .addComponent(Title, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) 180 .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) 181 .addComponent(separator, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE) 182 .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) 183 .addComponent(Intro, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) 185 184 .addContainerGap(45, Short.MAX_VALUE)) 186 185 ); … … 206 205 return dontShow.isSelected(); 207 206 } 208 209 207 } -
applications/editors/josm/plugins/alignways/test
- Property svn:externals set to
-
Property svn:ignore
set to
build
jacoco.exec
report
Note:
See TracChangeset
for help on using the changeset viewer.