Revision: 5694
http://sourceforge.net/p/jump-pilot/code/5694
Author: michaudm
Date: 2018-01-28 20:48:34 +0000 (Sun, 28 Jan 2018)
Log Message:
-----------
Vertex Symbols extension : add an ant build file a version number and fix a
compatibility problem with java 1.7
Modified Paths:
--------------
plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexDialog.java
plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexSymbolsExtension.java
Added Paths:
-----------
plug-ins/CadPlan_VertexSymbols/trunk/build.xml
Copied: plug-ins/CadPlan_VertexSymbols/trunk/build.xml (from rev 5684,
plug-ins/CsvDriver/trunk/build.xml)
===================================================================
--- plug-ins/CadPlan_VertexSymbols/trunk/build.xml
(rev 0)
+++ plug-ins/CadPlan_VertexSymbols/trunk/build.xml 2018-01-28 20:48:34 UTC
(rev 5694)
@@ -0,0 +1,95 @@
+<project name="VertexSymbols" default="compile-all" basedir=".">
+
+
<!--*************************************************************************
+
*****************************************************************************
+ ** PROPERTIES
**
+
*****************************************************************************
+
**************************************************************************-->
+
+ <!-- PROPERTIES : MAIN ARCHITECTURE -->
+ <property name="src" value="src" />
+ <property name="bin" value="bin" />
+ <property name="lib" value="lib" />
+ <property name="build" value="build" />
+ <property name="dist" value="dist" />
+ <property name="doc-api" value="doc-api" />
+ <property name="resources" value="resources" />
+ <property name="oj-classpath" value="../../openjump_lib" />
+
+ <!-- plugins -->
+ <property name="vertex-symbols-version" value="0.181" />
+
+
+ <!-- ===================================================================
-->
+ <!-- Defines the classpath used for compilation and test.
-->
+ <!-- ===================================================================
-->
+ <path id="classpath">
+ <!--fileset dir="${lib}">
+ <include name="**/*.jar"/>
+ </fileset-->
+ <fileset dir="${oj-classpath}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <target name="clean" id="clean">
+ <delete dir="${build}"/>
+ </target>
+
+ <target name="compile-all" id="compile-all" depends="clean">
+ <tstamp/>
+ <mkdir dir="${build}"/>
+ <javac srcdir="${src}" destdir="${build}"
+ debug="on" deprecation="false" verbose="no"
+ includeantruntime="false"
+ encoding="windows-1252"
+ source="1.7"
+ target="1.7">
+ <exclude name="**/clean/*"/>
+ <classpath refid="classpath"/>
+ </javac>
+ <copy todir="${build}" >
+ <fileset dir="${src}" casesensitive="false" includes="**/*.gif,
**/*.jpg, **/*.png" />
+ <fileset dir="${src}" casesensitive="false"
includes="**/*.properties" />
+ <fileset dir="${src}" casesensitive="false" includes="**/*.html" />
+ <fileset dir="${src}" casesensitive="false" includes="**/*.txt" />
+ <fileset dir="${src}" casesensitive="false"
includes="**/*.java2xml" />
+ <fileset dir="." casesensitive="false" includes="**/*.gif,
**/*.jpg, **/*.png" />
+ <fileset dir="." casesensitive="false" includes="**/*.properties"
/>
+ </copy>
+ </target>
+
+
+ <!-- ===================================================================
-->
+ <!-- csv driver
-->
+ <!-- ===================================================================
-->
+ <target name="jar-vertex-symbols" id="jar-vertex-symbols"
depends="compile-all">
+ <jar basedir="${build}"
jarfile="${dist}/vertex-symbols-${vertex-symbols-version}.jar">
+ <include name="com/cadplan/**/*"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.png"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.txt"/>
+ <include name="**/*.java2xml"/>
+ <include name="**/*.html"/>
+ </jar>
+ <!--copy file="${dist}/csv-driver-${csv-driver-version}.jar"
todir="${openjump-ext}"/-->
+ </target>
+
+ <target name="zip-vertex-symbols-src" id="zip-vertex-symbols-src"
depends="jar-vertex-symbols">
+ <zip basedir="."
destfile="${dist}/csv-driver-src-${vertex-symbols-version}.zip">
+ <include name="${dist}/csv-driver-${vertex-symbols-version}.jar"/>
+ <include name="com/cadplan/**/*.java"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.java2xml"/>
+ <include name="**/*.txt"/>
+ <include name="**/*.html"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.png"/>
+ <include name="build.xml"/>
+ </zip>
+ </target>
+
+</project>
\ No newline at end of file
Modified:
plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexDialog.java
===================================================================
--- plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexDialog.java
2018-01-28 20:46:06 UTC (rev 5693)
+++ plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexDialog.java
2018-01-28 20:48:34 UTC (rev 5694)
@@ -311,7 +311,7 @@
VertexParams.showFill = showFillCB.isSelected();
VertexParams.dotted = dottedCB.isSelected();
VertexParams.sizeByScale = sizeByScaleCB.isSelected();
- VertexParams.type = getType();
+ VertexParams.type = getVertexType();
VertexParams.sides = getSides(VertexParams.type);
//System.out.println("getSides="+VertexParams.sides); //***
VertexParams.selectedImage = imagePanel.getSelectedImage();
@@ -347,7 +347,7 @@
return vectorPanel.symbolPanel.sides[2];
}
- public int getType()
+ public int getVertexType()
{
// for (int i=0; i < vectorPanel.symbolPanel.vertexRB.length; i++)
// {
Modified:
plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexSymbolsExtension.java
===================================================================
---
plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexSymbolsExtension.java
2018-01-28 20:46:06 UTC (rev 5693)
+++
plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexSymbolsExtension.java
2018-01-28 20:48:34 UTC (rev 5694)
@@ -37,4 +37,8 @@
{
new VertexSymbolsPlugIn().initialize(context);
}
+
+ public String getVersion() {
+ return "0.181 (2018-01-28)";
+ }
}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
