Revision: 5365
http://sourceforge.net/p/jump-pilot/code/5365
Author: michaudm
Date: 2017-03-12 09:55:17 +0000 (Sun, 12 Mar 2017)
Log Message:
-----------
Commit updates on following extensions (most of them already included in
OpenJUMP 1.10, I just forgot to commit) :
- CsvDriver : update dependencies
- CTSPlugIn : remove SuggestTree included in OpenJUMP core
- GraphToolbox : update dependencies and documentation
- RoadMatcher : update dependencies
- ViewManagerPlugIn : update build file
Modified Paths:
--------------
plug-ins/CTSPlugIn/trunk/build.properties
plug-ins/CTSPlugIn/trunk/build.xml
plug-ins/CTSPlugIn/trunk/src/org/openjump/core/ui/plugin/layer/CTSExtension.java
plug-ins/CTSPlugIn/trunk/src/org/openjump/core/ui/plugin/layer/CTSPlugIn.java
plug-ins/CTSPlugIn/trunk/test/org/openjump/SuggestTreeComboBoxTestCase.java
plug-ins/GraphToolboxPlugin/trunk/doc/GraphToolboxExtension4OJ.odt
plug-ins/GraphToolboxPlugin/trunk/doc/GraphToolboxExtension4OJ_fr.odt
plug-ins/ViewManagerPlugin/trunk/build.xml
Added Paths:
-----------
plug-ins/CsvDriver/trunk/lib/OpenJUMP-1.10-r5336-nosrc.jar
plug-ins/GraphToolboxPlugin/trunk/lib/OpenJUMP-20161002-r5039-nolang.jar
plug-ins/GraphToolboxPlugin/trunk/lib/jgrapht-core-0.9.2.jar
plug-ins/GraphToolboxPlugin/trunk/lib/jts-1.14-20140423.jar
plug-ins/GraphToolboxPlugin/trunk/lib/jump-jgrapht-0.7.jar
plug-ins/RoadMatcher/trunk/lib/OpenJUMP-20161219-r5269.jar
plug-ins/RoadMatcher/trunk/lib/jdom2-2.0.6.jar
Removed Paths:
-------------
plug-ins/CTSPlugIn/trunk/src/org/openjump/swing/
plug-ins/CTSPlugIn/trunk/src/org/openjump/util/
plug-ins/CsvDriver/trunk/lib/OpenJUMP-1.5.2-r2930-nosrc.jar
plug-ins/CsvDriver/trunk/lib/OpenJUMP-1.7.0-r3977-nosrc.jar
plug-ins/GraphToolboxPlugin/trunk/lib/jgrapht-jdk1.6.jar
plug-ins/GraphToolboxPlugin/trunk/lib/jts-1.12.jar
plug-ins/GraphToolboxPlugin/trunk/lib/jump-jgrapht-0.4.jar
plug-ins/GraphToolboxPlugin/trunk/lib/openjump-1.4.2alpha.jar
plug-ins/RoadMatcher/trunk/lib/jdom-1.1.3.jar
Modified: plug-ins/CTSPlugIn/trunk/build.properties
===================================================================
--- plug-ins/CTSPlugIn/trunk/build.properties 2017-03-12 09:12:00 UTC (rev
5364)
+++ plug-ins/CTSPlugIn/trunk/build.properties 2017-03-12 09:55:17 UTC (rev
5365)
@@ -3,7 +3,7 @@
# Version of this Plugin, mainly for the name of the JAR file
# should be the same as in CTSPlugIn.CTS_PLUGIN_VERSION
-version.number=0.1.2
+version.number=0.1.3
# the location of the OpenJUMP core SVN
# we need this for build the classpath during compile/run and for the
default-plugins.xml file
Modified: plug-ins/CTSPlugIn/trunk/build.xml
===================================================================
--- plug-ins/CTSPlugIn/trunk/build.xml 2017-03-12 09:12:00 UTC (rev 5364)
+++ plug-ins/CTSPlugIn/trunk/build.xml 2017-03-12 09:55:17 UTC (rev 5365)
@@ -14,7 +14,7 @@
<property name="jar.filename"
value="${build.targetpath}/CTSPlugIn-${version.number}.jar" />
<path id="classpath">
- <fileset dir="${openjump.svn}/lib" includes="**/*.jar" />
+ <!--fileset dir="${openjump.svn}/lib" includes="**/*.jar" /-->
<!--fileset dir="${openjump.svn}/lib/ext" includes="*.jar" />
<fileset dir="${openjump.svn}/lib/plus" includes="*.jar" />
<fileset dir="${openjump.svn}/lib/native" includes="*.jar" />
Modified:
plug-ins/CTSPlugIn/trunk/src/org/openjump/core/ui/plugin/layer/CTSExtension.java
===================================================================
---
plug-ins/CTSPlugIn/trunk/src/org/openjump/core/ui/plugin/layer/CTSExtension.java
2017-03-12 09:12:00 UTC (rev 5364)
+++
plug-ins/CTSPlugIn/trunk/src/org/openjump/core/ui/plugin/layer/CTSExtension.java
2017-03-12 09:55:17 UTC (rev 5365)
@@ -6,6 +6,10 @@
/**
* Created by Michaël on 30/11/14.
*/
+// 0.1.3 (2017-01-21) suggesttree moved to OpenJUMP, CTSPlugIn 0.1.3 needs OJ
1.10+
+// 0.1.2
+// 0.1.1
+// 0.1.0 (2014-12-06) initial version
public class CTSExtension extends Extension {
public String getName() {
@@ -13,7 +17,7 @@
}
public String getVersion() {
- return "0.1.2 (2016-04-01)";
+ return "0.1.3 (2017-01-21)";
}
public void configure(PlugInContext context) throws Exception {
Modified:
plug-ins/CTSPlugIn/trunk/src/org/openjump/core/ui/plugin/layer/CTSPlugIn.java
===================================================================
---
plug-ins/CTSPlugIn/trunk/src/org/openjump/core/ui/plugin/layer/CTSPlugIn.java
2017-03-12 09:12:00 UTC (rev 5364)
+++
plug-ins/CTSPlugIn/trunk/src/org/openjump/core/ui/plugin/layer/CTSPlugIn.java
2017-03-12 09:55:17 UTC (rev 5365)
@@ -18,6 +18,7 @@
import com.vividsolutions.jump.workbench.ui.HTMLFrame;
import com.vividsolutions.jump.workbench.ui.MenuNames;
import com.vividsolutions.jump.workbench.ui.MultiInputDialog;
+import com.vividsolutions.jump.workbench.ui.SuggestTreeComboBox;
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller;
import org.cts.CRSFactory;
@@ -30,7 +31,6 @@
import org.cts.registry.*;
import org.openjump.core.ccordsys.srid.SRIDStyle;
import org.openjump.core.rasterimage.RasterImageLayer;
-import org.openjump.swing.SuggestTreeComboBox;
import javax.swing.*;
import java.awt.*;
@@ -48,17 +48,17 @@
I18N I18N_ = I18N.getInstance("cts_plugin");
- private final String REGISTRY =
I18N_.getText("cts_plugin","CTSPlugIn.registry");
- private final String SOURCE = "source";
- private final String SOURCE_LABEL =
I18N_.getText("cts_plugin","CTSPlugIn.srcCRS");
- private final String TARGET = "target";
- private final String TARGET_LABEL =
I18N_.getText("cts_plugin","CTSPlugIn.tgtCRS");
- private final String OP_NOT_FOUND =
I18N_.getText("cts_plugin","CTSPlugIn.op-not-found");
- private final String HETEROGEN_SRC =
I18N_.getText("cts_plugin","CTSPlugIn.heterogeneous-sources");
- private final String TRANSFORM =
I18N_.getText("cts_plugin","CTSPlugIn.transform");
- private final String REPLACE =
I18N_.getText("cts_plugin","CTSPlugIn.replace");
- private final String SOURCE_DATUM =
I18N_.getText("cts_plugin","CTSPlugIn.srcDatum");
- private final String TARGET_DATUM =
I18N_.getText("cts_plugin","CTSPlugIn.tgtDatum");
+ private final String REGISTRY =
I18N_.getText("cts_plugin","CTSPlugIn.registry");
+ private final String SOURCE = "source";
+ private final String SOURCE_LABEL =
I18N_.getText("cts_plugin","CTSPlugIn.srcCRS");
+ private final String TARGET = "target";
+ private final String TARGET_LABEL =
I18N_.getText("cts_plugin","CTSPlugIn.tgtCRS");
+ private final String OP_NOT_FOUND =
I18N_.getText("cts_plugin","CTSPlugIn.op-not-found");
+ private final String HETEROGEN_SRC =
I18N_.getText("cts_plugin","CTSPlugIn.heterogeneous-sources");
+ private final String TRANSFORM =
I18N_.getText("cts_plugin","CTSPlugIn.transform");
+ private final String REPLACE =
I18N_.getText("cts_plugin","CTSPlugIn.replace");
+ private final String SOURCE_DATUM =
I18N_.getText("cts_plugin","CTSPlugIn.srcDatum");
+ private final String TARGET_DATUM =
I18N_.getText("cts_plugin","CTSPlugIn.tgtDatum");
private final String SOURCE_SPHEROID =
I18N_.getText("cts_plugin","CTSPlugIn.srcSpheroid");
private final String TARGET_SPHEROID =
I18N_.getText("cts_plugin","CTSPlugIn.tgtSpheroid");
private final String SOURCE_TOWGS84 =
I18N_.getText("cts_plugin","CTSPlugIn.srcToWgs84");
Modified:
plug-ins/CTSPlugIn/trunk/test/org/openjump/SuggestTreeComboBoxTestCase.java
===================================================================
--- plug-ins/CTSPlugIn/trunk/test/org/openjump/SuggestTreeComboBoxTestCase.java
2017-03-12 09:12:00 UTC (rev 5364)
+++ plug-ins/CTSPlugIn/trunk/test/org/openjump/SuggestTreeComboBoxTestCase.java
2017-03-12 09:55:17 UTC (rev 5365)
@@ -1,12 +1,13 @@
package org.openjump;
-import org.openjump.swing.SuggestTreeComboBox;
-import org.openjump.util.SuggestTree;
+import com.vividsolutions.jump.util.SuggestTree;
+import com.vividsolutions.jump.workbench.ui.SuggestTreeComboBox;
+
import javax.swing.*;
/**
- * Created by Micha�l on 24/11/14.
+ * Created by Michaël on 24/11/14.
*/
public class SuggestTreeComboBoxTestCase {
@@ -17,7 +18,7 @@
public static void test1() {
String[] array = new String[]{
"Lambert93",
- "Lambert 2 �tendu",
+ "Lambert 2 étendu",
"Lambert zone 1 NTF",
"Lambert zone 2 NTF",
"Lambert zone 3 NTF",
Added: plug-ins/CsvDriver/trunk/lib/OpenJUMP-1.10-r5336-nosrc.jar
===================================================================
(Binary files differ)
Index: plug-ins/CsvDriver/trunk/lib/OpenJUMP-1.10-r5336-nosrc.jar
===================================================================
--- plug-ins/CsvDriver/trunk/lib/OpenJUMP-1.10-r5336-nosrc.jar 2017-03-12
09:12:00 UTC (rev 5364)
+++ plug-ins/CsvDriver/trunk/lib/OpenJUMP-1.10-r5336-nosrc.jar 2017-03-12
09:55:17 UTC (rev 5365)
Property changes on: plug-ins/CsvDriver/trunk/lib/OpenJUMP-1.10-r5336-nosrc.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: plug-ins/CsvDriver/trunk/lib/OpenJUMP-1.5.2-r2930-nosrc.jar
===================================================================
(Binary files differ)
Deleted: plug-ins/CsvDriver/trunk/lib/OpenJUMP-1.7.0-r3977-nosrc.jar
===================================================================
(Binary files differ)
Modified: plug-ins/GraphToolboxPlugin/trunk/doc/GraphToolboxExtension4OJ.odt
===================================================================
(Binary files differ)
Modified: plug-ins/GraphToolboxPlugin/trunk/doc/GraphToolboxExtension4OJ_fr.odt
===================================================================
(Binary files differ)
Added: plug-ins/GraphToolboxPlugin/trunk/lib/OpenJUMP-20161002-r5039-nolang.jar
===================================================================
(Binary files differ)
Index: plug-ins/GraphToolboxPlugin/trunk/lib/OpenJUMP-20161002-r5039-nolang.jar
===================================================================
--- plug-ins/GraphToolboxPlugin/trunk/lib/OpenJUMP-20161002-r5039-nolang.jar
2017-03-12 09:12:00 UTC (rev 5364)
+++ plug-ins/GraphToolboxPlugin/trunk/lib/OpenJUMP-20161002-r5039-nolang.jar
2017-03-12 09:55:17 UTC (rev 5365)
Property changes on:
plug-ins/GraphToolboxPlugin/trunk/lib/OpenJUMP-20161002-r5039-nolang.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: plug-ins/GraphToolboxPlugin/trunk/lib/jgrapht-core-0.9.2.jar
===================================================================
(Binary files differ)
Index: plug-ins/GraphToolboxPlugin/trunk/lib/jgrapht-core-0.9.2.jar
===================================================================
--- plug-ins/GraphToolboxPlugin/trunk/lib/jgrapht-core-0.9.2.jar
2017-03-12 09:12:00 UTC (rev 5364)
+++ plug-ins/GraphToolboxPlugin/trunk/lib/jgrapht-core-0.9.2.jar
2017-03-12 09:55:17 UTC (rev 5365)
Property changes on:
plug-ins/GraphToolboxPlugin/trunk/lib/jgrapht-core-0.9.2.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: plug-ins/GraphToolboxPlugin/trunk/lib/jgrapht-jdk1.6.jar
===================================================================
(Binary files differ)
Deleted: plug-ins/GraphToolboxPlugin/trunk/lib/jts-1.12.jar
===================================================================
(Binary files differ)
Added: plug-ins/GraphToolboxPlugin/trunk/lib/jts-1.14-20140423.jar
===================================================================
(Binary files differ)
Index: plug-ins/GraphToolboxPlugin/trunk/lib/jts-1.14-20140423.jar
===================================================================
--- plug-ins/GraphToolboxPlugin/trunk/lib/jts-1.14-20140423.jar 2017-03-12
09:12:00 UTC (rev 5364)
+++ plug-ins/GraphToolboxPlugin/trunk/lib/jts-1.14-20140423.jar 2017-03-12
09:55:17 UTC (rev 5365)
Property changes on: plug-ins/GraphToolboxPlugin/trunk/lib/jts-1.14-20140423.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: plug-ins/GraphToolboxPlugin/trunk/lib/jump-jgrapht-0.4.jar
===================================================================
(Binary files differ)
Added: plug-ins/GraphToolboxPlugin/trunk/lib/jump-jgrapht-0.7.jar
===================================================================
(Binary files differ)
Index: plug-ins/GraphToolboxPlugin/trunk/lib/jump-jgrapht-0.7.jar
===================================================================
--- plug-ins/GraphToolboxPlugin/trunk/lib/jump-jgrapht-0.7.jar 2017-03-12
09:12:00 UTC (rev 5364)
+++ plug-ins/GraphToolboxPlugin/trunk/lib/jump-jgrapht-0.7.jar 2017-03-12
09:55:17 UTC (rev 5365)
Property changes on: plug-ins/GraphToolboxPlugin/trunk/lib/jump-jgrapht-0.7.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: plug-ins/GraphToolboxPlugin/trunk/lib/openjump-1.4.2alpha.jar
===================================================================
(Binary files differ)
Added: plug-ins/RoadMatcher/trunk/lib/OpenJUMP-20161219-r5269.jar
===================================================================
(Binary files differ)
Index: plug-ins/RoadMatcher/trunk/lib/OpenJUMP-20161219-r5269.jar
===================================================================
--- plug-ins/RoadMatcher/trunk/lib/OpenJUMP-20161219-r5269.jar 2017-03-12
09:12:00 UTC (rev 5364)
+++ plug-ins/RoadMatcher/trunk/lib/OpenJUMP-20161219-r5269.jar 2017-03-12
09:55:17 UTC (rev 5365)
Property changes on: plug-ins/RoadMatcher/trunk/lib/OpenJUMP-20161219-r5269.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: plug-ins/RoadMatcher/trunk/lib/jdom-1.1.3.jar
===================================================================
(Binary files differ)
Added: plug-ins/RoadMatcher/trunk/lib/jdom2-2.0.6.jar
===================================================================
(Binary files differ)
Index: plug-ins/RoadMatcher/trunk/lib/jdom2-2.0.6.jar
===================================================================
--- plug-ins/RoadMatcher/trunk/lib/jdom2-2.0.6.jar 2017-03-12 09:12:00 UTC
(rev 5364)
+++ plug-ins/RoadMatcher/trunk/lib/jdom2-2.0.6.jar 2017-03-12 09:55:17 UTC
(rev 5365)
Property changes on: plug-ins/RoadMatcher/trunk/lib/jdom2-2.0.6.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: plug-ins/ViewManagerPlugin/trunk/build.xml
===================================================================
--- plug-ins/ViewManagerPlugin/trunk/build.xml 2017-03-12 09:12:00 UTC (rev
5364)
+++ plug-ins/ViewManagerPlugin/trunk/build.xml 2017-03-12 09:55:17 UTC (rev
5365)
@@ -19,7 +19,7 @@
<!-- plugins -->
<!-- drivers -->
<property name="view-manager" value="ViewManager" />
- <property name="view-manager-version" value="0.3.3" />
+ <property name="view-manager-version" value="0.3.4" />
<!-- ===================================================================
-->
@@ -75,8 +75,8 @@
<!--copy todir="${dist}">
<fileset dir="${resources}" />
</copy-->
- <copy file="${dist}/${view-manager}-${view-manager-version}.jar"
-
todir="D:/LOGICIELS/OpenJUMP-Portable-20150328-r4357-PLUS/OpenJUMP-20150328-r4357-PLUS/lib/ext"
/>
+ <!--copy file="${dist}/${view-manager}-${view-manager-version}.jar"
+
todir="D:/LOGICIELS/OpenJUMP-Portable-20150328-r4357-PLUS/OpenJUMP-20150328-r4357-PLUS/lib/ext"
/-->
</target>
<target name="zip-ViewManager-src" id="zip-ViewManager-src"
depends="jar-ViewManager">
------------------------------------------------------------------------------
Announcing the Oxford Dictionaries API! The API offers world-renowned
dictionary content that is easy and intuitive to access. Sign up for an
account today to start using our lexical data to power your apps and
projects. Get started today and enter our developer competition.
http://sdm.link/oxford
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
