[Xulu-commits] r67 - in branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin: gui vis

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-11-23 16:49:35 +0100 (Mon, 23 Nov 2009)
New Revision: 67

Modified:
   branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/gui/DisplayContainer_GeomAndGrid.java
   branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java
   branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java
Log:
Renamed XMapPane getContext to getMapContext (as in JMapPane)

Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/gui/DisplayContainer_GeomAndGrid.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/gui/DisplayContainer_GeomAndGrid.java	2009-11-19 09:57:42 UTC (rev 66)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/gui/DisplayContainer_GeomAndGrid.java	2009-11-23 15:49:35 UTC (rev 67)
@@ -80,10 +80,10 @@
     if (map != null) {
       // aktuelle Darstellung (Position/Zoom) merken, um nachher den
       // das neue Layer in diesen Einstellungen anzuzeigen
-      com.vividsolutions.jts.geom.Envelope oldArea = ( map.getContext().getLayerCount() > 0 ) ? map.getMapArea() : null;
+      com.vividsolutions.jts.geom.Envelope oldArea = ( map.getMapContext().getLayerCount() > 0 ) ? map.getMapArea() : null;
       com.vividsolutions.jts.geom.Envelope newArea = null;
       // alte Layer entfernen
-      map.getContext().clearLayerList();
+      map.getMapContext().clearLayerList();
 
       // neues Layer einfuegen
       if ( data instanceof GridCoverage2D ) {
@@ -99,7 +99,7 @@
         rasterSymb.setColorMap( colMap );
 
         Style rasterStyle = builder.createStyle( rasterSymb );
-        map.getContext().addLayer( (GridCoverage2D) data, rasterStyle );
+        map.getMapContext().addLayer( (GridCoverage2D) data, rasterStyle );
 
 // Versuch, die Farbe nachtraeglich zu aktualisieren:
 //        colMap  = builder.createColorMap(
@@ -124,7 +124,7 @@
         // ###### FEATURECOLLECTION ######
         FeatureCollection fc      = (FeatureCollection) data;
         Style             fcStyle = FeatureUtil.createDefaultStyle(fc);
-        map.getContext().addLayer( fc, fcStyle );
+        map.getMapContext().addLayer( fc, fcStyle );
         // neuer Anzeigebereich: Die komplette FeatureCollection
         newArea = (fc.getBounds());
       }

Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java	2009-11-19 09:57:42 UTC (rev 66)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java	2009-11-23 15:49:35 UTC (rev 67)
@@ -123,7 +123,7 @@
     // -> Editor-Layer entfernen
     // -> neues Layer als Xulu-Objekt neu in GTEditorTool
     //    einfuegen
-    editor.getContext().removeLayer( layer );
+    editor.getMapContext().removeLayer( layer );
     this.add(sfc, sfc.getDescription());
   }
   

Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java	2009-11-19 09:57:42 UTC (rev 66)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java	2009-11-23 15:49:35 UTC (rev 67)
@@ -388,7 +388,7 @@
     public UpdateListener(GTVisualisationTool tool, Object obj, MapLayer[] layer) {
       super(tool,obj);
       this.layer = layer;
-      this.mapContext = tool.layeredMapPane.getMapPane().getContext();
+      this.mapContext = tool.layeredMapPane.getMapPane().getMapContext();
     }
 
     /**