[Schmitzm-commits] r589 - branches/1.0-gt2-2.6/src/schmitzm/geotools/gui

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-11-26 15:35:53 +0100 (Thu, 26 Nov 2009)
New Revision: 589

Modified:
   branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionFilterPanel.java
Log:
Since the geomPrev is optional now, we need some checks in #showFeaturesInMap to avoid NPE

Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionFilterPanel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionFilterPanel.java	2009-11-26 14:35:04 UTC (rev 588)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionFilterPanel.java	2009-11-26 14:35:53 UTC (rev 589)
@@ -296,9 +296,11 @@
 				protected void initGUI(boolean geomPreview) {
 					super.initGUI(geomPreview);
 
-					mapPane
-							.setToolTipText(GeotoolsGUIUtil
-									.R(FeatureCollectionFilterPanel.PREVIEW_MAPPANE_TOOLTIP));
+					if (geomPreview){
+						mapPane
+						.setToolTipText(GeotoolsGUIUtil
+								.R(FeatureCollectionFilterPanel.PREVIEW_MAPPANE_TOOLTIP));
+					}
 
 					// nur einzelne Zellen duerfen selektiert werden
 					featuresTable.setColumnSelectionAllowed(true);
@@ -356,6 +358,8 @@
 				 * feature collection (which is rendered in gray).
 				 */
 				protected void showFeaturesInMap() {
+					
+					if (geomPrev == false) return;
 
 					if (getPreviewPanel() == null)
 						return;