[Schmitzm-commits] r1055 - in branches/2.2.x/src: schmitzm/data schmitzm/geotools/feature schmitzm/geotools/gui schmitzm/geotools/map/event schmitzm/geotools/styling schmitzm/io schmitzm/lang/tree skrueger/geotools
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Sep 23 19:38:34 CEST 2010
Author: alfonx
Date: 2010-09-23 19:38:23 +0200 (Thu, 23 Sep 2010)
New Revision: 1055
Modified:
branches/2.2.x/src/schmitzm/data/RasterOperationTree.java
branches/2.2.x/src/schmitzm/geotools/feature/FeatureOperationTree.java
branches/2.2.x/src/schmitzm/geotools/gui/MouseSelectionTracker.java
branches/2.2.x/src/schmitzm/geotools/gui/SelectableFeatureTablePane.java
branches/2.2.x/src/schmitzm/geotools/gui/XMapPaneActionDraggingAdapter.java
branches/2.2.x/src/schmitzm/geotools/map/event/JEditorPaneEvent.java
branches/2.2.x/src/schmitzm/geotools/styling/StylingUtil.java
branches/2.2.x/src/schmitzm/io/IOUtil.java
branches/2.2.x/src/schmitzm/lang/tree/OperationTree.java
branches/2.2.x/src/skrueger/geotools/StyledFeatureCollectionTableModel.java
Log:
Improved Path readability under windows by adding to IOUtil:
/**
* Bereinigt Pfadangaben, z.b. "C:\Programme" zu "C:\\Programme" und
* "Eigene%20Dateien" zu "Eigene Dateien"
*/
public static String escapePath(String path) {
if (path == null) return "";
path = path.replace("\\", "\\\\");
path = path.replace("%20", " ");
return path;
}
/**
* Liefert eine bereinigt Absolute-Pfadangaben, z.b. "C:\Programme" zu "C:\\Programme" und
* "Eigene%20Dateien" zu "Eigene Dateien"
*/
public static String escapePath(File file) {
if (file == null) return "";
return escapePath(file.getAbsolutePath());
}
Modified: branches/2.2.x/src/schmitzm/data/RasterOperationTree.java
===================================================================
--- branches/2.2.x/src/schmitzm/data/RasterOperationTree.java 2010-09-23 17:37:48 UTC (rev 1054)
+++ branches/2.2.x/src/schmitzm/data/RasterOperationTree.java 2010-09-23 17:38:23 UTC (rev 1055)
@@ -29,6 +29,8 @@
******************************************************************************/
package schmitzm.data;
+import schmitzm.data.RasterOperationTree.FilterReferenceNode;
+import schmitzm.data.RasterOperationTree.RasterReferenceNode;
import schmitzm.lang.tree.BinaryTreeNode;
import schmitzm.lang.tree.OperationTree;
import schmitzm.lang.tree.TreeNode;
Modified: branches/2.2.x/src/schmitzm/geotools/feature/FeatureOperationTree.java
===================================================================
--- branches/2.2.x/src/schmitzm/geotools/feature/FeatureOperationTree.java 2010-09-23 17:37:48 UTC (rev 1054)
+++ branches/2.2.x/src/schmitzm/geotools/feature/FeatureOperationTree.java 2010-09-23 17:38:23 UTC (rev 1055)
@@ -31,6 +31,8 @@
import org.opengis.feature.simple.SimpleFeature;
+import schmitzm.geotools.feature.FeatureOperationTree.AttributeIndexReferenceNode;
+import schmitzm.geotools.feature.FeatureOperationTree.AttributeNameReferenceNode;
import schmitzm.lang.tree.BinaryTreeNode;
import schmitzm.lang.tree.OperationTree;
import schmitzm.lang.tree.TreeNode;
Modified: branches/2.2.x/src/schmitzm/geotools/gui/MouseSelectionTracker.java
===================================================================
--- branches/2.2.x/src/schmitzm/geotools/gui/MouseSelectionTracker.java 2010-09-23 17:37:48 UTC (rev 1054)
+++ branches/2.2.x/src/schmitzm/geotools/gui/MouseSelectionTracker.java 2010-09-23 17:38:23 UTC (rev 1055)
@@ -31,6 +31,8 @@
import java.awt.event.MouseEvent;
+import schmitzm.geotools.gui.MouseSelectionTracker.SelectionMode;
+
/**
* Extends the geotools {@link org.geotools.swing.MouseSelectionTracker} with an
* enable/disable functionality. Furthermore the tracker (optionally)
Modified: branches/2.2.x/src/schmitzm/geotools/gui/SelectableFeatureTablePane.java
===================================================================
--- branches/2.2.x/src/schmitzm/geotools/gui/SelectableFeatureTablePane.java 2010-09-23 17:37:48 UTC (rev 1054)
+++ branches/2.2.x/src/schmitzm/geotools/gui/SelectableFeatureTablePane.java 2010-09-23 17:38:23 UTC (rev 1055)
@@ -46,8 +46,8 @@
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.JToolBar;
+import javax.swing.RowSorter.SortKey;
import javax.swing.SortOrder;
-import javax.swing.RowSorter.SortKey;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
Modified: branches/2.2.x/src/schmitzm/geotools/gui/XMapPaneActionDraggingAdapter.java
===================================================================
--- branches/2.2.x/src/schmitzm/geotools/gui/XMapPaneActionDraggingAdapter.java 2010-09-23 17:37:48 UTC (rev 1054)
+++ branches/2.2.x/src/schmitzm/geotools/gui/XMapPaneActionDraggingAdapter.java 2010-09-23 17:38:23 UTC (rev 1055)
@@ -33,7 +33,6 @@
import java.awt.Color;
import java.awt.Point;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseWheelEvent;
import org.opengis.geometry.DirectPosition;
Modified: branches/2.2.x/src/schmitzm/geotools/map/event/JEditorPaneEvent.java
===================================================================
--- branches/2.2.x/src/schmitzm/geotools/map/event/JEditorPaneEvent.java 2010-09-23 17:37:48 UTC (rev 1054)
+++ branches/2.2.x/src/schmitzm/geotools/map/event/JEditorPaneEvent.java 2010-09-23 17:38:23 UTC (rev 1055)
@@ -32,8 +32,8 @@
import org.geotools.map.MapLayer;
import schmitzm.geotools.gui.JMapEditorPane;
+import schmitzm.geotools.gui.JMapEditorPane.EditorMode;
import schmitzm.geotools.gui.XMapPaneEvent;
-import schmitzm.geotools.gui.JMapEditorPane.EditorMode;
/**
* Diese Klasse stellt ein allgemeines Ereignis dar, das ein
Modified: branches/2.2.x/src/schmitzm/geotools/styling/StylingUtil.java
===================================================================
--- branches/2.2.x/src/schmitzm/geotools/styling/StylingUtil.java 2010-09-23 17:37:48 UTC (rev 1054)
+++ branches/2.2.x/src/schmitzm/geotools/styling/StylingUtil.java 2010-09-23 17:38:23 UTC (rev 1055)
@@ -70,7 +70,6 @@
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.GeometryAttributeType;
import org.geotools.filter.AndImpl;
-import org.geotools.filter.AttributeExpressionImpl;
import org.geotools.filter.BinaryComparisonAbstract;
import org.geotools.filter.ConstantExpression;
import org.geotools.filter.FilterAttributeExtractor;
Modified: branches/2.2.x/src/schmitzm/io/IOUtil.java
===================================================================
--- branches/2.2.x/src/schmitzm/io/IOUtil.java 2010-09-23 17:37:48 UTC (rev 1054)
+++ branches/2.2.x/src/schmitzm/io/IOUtil.java 2010-09-23 17:38:23 UTC (rev 1055)
@@ -774,4 +774,26 @@
return false;
}
}
+
+
+ /**
+ * Bereinigt Pfadangaben, z.b. "C:\Programme" zu "C:\\Programme" und
+ * "Eigene%20Dateien" zu "Eigene Dateien"
+ */
+
+ public static String escapePath(String path) {
+ if (path == null) return "";
+ path = path.replace("\\", "\\\\");
+ path = path.replace("%20", " ");
+ return path;
+ }
+
+ /**
+ * Liefert eine bereinigt Absolute-Pfadangaben, z.b. "C:\Programme" zu "C:\\Programme" und
+ * "Eigene%20Dateien" zu "Eigene Dateien"
+ */
+ public static String escapePath(File file) {
+ if (file == null) return "";
+ return escapePath(file.getAbsolutePath());
+ }
}
Modified: branches/2.2.x/src/schmitzm/lang/tree/OperationTree.java
===================================================================
--- branches/2.2.x/src/schmitzm/lang/tree/OperationTree.java 2010-09-23 17:37:48 UTC (rev 1054)
+++ branches/2.2.x/src/schmitzm/lang/tree/OperationTree.java 2010-09-23 17:38:23 UTC (rev 1055)
@@ -35,6 +35,11 @@
import org.apache.log4j.Logger;
import schmitzm.lang.LangUtil;
+import schmitzm.lang.tree.OperationTree.ConstantAliasNode;
+import schmitzm.lang.tree.OperationTree.ConstantNode;
+import schmitzm.lang.tree.OperationTree.ITENode;
+import schmitzm.lang.tree.OperationTree.OperatorNode;
+import schmitzm.lang.tree.OperationTree.UnaryOperatorNode;
/**
* Diese Klasse stellt einen Operator-Baum dar. Dieser unterstuetzt folgende
Modified: branches/2.2.x/src/skrueger/geotools/StyledFeatureCollectionTableModel.java
===================================================================
--- branches/2.2.x/src/skrueger/geotools/StyledFeatureCollectionTableModel.java 2010-09-23 17:37:48 UTC (rev 1054)
+++ branches/2.2.x/src/skrueger/geotools/StyledFeatureCollectionTableModel.java 2010-09-23 17:38:23 UTC (rev 1055)
@@ -32,7 +32,6 @@
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Vector;
import org.apache.log4j.Logger;
import org.geotools.data.DefaultQuery;
More information about the Schmitzm-commits
mailing list