/[schmitzm]/branches/2.2.x/src/skrueger/geotools/MapView.java
ViewVC logotype

Diff of /branches/2.2.x/src/skrueger/geotools/MapView.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

branches/1.0-gt2-2.6/src/skrueger/geotools/MapView.java revision 414 by alfonx, Thu Sep 24 13:23:08 2009 UTC branches/2.2.x/src/skrueger/geotools/MapView.java revision 897 by alfonx, Mon Jun 7 14:14:39 2010 UTC
# Line 25  Line 25 
25   *   *
26   * Contributors:   * Contributors:
27   *     Martin O. J. Schmitz - initial API and implementation   *     Martin O. J. Schmitz - initial API and implementation
28   *     Stefan A. Krüger - additional utility classes   *     Stefan A. Tzeggai - additional utility classes
29   ******************************************************************************/   ******************************************************************************/
30  package skrueger.geotools;  package skrueger.geotools;
31    
# Line 37  import javax.swing.JComponent; Line 37  import javax.swing.JComponent;
37  import javax.swing.JPanel;  import javax.swing.JPanel;
38  import javax.swing.JSplitPane;  import javax.swing.JSplitPane;
39    
40    import net.miginfocom.swing.MigLayout;
41    
42  import org.apache.log4j.Logger;  import org.apache.log4j.Logger;
43    
44  import schmitzm.geotools.gui.GeoMapPane;  import schmitzm.geotools.gui.GeoMapPane;
 import schmitzm.geotools.gui.JMapPane;  
45  import schmitzm.geotools.gui.MapContextControlPane;  import schmitzm.geotools.gui.MapContextControlPane;
46  import schmitzm.geotools.gui.MapPaneStatusBar;  import schmitzm.geotools.gui.MapPaneStatusBar;
47    import schmitzm.geotools.gui.SelectableXMapPane;
48  import schmitzm.geotools.styling.ColorMapManager;  import schmitzm.geotools.styling.ColorMapManager;
49    
50  /**  /**
# Line 69  public class MapView extends JPanel { Line 71  public class MapView extends JPanel {
71          /**          /**
72           * Creates a new {@link MapView}. A {@link MapView} is a combination of a           * Creates a new {@link MapView}. A {@link MapView} is a combination of a
73           * {@link GeoMapPane}, a {@link MapContextManagerInterface} on the left, and           * {@link GeoMapPane}, a {@link MapContextManagerInterface} on the left, and
74           * some buttons floating over the {@link JMapPane}           * some buttons floating over the {@link SelectableXMapPane}
75           */           */
76          public MapView(Component parentGui, MapPaneToolBar toolBar) {          public MapView(Component parentGui, MapPaneToolBar toolBar) {
77                  super(new BorderLayout());                  super(new BorderLayout());
78                  // Call initialize() by yourself afterwards.                  // Call initialize() by yourself afterwards.
79                  // Needed because variables for the overwritten methods                  // Needed because variables for the overwritten methods
80                  // are not yet set.                  // are not yet set.
                 getGeoMapPane().getMapPane().setWaitCursorComponent(parentGui);  
81                  jToolBar = toolBar;                  jToolBar = toolBar;
82          }          }
83    
84          /**          /**
85           * Creates a new {@link MapView}. A {@link MapView} is a combination of a           * Creates a new {@link MapView}. A {@link MapView} is a combination of a
86           * {@link GeoMapPane}, a {@link MapContextManagerInterface} on the left, and           * {@link GeoMapPane}, a {@link MapContextManagerInterface} on the left, and
87           * some buttons floating over the {@link JMapPane}           * some buttons floating over the {@link SelectableXMapPane}
88           */           */
89          public MapView(Component parentGui) {          public MapView(Component parentGui) {
90                  this(parentGui, null);                  this(parentGui, null);
# Line 123  public class MapView extends JPanel { Line 124  public class MapView extends JPanel {
124                   * To the right side we now add a JPanel that consists of a toolbar and                   * To the right side we now add a JPanel that consists of a toolbar and
125                   * a gmp                   * a gmp
126                   */                   */
127                  JPanel newRight = new JPanel(new BorderLayout());                  JPanel newRight = new JPanel(new MigLayout("center, wrap 1","[grow]","[][grow]"));
128                  newRight.add(getToolBar(), BorderLayout.NORTH);                  newRight.add(getToolBar());
129                  newRight.add(getGeoMapPane(), BorderLayout.CENTER);                  newRight.add(getGeoMapPane(),"growx, growy");
130                  getSplitPane().add(newRight);                  getSplitPane().add(newRight);
131    
132                  this.add(getSplitPane(), BorderLayout.CENTER);                  this.add(getSplitPane(), BorderLayout.CENTER);
133                    
134          }          }
135    
136          /**          /**
# Line 224  public class MapView extends JPanel { Line 226  public class MapView extends JPanel {
226          /**          /**
227           * Liefert den Karten-Bereich der Komponente.           * Liefert den Karten-Bereich der Komponente.
228           */           */
229          public final JMapPane getMapPane() {          public final SelectableXMapPane getMapPane() {
230                  return getGeoMapPane().getMapPane();                  return getGeoMapPane().getMapPane();
231          }          }
232    
# Line 236  public class MapView extends JPanel { Line 238  public class MapView extends JPanel {
238                  return jToolBar.getSelectedTool();                  return jToolBar.getSelectedTool();
239          }          }
240    
241            /**
242             * Help the garbage collection
243             */
244            public void dispose() {
245                    if (geoMapPane != null)
246                            geoMapPane.dispose();
247            }
248    
249  }  }
Legend:
Removed from v.414  
changed lines
  Added in v.897
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26