Revision: 4877
http://sourceforge.net/p/jump-pilot/code/4877
Author: michaudm
Date: 2016-04-01 06:46:07 +0000 (Fri, 01 Apr 2016)
Log Message:
-----------
Update CTS plugin
Modified Paths:
--------------
plug-ins/CTSPlugIn/trunk/build.properties
plug-ins/CTSPlugIn/trunk/build.xml
plug-ins/CTSPlugIn/trunk/resources/cts_plugin/language/jump.properties
plug-ins/CTSPlugIn/trunk/resources/cts_plugin/language/jump_fr.properties
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
Added Paths:
-----------
plug-ins/CTSPlugIn/trunk/lib/cts-1.4.0-SNAPSHOT.jar
Removed Paths:
-------------
plug-ins/CTSPlugIn/trunk/lib/cts-1.3.2-SNAPSHOT.jar
Modified: plug-ins/CTSPlugIn/trunk/build.properties
===================================================================
--- plug-ins/CTSPlugIn/trunk/build.properties 2016-03-28 16:32:20 UTC (rev
4876)
+++ plug-ins/CTSPlugIn/trunk/build.properties 2016-04-01 06:46:07 UTC (rev
4877)
@@ -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.1
+version.number=0.1.2
# the location of the OpenJUMP core SVN
# we need this for build the classpath during compile/run and for the
default-plugins.xml file
@@ -15,7 +15,8 @@
cts.svn=../../../CTS/CTS
# Java classes version we are compile for?
-java.targetversion=1.5
+java.sourceversion=1.7
+java.targetversion=1.7
# Main class to run
run.mainclass=com.vividsolutions.jump.workbench.JUMPWorkbench
Modified: plug-ins/CTSPlugIn/trunk/build.xml
===================================================================
--- plug-ins/CTSPlugIn/trunk/build.xml 2016-03-28 16:32:20 UTC (rev 4876)
+++ plug-ins/CTSPlugIn/trunk/build.xml 2016-04-01 06:46:07 UTC (rev 4877)
@@ -22,7 +22,7 @@
<fileset dir="${openjump.svn}/lib/imageio-ext.plus" includes="*.jar"
/-->
<path path="${openjump.svn}/target/classes" />
<!--fileset dir="${cts.svn}/lib" includes="**/*.jar" /-->
- <path path="${cts.svn}/target/classes" />
+ <!--path path="${cts.svn}/target/classes" /-->
<fileset dir="${java.lib}" includes="**/*.jar"/>
<pathelement location="${build.classes}" />
</path>
@@ -38,7 +38,7 @@
classpathref="classpath"
includeantruntime="false"
debug="true"
- source="${java.targetversion}"
+ source="${java.sourceversion}"
target="${java.targetversion}"
/>
<copy todir="${build.classes}" description="we need the i18n files
too">
Deleted: plug-ins/CTSPlugIn/trunk/lib/cts-1.3.2-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: plug-ins/CTSPlugIn/trunk/lib/cts-1.4.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Index: plug-ins/CTSPlugIn/trunk/lib/cts-1.4.0-SNAPSHOT.jar
===================================================================
--- plug-ins/CTSPlugIn/trunk/lib/cts-1.4.0-SNAPSHOT.jar 2016-03-28 16:32:20 UTC
(rev 4876)
+++ plug-ins/CTSPlugIn/trunk/lib/cts-1.4.0-SNAPSHOT.jar 2016-04-01 06:46:07 UTC
(rev 4877)
Property changes on: plug-ins/CTSPlugIn/trunk/lib/cts-1.4.0-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: plug-ins/CTSPlugIn/trunk/resources/cts_plugin/language/jump.properties
===================================================================
--- plug-ins/CTSPlugIn/trunk/resources/cts_plugin/language/jump.properties
2016-03-28 16:32:20 UTC (rev 4876)
+++ plug-ins/CTSPlugIn/trunk/resources/cts_plugin/language/jump.properties
2016-04-01 06:46:07 UTC (rev 4877)
@@ -15,3 +15,5 @@
CTSPlugIn.tgtToWgs84 = Transformation to WGS84
CTSPlugIn.invalid-src-crs = Source Coordinate System was not Valid
CTSPlugIn.invalid-tgt-crs = Target Coordinate System was not Valid
+CTSPlugIn.srcProjection = Source Projection
+CTSPlugIn.tgtProjection = Source Projection
Modified:
plug-ins/CTSPlugIn/trunk/resources/cts_plugin/language/jump_fr.properties
===================================================================
--- plug-ins/CTSPlugIn/trunk/resources/cts_plugin/language/jump_fr.properties
2016-03-28 16:32:20 UTC (rev 4876)
+++ plug-ins/CTSPlugIn/trunk/resources/cts_plugin/language/jump_fr.properties
2016-04-01 06:46:07 UTC (rev 4877)
@@ -14,4 +14,6 @@
CTSPlugIn.srcToWgs84 = Transformation vers WGS84
CTSPlugIn.tgtToWgs84 = Transformation vers WGS84
CTSPlugIn.invalid-src-crs = Le syst\xE8me de coordonn\xE9es source \xE9tait
invalide
-CTSPlugIn.invalid-tgt-crs = Le syst\xE8me de coordonn\xE9es cible \xE9tait
invalide
\ No newline at end of file
+CTSPlugIn.invalid-tgt-crs = Le syst\xE8me de coordonn\xE9es cible \xE9tait
invalide
+CTSPlugIn.srcProjection = Projection source
+CTSPlugIn.tgtProjection = Projection cible
\ No newline at end of file
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
2016-03-28 16:32:20 UTC (rev 4876)
+++
plug-ins/CTSPlugIn/trunk/src/org/openjump/core/ui/plugin/layer/CTSExtension.java
2016-04-01 06:46:07 UTC (rev 4877)
@@ -13,7 +13,7 @@
}
public String getVersion() {
- return "0.1.0 (2014-12-06)";
+ return "0.1.2 (2016-04-01)";
}
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
2016-03-28 16:32:20 UTC (rev 4876)
+++
plug-ins/CTSPlugIn/trunk/src/org/openjump/core/ui/plugin/layer/CTSPlugIn.java
2016-04-01 06:46:07 UTC (rev 4877)
@@ -66,6 +66,8 @@
private final String TRANSFORMED_LAYERS =
I18N_.getText("cts_plugin","CTSPlugIn.transformed-layers");
private final String INVALID_SRC_CRS =
I18N_.getText("cts_plugin","CTSPlugIn.invalid-src-crs");
private final String INVALID_TGT_CRS =
I18N_.getText("cts_plugin","CTSPlugIn.invalid-tgt-crs");
+ private final String SOURCE_PROJECTION =
I18N_.getText("cts_plugin","CTSPlugIn.srcProjection");
+ private final String TARGET_PROJECTION =
I18N_.getText("cts_plugin","CTSPlugIn.tgtProjection");
private static final String EPSG = "EPSG";
private static final String IGNF = "IGNF";
@@ -317,11 +319,13 @@
html.addField(SOURCE_DATUM, srcCRS.getDatum().toString());
html.addField(SOURCE_TOWGS84,
srcCRS.getDatum().getToWGS84().toString());
html.addField(SOURCE_SPHEROID,
((GeodeticDatum)srcCRS.getDatum()).getEllipsoid().toString());
+ html.addField(SOURCE_PROJECTION, srcCRS.getProjection() == null ?
"null" : srcCRS.getProjection().toWKT());
html.append("<h2>" + TARGET_LABEL + "</h2>");
html.addField(TARGET_LABEL, tgtCRS.toString());
html.addField(TARGET_DATUM, tgtCRS.getDatum().toString());
html.addField(TARGET_TOWGS84,
tgtCRS.getDatum().getToWGS84().toString());
html.addField(TARGET_SPHEROID,
((GeodeticDatum)srcCRS.getDatum()).getEllipsoid().toString());
+ html.addField(TARGET_PROJECTION, tgtCRS.getProjection() == null ?
"null" : tgtCRS.getProjection().toWKT());
html.append("<h2>" + getName() + "</h2>");
html.addField("", getOperation(srcCRS,
tgtCRS).toString().replaceAll("\n","<br>"));
}
@@ -329,7 +333,7 @@
private CoordinateOperation getOperation(final CoordinateReferenceSystem
srcCRS,
final CoordinateReferenceSystem
tgtCRS)
throws CoordinateOperationException{
- Set<CoordinateOperation> ops = CoordinateOperationFactory
+ Collection<CoordinateOperation> ops = CoordinateOperationFactory
.createCoordinateOperations((GeodeticCRS) srcCRS,
(GeodeticCRS) tgtCRS);
CoordinateOperation op = ops.size() == 0 ? null :
CoordinateOperationFactory.getMostPrecise(ops);
return op;
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
