[Schmitzm-commits] r1466 - in trunk: schmitzm-core schmitzm-gt/src/main/java/de/schmitzm/geotools schmitzm-gt/src/main/java/de/schmitzm/geotools/gui schmitzm-gt/src/main/java/de/schmitzm/geotools/io
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Jan 28 00:58:56 CET 2011
Author: alfonx
Date: 2011-01-28 00:58:55 +0100 (Fri, 28 Jan 2011)
New Revision: 1466
Modified:
trunk/schmitzm-core/pom.xml
trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/GTUtil.java
trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/CRSSelectionDialog.java
trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/ColorMapPanel.java
trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/FeatureInputOption.java
trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/FeatureTypeInputOption.java
trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/JMapEditorPane.java
trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/StyleToolBar.java
trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtDbServerSettings.java
trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtWfsServerSettings.java
Log:
commons-lang auf 2.3 downgegraded, weil die version von geotools kommt
Modified: trunk/schmitzm-core/pom.xml
===================================================================
--- trunk/schmitzm-core/pom.xml 2011-01-27 20:38:28 UTC (rev 1465)
+++ trunk/schmitzm-core/pom.xml 2011-01-27 23:58:55 UTC (rev 1466)
@@ -97,9 +97,11 @@
</dependency>
-->
<dependency>
+<!-- Kommt in version 2.3 von gt-swing und sonst verwirren die zwei versionene den gp export -->
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <version>2.3</version>
+<!-- <version>2.4</version>-->
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/GTUtil.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/GTUtil.java 2011-01-27 20:38:28 UTC (rev 1465)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/GTUtil.java 2011-01-27 23:58:55 UTC (rev 1466)
@@ -67,6 +67,7 @@
import de.schmitzm.swing.input.ManualInputOption;
import de.schmitzm.swing.input.ManualInputOption.Text;
+
/**
* Diese Klasse enthaelt allgemeine Funktionen fuer die Arbeit mit Geotools.
*
Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/CRSSelectionDialog.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/CRSSelectionDialog.java 2011-01-27 20:38:28 UTC (rev 1465)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/CRSSelectionDialog.java 2011-01-27 23:58:55 UTC (rev 1466)
@@ -62,11 +62,11 @@
import de.schmitzm.lang.ResourceProvider;
import de.schmitzm.swing.ButtonGroup;
import de.schmitzm.swing.ExceptionDialog;
-import de.schmitzm.swing.input.InputOption;
import de.schmitzm.swing.JPanel;
import de.schmitzm.swing.StatusDialog;
import de.schmitzm.swing.SwingUtil;
import de.schmitzm.swing.SwingWorker;
+import de.schmitzm.swing.input.InputOption;
import de.schmitzm.swing.input.InputOptionAdapter;
import de.schmitzm.swing.input.SelectionInputOption;
Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/ColorMapPanel.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/ColorMapPanel.java 2011-01-27 20:38:28 UTC (rev 1465)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/ColorMapPanel.java 2011-01-27 23:58:55 UTC (rev 1466)
@@ -36,8 +36,8 @@
import org.geotools.styling.ColorMap;
+import de.schmitzm.swing.JPanel;
import de.schmitzm.swing.input.InputOption;
-import de.schmitzm.swing.JPanel;
import de.schmitzm.swing.input.InputOptionAdapter;
import de.schmitzm.swing.input.SelectionInputOption;
Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/FeatureInputOption.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/FeatureInputOption.java 2011-01-27 20:38:28 UTC (rev 1465)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/FeatureInputOption.java 2011-01-27 23:58:55 UTC (rev 1466)
@@ -36,8 +36,8 @@
import org.opengis.feature.simple.SimpleFeatureType;
import de.schmitzm.geotools.feature.FeatureTableModel;
+import de.schmitzm.swing.SwingUtil;
import de.schmitzm.swing.input.InputOption;
-import de.schmitzm.swing.SwingUtil;
import de.schmitzm.swing.input.MultipleOptionPane;
/**
Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/FeatureTypeInputOption.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/FeatureTypeInputOption.java 2011-01-27 20:38:28 UTC (rev 1465)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/FeatureTypeInputOption.java 2011-01-27 23:58:55 UTC (rev 1466)
@@ -35,8 +35,8 @@
import org.opengis.feature.simple.SimpleFeatureType;
import de.schmitzm.geotools.feature.FeatureTypeBuilderTableModel;
+import de.schmitzm.swing.SwingUtil;
import de.schmitzm.swing.input.InputOption;
-import de.schmitzm.swing.SwingUtil;
import de.schmitzm.swing.input.MultipleOptionPane;
import de.schmitzm.swing.table.MutableTable;
Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/JMapEditorPane.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/JMapEditorPane.java 2011-01-27 20:38:28 UTC (rev 1465)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/JMapEditorPane.java 2011-01-27 23:58:55 UTC (rev 1466)
@@ -70,8 +70,8 @@
import de.schmitzm.geotools.map.event.LayerEditFinishedEvent;
import de.schmitzm.geotools.map.event.LayerEditStartedEvent;
import de.schmitzm.geotools.map.event.MapContextSynchronizer;
+import de.schmitzm.swing.event.MouseInputType;
import de.schmitzm.swing.input.InputOption;
-import de.schmitzm.swing.event.MouseInputType;
import de.schmitzm.swing.input.MultipleOptionPane;
Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/StyleToolBar.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/StyleToolBar.java 2011-01-27 20:38:28 UTC (rev 1465)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/gui/StyleToolBar.java 2011-01-27 23:58:55 UTC (rev 1466)
@@ -42,9 +42,9 @@
import org.geotools.styling.StyleBuilder;
import de.schmitzm.geotools.feature.FeatureUtil;
-import de.schmitzm.swing.input.InputOption;
import de.schmitzm.swing.SwingUtil;
import de.schmitzm.swing.input.ColorInputOption;
+import de.schmitzm.swing.input.InputOption;
import de.schmitzm.swing.input.InputOptionListener;
import de.schmitzm.swing.input.SelectionInputOption;
Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtDbServerSettings.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtDbServerSettings.java 2011-01-27 20:38:28 UTC (rev 1465)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtDbServerSettings.java 2011-01-27 23:58:55 UTC (rev 1466)
@@ -19,10 +19,10 @@
import de.schmitzm.geotools.postgres.PGUtil;
import de.schmitzm.swing.input.BooleanInputOption;
import de.schmitzm.swing.input.ManualInputOption;
+import de.schmitzm.swing.input.ManualInputOption.PasswordViewable;
+import de.schmitzm.swing.input.ManualInputOption.Text;
import de.schmitzm.swing.input.MultipleOptionPane;
import de.schmitzm.swing.input.SelectionInputOption;
-import de.schmitzm.swing.input.ManualInputOption.PasswordViewable;
-import de.schmitzm.swing.input.ManualInputOption.Text;
import de.schmitzm.swing.input.SelectionInputOption.Combo;
/**
Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtWfsServerSettings.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtWfsServerSettings.java 2011-01-27 20:38:28 UTC (rev 1465)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtWfsServerSettings.java 2011-01-27 23:58:55 UTC (rev 1466)
@@ -14,10 +14,10 @@
import de.schmitzm.lang.LangUtil;
import de.schmitzm.swing.input.BooleanInputOption;
import de.schmitzm.swing.input.ManualInputOption;
+import de.schmitzm.swing.input.ManualInputOption.PasswordViewable;
+import de.schmitzm.swing.input.ManualInputOption.Text;
import de.schmitzm.swing.input.MultipleOptionPane;
import de.schmitzm.swing.input.SelectionInputOption;
-import de.schmitzm.swing.input.ManualInputOption.PasswordViewable;
-import de.schmitzm.swing.input.ManualInputOption.Text;
import de.schmitzm.swing.input.SelectionInputOption.Combo;
/**
More information about the Schmitzm-commits
mailing list