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

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-11-05 09:53:41 +0100 (Thu, 05 Nov 2009)
New Revision: 64

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
Log:
new XMapPane and SelectableMapPane to replace and restructure JMapPanes




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-10-26 15:05:38 UTC (rev 63)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/gui/DisplayContainer_GeomAndGrid.java	2009-11-05 08:53:41 UTC (rev 64)
@@ -23,7 +23,7 @@
 import org.opengis.geometry.Envelope;
 
 import schmitzm.geotools.feature.FeatureUtil;
-import schmitzm.geotools.gui.JMapPane;
+import schmitzm.geotools.gui.SelectableXMapPane;
 import schmitzm.swing.ObjectDisplayContainer;
 
 /**
@@ -33,12 +33,12 @@
  * <li>{@link GridCoverage2D}</li>
  * <li>{@link FeatureCollection}</li>
  * </ul>
- * @see JMapPane
+ * @see SelectableXMapPane
  * @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
  * @version 1.0
  */
 public class DisplayContainer_GeomAndGrid extends ObjectDisplayContainer {
-  private JMapPane map = null;
+  private SelectableXMapPane map = null;
 
   /**
    * Erzeugt eine neue Darstellungskomponente.
@@ -55,7 +55,7 @@
   public DisplayContainer_GeomAndGrid(Object data) {
     super();
     this.setLayout(new BorderLayout());
-    this.map = new JMapPane();
+    this.map = new SelectableXMapPane();
     this.map.setSize(100,100);
     this.add(map, BorderLayout.CENTER);
     this.doLayout();
@@ -130,7 +130,6 @@
       }
 
       map.setMapArea( newArea );
-      map.setReset(true);
       map.repaint();
 
     }

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-10-26 15:05:38 UTC (rev 63)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java	2009-11-05 08:53:41 UTC (rev 64)
@@ -20,7 +20,7 @@
 import schmitzm.geotools.gui.JEditorPane;
 import schmitzm.geotools.gui.LayeredEditorFrame;
 import schmitzm.geotools.gui.LayeredMapPane;
-import schmitzm.geotools.map.event.JMapPaneEvent;
+import schmitzm.geotools.map.event.MapPaneEvent;
 import schmitzm.geotools.map.event.JMapPaneListener;
 import schmitzm.geotools.map.event.LayerEditFinishedEvent;
 import edu.bonn.xulu.XuluModellingPlatform;
@@ -52,7 +52,6 @@
                         new JEditorPane(),
                         null,
                         null,
-                        null,
                         null
                     )
                 )
@@ -77,7 +76,7 @@
    * Lauscht auf das {@link JEditorPane}, um nach Beendigung eines Layers,
    * dieses in den Xulu-Datenpool einzufuegen. 
    */
-  public void performMapPaneEvent(JMapPaneEvent e) {
+  public void performMapPaneEvent(MapPaneEvent e) {
     try {
       if ( e instanceof LayerEditFinishedEvent ) {
         LayerEditFinishedEvent lefe   = (LayerEditFinishedEvent)e;