[Schmitzm-commits] r478 - in branches/1.0-gt2-2.6: . defaults dist lib lib/gt-unsupported src/gtmig/org/geotools/swing src/schmitzm/geotools/gui
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Oct 20 12:37:03 CEST 2009
Author: mojays
Date: 2009-10-20 12:37:01 +0200 (Tue, 20 Oct 2009)
New Revision: 478
Added:
branches/1.0-gt2-2.6/lib/gt-unsupported/
branches/1.0-gt2-2.6/lib/gt-unsupported/gt-shapefile-renderer-2.6-SNAPSHOT.jar
Removed:
branches/1.0-gt2-2.6/dist/schmitzm-1.0-gt2-2.6.jar.zip
Modified:
branches/1.0-gt2-2.6/defaults/.classpath
branches/1.0-gt2-2.6/readme.txt
branches/1.0-gt2-2.6/src/gtmig/org/geotools/swing/JMapPane.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoMapPane.java
Log:
GT-JMapPane, GeoMapPane: "our" Reference to ShapefileRenderer removed
defaults/.classpath updated to gt2-2.6.0
Modified: branches/1.0-gt2-2.6/defaults/.classpath
===================================================================
--- branches/1.0-gt2-2.6/defaults/.classpath 2009-10-20 10:30:17 UTC (rev 477)
+++ branches/1.0-gt2-2.6/defaults/.classpath 2009-10-20 10:37:01 UTC (rev 478)
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry excluding="**/.svn/" kind="src" path="src"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/gt-arcgrid"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/gt2-2.4.4"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jFreeChart"/>
+ <classpathentry excluding="**/.svn/" kind="src" path="src_junit"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/colt-statistics"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jFreeChart-1.0.13"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jini"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/POI"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jai_for_gt2-2.6-x"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/gt2-2.6.0"/>
+ <classpathentry kind="lib" path="lib/gt-unsupported/gt-shapefile-renderer-2.6-SNAPSHOT.jar"/>
<classpathentry kind="output" path="classes"/>
-</classpath>
+</classpath>
\ No newline at end of file
Deleted: branches/1.0-gt2-2.6/dist/schmitzm-1.0-gt2-2.6.jar.zip
===================================================================
(Binary files differ)
Added: branches/1.0-gt2-2.6/lib/gt-unsupported/gt-shapefile-renderer-2.6-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.0-gt2-2.6/lib/gt-unsupported/gt-shapefile-renderer-2.6-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/1.0-gt2-2.6/readme.txt
===================================================================
--- branches/1.0-gt2-2.6/readme.txt 2009-10-20 10:30:17 UTC (rev 477)
+++ branches/1.0-gt2-2.6/readme.txt 2009-10-20 10:37:01 UTC (rev 478)
@@ -22,18 +22,27 @@
project:
- JRE/JDK 1.6 (http://java.sun.com)
- JAI plus ImageIO (if not already included in your JRE/JDK)
- - Geotools 2.4.5 (http://www.geotools.org)
- + gt2-arcgrid-2.3.0-M0.jar
- + junit-4.4.jar
+ because gt2-2.6.0 already includes jai_codec-1.1.3.jar and
+ jai_imageio-1.1.jar it is recommended only to include:
+ - clipwrapper_jiio.jar
+ - jai_core.jar
+ - mlibwrapper_jai.jar
+ - Geotools 2.6.0 (http://www.geotools.org)
- jFreeChart 1.0.13 (http://www.jfree.org/jfreechart/)
- Log4j 1.2.14 (http://logging.apache.org/log4j/)
- JINI (http://java.sun.com/products/jini/)
- Colt (http://acs.lbl.gov/~hoschek/colt/)
-NOTE: All these libraries (except JRE/JDK and Colt!) can be found
-in the 'lib' folder of the XULU project:
- http://wald.intevation.org/projects/xulu/
+Only the following individual JARs are included in the SCHMITZM
+project (lib folder) because of several reasons. For middle term
+it is planned to remove them:
+ - gt-shapefile-renderer-2.6-SNAPSHOT.jar
+ >> ShapefileRenderer is still needed, but unsupported in
+ gt2-2.6.0. When GT has included all its advantages
+ in StreamingRenderer the ShapefileRenderer will be
+ removed from SCHMITZM
+
An example for an Eclipse project can be found in "defaults"
folder. But please DO NOT USE, MODIFY AND COMMIT THIS FILES,
but instead copy first '.classpass' and '.project' to SCHMITZM
Modified: branches/1.0-gt2-2.6/src/gtmig/org/geotools/swing/JMapPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/gtmig/org/geotools/swing/JMapPane.java 2009-10-20 10:30:17 UTC (rev 477)
+++ branches/1.0-gt2-2.6/src/gtmig/org/geotools/swing/JMapPane.java 2009-10-20 10:37:01 UTC (rev 478)
@@ -65,7 +65,6 @@
import org.geotools.renderer.label.LabelCacheImpl;
import org.geotools.renderer.lite.LabelCache;
import org.geotools.renderer.lite.StreamingRenderer;
-import org.geotools.renderer.shape.ShapefileRenderer;
import org.opengis.filter.FilterFactory2;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -231,9 +230,8 @@
Map<Object, Object> hints = new HashMap<Object, Object>();
this.renderer = renderer;
-
- if (renderer instanceof StreamingRenderer
- || renderer instanceof ShapefileRenderer) {
+//MS: Apply hint also for ShapeFileRenderer
+// if (renderer instanceof StreamingRenderer) {
hints = renderer.getRendererHints();
if (hints == null) {
hints = new HashMap<Object, Object>();
@@ -248,7 +246,7 @@
hints.put("memoryPreloadingEnabled", Boolean.TRUE);
renderer.setRendererHints(hints);
- }
+// }
if (this.context != null) {
this.renderer.setContext(this.context);
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoMapPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoMapPane.java 2009-10-20 10:30:17 UTC (rev 477)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoMapPane.java 2009-10-20 10:37:01 UTC (rev 478)
@@ -41,7 +41,6 @@
import org.geotools.map.MapContext;
import org.geotools.renderer.GTRenderer;
import org.geotools.renderer.lite.StreamingRenderer;
-import org.geotools.renderer.shape.ShapefileRenderer;
import schmitzm.geotools.GTUtil;
import schmitzm.geotools.map.event.JMapPaneEvent;
More information about the Schmitzm-commits
mailing list