[Xulu-commits] r36 - in trunk/src/edu/bonn/xulu/plugin: io io/grid/awt io/grid/gt vis
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Jul 14 17:46:14 CEST 2009
Author: alfonx
Date: 2009-07-14 17:46:14 +0200 (Tue, 14 Jul 2009)
New Revision: 36
Modified:
trunk/src/edu/bonn/xulu/plugin/io/IOUtil.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_GeoTiff.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_GeoTiff.java
trunk/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java
Log:
* big biG BIG refactoring: StyledMap[Interface,Util,Style] never dealt with Maps (=Orchestrations of layers), but always only with single Layers. Now it has been refactored to StyledLayer[Interface,Util,Style].
* Some variable names and methodNames have been corrected also, but many StyledLayer
* New JARs committed
Modified: trunk/src/edu/bonn/xulu/plugin/io/IOUtil.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/IOUtil.java 2009-07-06 10:40:01 UTC (rev 35)
+++ trunk/src/edu/bonn/xulu/plugin/io/IOUtil.java 2009-07-14 15:46:14 UTC (rev 36)
@@ -20,8 +20,8 @@
import edu.bonn.xulu.data.XuluObject;
-import skrueger.geotools.StyledMapStyle;
-import skrueger.geotools.StyledMapUtil;
+import skrueger.geotools.StyledLayerStyle;
+import skrueger.geotools.StyledLayerUtil;
// fuer Doku
import edu.bonn.xulu.io.ImportFactory;
@@ -70,32 +70,32 @@
}
/**
- * Importiert einen {@linkplain StyledMapStyle Raster-Style} fuer ein
+ * Importiert einen {@linkplain StyledLayerStyle Raster-Style} fuer ein
* {@link XuluObject} und hinterlegt diesen in der Property
* {@linkplain XuluObject#PROP_STYLE "Style"}.
* Macht nichts, wenn das {@link XuluObject} keine entsprechende Property besitzt.
* @param object ein {@link XuluObject}
* @param objectURL URL unter der das XuluObject hinterlegt ist (bestimmt
* Pfad und Dateiname fuer die Style-Dateien)
- * @see StyledMapUtil#loadStyledRasterStyle(URL)
+ * @see StyledLayerUtil#loadStyledRasterStyle(URL)
*/
public static void importRasterStyle(XuluObject object, URL objectURL) {
- Object style = StyledMapUtil.loadStyledRasterStyle( objectURL );
+ Object style = StyledLayerUtil.loadStyledRasterStyle( objectURL );
setStyleToXuluObject(object, style);
}
/**
- * Importiert einen {@linkplain StyledMapStyle Feature-Style} fuer ein
+ * Importiert einen {@linkplain StyledLayerStyle Feature-Style} fuer ein
* {@link XuluObject} und hinterlegt diesen in der Property
* {@linkplain XuluObject#PROP_STYLE "Style"}.
* Macht nichts, wenn das {@link XuluObject} keine entsprechende Property besitzt.
* @param object ein {@link XuluObject}
* @param objectURL URL unter der das XuluObject hinterlegt ist (bestimmt
* Pfad und Dateiname fuer die Style-Dateien)
- * @see StyledMapUtil#loadStyledFeatureStyle(URL)
+ * @see StyledLayerUtil#loadStyledFeatureStyle(URL)
*/
public static void importFeatureStyle(XuluObject object, URL objectURL) {
- Object style = StyledMapUtil.loadStyledFeatureStyle( objectURL );
+ Object style = StyledLayerUtil.loadStyledFeatureStyle( objectURL );
setStyleToXuluObject(object, style);
}
@@ -115,8 +115,8 @@
if ( styleProp != null && styleProp instanceof ScalarProperty ) {
Object style = ((ScalarProperty)styleProp).getOneTimeWriteAccess().getValue();
if ( style != null ) {
- if ( style instanceof StyledMapStyle )
- StyledMapUtil.saveStyledMapStyle( (StyledMapStyle)style, objectURL );
+ if ( style instanceof StyledLayerStyle )
+ StyledLayerUtil.saveStyledLayerStyle( (StyledLayerStyle)style, objectURL );
else
throw new UnsupportedOperationException("Export of style not supported: "+style.getClass().getSimpleName());
}
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_ArcInfoAsciiGrid.java 2009-07-06 10:40:01 UTC (rev 35)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_ArcInfoAsciiGrid.java 2009-07-14 15:46:14 UTC (rev 36)
@@ -19,7 +19,7 @@
import schmitzm.geotools.io.GeoImportUtil;
import schmitzm.geotools.io.GeoExportUtil;
-import skrueger.geotools.StyledMapUtil;
+import skrueger.geotools.StyledLayerUtil;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_GeoTiff.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_GeoTiff.java 2009-07-06 10:40:01 UTC (rev 35)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_GeoTiff.java 2009-07-14 15:46:14 UTC (rev 36)
@@ -19,7 +19,7 @@
import schmitzm.geotools.io.GeoImportUtil;
import schmitzm.geotools.io.GeoExportUtil;
-import skrueger.geotools.StyledMapUtil;
+import skrueger.geotools.StyledLayerUtil;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java 2009-07-06 10:40:01 UTC (rev 35)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java 2009-07-14 15:46:14 UTC (rev 36)
@@ -33,7 +33,7 @@
// fuer Doku
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import skrueger.geotools.StyledMapUtil;
+import skrueger.geotools.StyledLayerUtil;
import schmitzm.data.property.ScalarProperty;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_ArcInfoAsciiGrid.java 2009-07-06 10:40:01 UTC (rev 35)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_ArcInfoAsciiGrid.java 2009-07-14 15:46:14 UTC (rev 36)
@@ -20,7 +20,7 @@
import schmitzm.geotools.io.GeoExportUtil;
import schmitzm.data.property.ScalarProperty;
-import skrueger.geotools.StyledMapUtil;
+import skrueger.geotools.StyledLayerUtil;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_GeoTiff.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_GeoTiff.java 2009-07-06 10:40:01 UTC (rev 35)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_GeoTiff.java 2009-07-14 15:46:14 UTC (rev 36)
@@ -20,7 +20,7 @@
import schmitzm.geotools.io.GeoExportUtil;
import schmitzm.data.property.ScalarProperty;
-import skrueger.geotools.StyledMapUtil;
+import skrueger.geotools.StyledLayerUtil;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java 2009-07-06 10:40:01 UTC (rev 35)
+++ trunk/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java 2009-07-14 15:46:14 UTC (rev 36)
@@ -64,7 +64,7 @@
// nur fuer Doku
import schmitzm.data.WritableGridRaster;
-import skrueger.geotools.StyledMapStyle;
+import skrueger.geotools.StyledLayerStyle;
/**
* Diese Klasse stellt ein Visualisierungstool fuer geografische Raster- und
@@ -377,8 +377,8 @@
if ( styleObj != null ) {
if ( styleObj instanceof Style )
style = (Style)styleObj;
- else if ( styleObj instanceof StyledMapStyle )
- style = ((StyledMapStyle)styleObj).getGeoObjectStyle();
+ else if ( styleObj instanceof StyledLayerStyle )
+ style = ((StyledLayerStyle)styleObj).getGeoObjectStyle();
}
}
return style;
More information about the Xulu-commits
mailing list