Sun Feb 24 21:10:35 CET 2013

Author: alfonx
Date: 2013-02-24 21:10:35 +0100 (Sun, 24 Feb 2013)
New Revision: 2252

Modified:
   trunk/schmitzm-core/pom.xml
   trunk/schmitzm-core/src/main/java/de/schmitzm/io/SMTPSettings.java
   trunk/schmitzm-core/src/main/java/de/schmitzm/lang/WindowsRegistry.java
   trunk/schmitzm-core/src/main/java/de/schmitzm/net/mail/Pop3Client.java
   trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ButtonGroup.java
   trunk/schmitzm-core/src/main/java/de/schmitzm/swing/JToggleButtonLabel.java
   trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ListMaintainanceDialog.java
   trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SMTPSettingsPanel.java
   trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SwingUtil.java
   trunk/schmitzm-core/src/main/java/de/schmitzm/swing/table/ComponentRenderer.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/net/mail/MailUtilTest.java
   trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/selection/FeatureMapLayerSelectionSynchronizer.java
   trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/GTUtilTest.java
   trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/feature/FeatureComparatorTest.java
   trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/feature/FeatureUtilTest.java
   trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/grid/GridUtilTest.java
   trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/GridPanelFormatterTest.java
   trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/JMapEditorToolBarTest.java
   trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/MapActionControlPaneTest.java
   trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/ScalePanelTest.java
   trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/XMapPaneTest.java
   trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/io/GeoImportUtilTest.java
   trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/styling/StylingUtilTest.java
   trunk/schmitzm-jfree-gt/src/test/java/de/schmitzm/jfree/feature/style/FeatureChartStyleTest.java
   trunk/schmitzm-regex/
   trunk/schmitzm-regex/pom.xml
   trunk/schmitzm-regex/src/main/java/de/schmitzm/regex/RegexCache.java
   trunk/schmitzm-regex/src/test/java/de/schmitzm/regex/RegexCacheTest.java
Log:
Dependency zu "eaio-string-search" entfernt...

Modified: trunk/schmitzm-core/pom.xml
===================================================================

--- trunk/schmitzm-core/pom.xml	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-core/pom.xml	2013-02-24 20:10:35 UTC (rev 2252)
@@ -18,12 +18,6 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>com.eaio.stringsearch</groupId>
-			<artifactId>stringsearch</artifactId>
-			<version>2</version>
-		</dependency>
-
-		<dependency>
 			<groupId>javax.media</groupId>
 			<artifactId>jai_core</artifactId>
 			<version>1.1.3</version>
@@ -155,13 +149,6 @@
 
 	</build>
 
-	<repositories>
-		<repository>
-			<id>eaio.com</id>
-			<url>http://eaio.com/maven2</url>
-		</repository>
-	</repositories>
-
 	<profiles>
 		<profile>
 			<id>resourceOperationRemove</id>

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/io/SMTPSettings.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/io/SMTPSettings.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/io/SMTPSettings.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -29,11 +29,6 @@
  */
 package de.schmitzm.io;
 
-import java.io.IOException;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
-
 import org.apache.log4j.Logger;
 
 /**

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/lang/WindowsRegistry.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/lang/WindowsRegistry.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/lang/WindowsRegistry.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -39,10 +39,10 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.prefs.Preferences;
 
 /**

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/net/mail/Pop3Client.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/net/mail/Pop3Client.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/net/mail/Pop3Client.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -35,7 +35,6 @@
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.MessagingException;
-import javax.mail.NoSuchProviderException;
 import javax.mail.Session;
 import javax.mail.Store;
 

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ButtonGroup.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ButtonGroup.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ButtonGroup.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -31,10 +31,6 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.util.HashMap;
-import java.util.Map;
 
 import javax.swing.AbstractButton;
 import javax.swing.ButtonModel;

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/swing/JToggleButtonLabel.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/swing/JToggleButtonLabel.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/swing/JToggleButtonLabel.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -35,7 +35,6 @@
 
 import javax.swing.BorderFactory;
 import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JRadioButton;
 import javax.swing.JToggleButton;

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ListMaintainanceDialog.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ListMaintainanceDialog.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ListMaintainanceDialog.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -33,7 +33,6 @@
 import java.awt.Dialog;
 import java.awt.event.ActionEvent;
 
-import javax.swing.JButton;
 import javax.swing.JFrame;
 
 /**

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SMTPSettingsPanel.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SMTPSettingsPanel.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SMTPSettingsPanel.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -29,10 +29,7 @@
  */
 package de.schmitzm.swing;
 
-import java.net.Proxy;
-import java.net.Proxy.Type;
 import java.util.List;
-import java.util.concurrent.Semaphore;
 
 import javax.swing.JLabel;
 
@@ -40,16 +37,11 @@
 
 import org.apache.log4j.Logger;
 
-import de.schmitzm.io.ConnectionSettings;
-import de.schmitzm.io.IOUtil;
 import de.schmitzm.io.SMTPSettings;
 import de.schmitzm.lang.LangUtil;
 import de.schmitzm.swing.input.BooleanInputOption;
 import de.schmitzm.swing.input.InputOption;
-import de.schmitzm.swing.input.InputOptionAdapter;
 import de.schmitzm.swing.input.ManualInputOption;
-import de.schmitzm.swing.input.ManualInputOption.Text;
-import de.schmitzm.swing.input.SelectionInputOption;
 
 /**
  * Panel to specify SMTP server settings:

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SwingUtil.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SwingUtil.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SwingUtil.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -85,7 +85,6 @@
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JApplet;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JComboBox;

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/swing/table/ComponentRenderer.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/swing/table/ComponentRenderer.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/swing/table/ComponentRenderer.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -32,8 +32,6 @@
 import java.awt.Component;
 
 import javax.swing.AbstractButton;
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.SwingConstants;

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/net/mail/MailUtilTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/net/mail/MailUtilTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/net/mail/MailUtilTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,8 +1,6 @@
 package de.schmitzm.net.mail;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.net.URL;

Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/selection/FeatureMapLayerSelectionSynchronizer.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/selection/FeatureMapLayerSelectionSynchronizer.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/selection/FeatureMapLayerSelectionSynchronizer.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -50,10 +50,6 @@
 import java.util.Set;
 import java.util.Vector;
 
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListSelectionListener;
-
 import org.geotools.feature.FeatureCollection;
 import org.geotools.feature.FeatureIterator;
 import org.geotools.filter.FidFilterImpl;
@@ -61,6 +57,7 @@
 import org.geotools.styling.FeatureTypeStyle;
 import org.geotools.styling.Style;
 import org.geotools.styling.visitor.DuplicatingStyleVisitor;
+import org.geotools.swing.JMapPane;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.opengis.filter.Filter;

Modified: trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/GTUtilTest.java
===================================================================
--- trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/GTUtilTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/GTUtilTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,7 +1,6 @@
 package de.schmitzm.geotools;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 

Modified: trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/feature/FeatureComparatorTest.java
===================================================================
--- trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/feature/FeatureComparatorTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/feature/FeatureComparatorTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,7 +1,6 @@
 package de.schmitzm.geotools.feature;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.util.Iterator;
 import java.util.Vector;

Modified: trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/feature/FeatureUtilTest.java
===================================================================
--- trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/feature/FeatureUtilTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/feature/FeatureUtilTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,10 +1,6 @@
 package de.schmitzm.geotools.feature;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.util.HashSet;

Modified: trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/grid/GridUtilTest.java
===================================================================
--- trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/grid/GridUtilTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/grid/GridUtilTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,6 +1,6 @@
 package de.schmitzm.geotools.grid;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.awt.Color;
 import java.io.IOException;

Modified: trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/GridPanelFormatterTest.java
===================================================================
--- trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/GridPanelFormatterTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/GridPanelFormatterTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,6 +1,6 @@
 package de.schmitzm.geotools.gui;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import org.junit.Before;
 import org.junit.Test;

Modified: trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/JMapEditorToolBarTest.java
===================================================================
--- trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/JMapEditorToolBarTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/JMapEditorToolBarTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,7 +1,7 @@
 package de.schmitzm.geotools.gui;
 
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 import org.junit.After;
 import org.junit.Before;

Modified: trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/MapActionControlPaneTest.java
===================================================================
--- trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/MapActionControlPaneTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/MapActionControlPaneTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,7 +1,7 @@
 package de.schmitzm.geotools.gui;
 
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 

Modified: trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/ScalePanelTest.java
===================================================================
--- trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/ScalePanelTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/ScalePanelTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,6 +1,6 @@
 package de.schmitzm.geotools.gui;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 

Modified: trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/XMapPaneTest.java
===================================================================
--- trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/XMapPaneTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/gui/XMapPaneTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,7 +1,6 @@
 package de.schmitzm.geotools.gui;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.awt.Dimension;
 

Modified: trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/io/GeoImportUtilTest.java
===================================================================
--- trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/io/GeoImportUtilTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/io/GeoImportUtilTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,7 +1,6 @@
 package de.schmitzm.geotools.io;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.util.Iterator;

Modified: trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/styling/StylingUtilTest.java
===================================================================
--- trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/styling/StylingUtilTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-gt/src/test/java/de/schmitzm/geotools/styling/StylingUtilTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,10 +1,6 @@
 package de.schmitzm.geotools.styling;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -43,7 +39,6 @@
 import de.schmitzm.geotools.styling.StylingUtil.SelectionStylesTypes;
 import de.schmitzm.geotools.testing.GTTestingUtil;
 import de.schmitzm.io.IOUtil;
-import de.schmitzm.lang.LangUtil;
 import de.schmitzm.testing.TestingClass;
 import de.schmitzm.testing.TestingUtil;
 

Modified: trunk/schmitzm-jfree-gt/src/test/java/de/schmitzm/jfree/feature/style/FeatureChartStyleTest.java
===================================================================
--- trunk/schmitzm-jfree-gt/src/test/java/de/schmitzm/jfree/feature/style/FeatureChartStyleTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-jfree-gt/src/test/java/de/schmitzm/jfree/feature/style/FeatureChartStyleTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -1,9 +1,6 @@
 package de.schmitzm.jfree.feature.style;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.awt.Color;
 import java.awt.Font;


Property changes on: trunk/schmitzm-regex
___________________________________________________________________
Added: svn:ignore
   + bin

.settings

.classpath

.project


Modified: trunk/schmitzm-regex/pom.xml
===================================================================
--- trunk/schmitzm-regex/pom.xml	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-regex/pom.xml	2013-02-24 20:10:35 UTC (rev 2252)
@@ -7,22 +7,16 @@
 
 	<parent>
 		<groupId>de.schmitzm</groupId>
-		<artifactId>schmitzm-parent</artifactId>		
+		<artifactId>schmitzm-parent</artifactId>
 		<version>2.8-SNAPSHOT</version>
 		<relativePath>../schmitzm-parent/pom.xml</relativePath>
 	</parent>
 
 	<name>schmitzm-regex</name>
-	
+
 	<dependencies>
 
 		<dependency>
-			<groupId>com.eaio.stringsearch</groupId>
-			<artifactId>stringsearch</artifactId>
-			<version>2</version>
-		</dependency>
-
-		<dependency>
 			<artifactId>solr-core</artifactId>
 			<groupId>org.apache.solr</groupId>
 			<version>4.1.0</version>
@@ -44,15 +38,5 @@
 		</dependency>
 
 	</dependencies>
- 
 
-	<repositories>
-		<repository>
-			<id>eaio.com</id>
-			<url>http://eaio.com/maven2</url>
-		</repository>
-	</repositories>
-
-
-
 </project>

Modified: trunk/schmitzm-regex/src/main/java/de/schmitzm/regex/RegexCache.java
===================================================================
--- trunk/schmitzm-regex/src/main/java/de/schmitzm/regex/RegexCache.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-regex/src/main/java/de/schmitzm/regex/RegexCache.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -22,20 +22,6 @@
 	private static final String KEY_STRING_TRENNER = ":*:";
 
 	final static Logger log = Logger.getLogger(RegexCache.class);
-	//
-	// final static ThreadLocal<BNDM> bndms = new ThreadLocal<BNDM>() {
-	// @Override
-	// protected BNDM initialValue() {
-	// return new BNDM();
-	// }
-	// };
-	//
-	// final static ThreadLocal<BNDMCI> bndmcis = new ThreadLocal<BNDMCI>() {
-	// @Override
-	// protected BNDMCI initialValue() {
-	// return new BNDMCI();
-	// }
-	// };
 
 	/**
 	 * Regex-Auswertungen komplett cachen
@@ -118,46 +104,9 @@
 			return false;
 
 		final String value = object instanceof String ? (String) object : object.toString();
-
-		// Hier beginnt eine interessante Optimierung. Wenn der String keine Regex ist, und nicht länger 32, dann wird
-		// ein schnellere Stringsuche verwendet.
-		// boolean canSpeedup = true;
-		// boolean speedUpIgnorecase = true;
-		//
-		// if (regex.length() > 20)
-		// canSpeedup = false;
-		// else {
-		// String copy = regex;
-		// if (copy.startsWith("(?is)") || copy.startsWith("(?im)") || copy.startsWith("(?ims)")) {
-		// copy = copy.substring(5);
-		// speedUpIgnorecase = true;
-		// }
-		// if (copy.startsWith("^.*?")) {
-		// copy = copy.substring(4);
-		// }
-		// canSpeedup = !(looksLikeRegex(copy));
-		// }
-		//
-		// if (canSpeedup) {
-		//
-		// StringSearch bndm = speedUpIgnorecase ? bndmcis.get() : bndms.get();
-		// int searchString = bndm.searchString(value, regex);
-		//
-		// int idx = searchString;
-		// return idx >= 0;
-		// } else {
 		return result(regex, value) != null;
-		// }
 	}
 
-	String ERKENNE_REGEX_RX = "[\\[\\]()?\\\\+{}^$.]";
-
-	public boolean looksLikeRegex(final String suchString) {
-		// Kein "Matches()" hier verwenden sonst StackOverflow
-		// return matches(ERKENNE_REGEX_RX, regex);
-		return result(ERKENNE_REGEX_RX, suchString) != null;
-	}
-
 	/**
 	 * Will throw java exceptions when pattern won't compile.
 	 * 

Modified: trunk/schmitzm-regex/src/test/java/de/schmitzm/regex/RegexCacheTest.java
===================================================================
--- trunk/schmitzm-regex/src/test/java/de/schmitzm/regex/RegexCacheTest.java	2013-02-24 20:01:52 UTC (rev 2251)
+++ trunk/schmitzm-regex/src/test/java/de/schmitzm/regex/RegexCacheTest.java	2013-02-24 20:10:35 UTC (rev 2252)
@@ -5,17 +5,7 @@
 import org.junit.Test;
 
 public class RegexCacheTest {
-	@Test
-	public void testLooksLikeRegex() {
-		RegexCache rC = RegexCache.getInstance();
 
-		assertTrue(rC.looksLikeRegex("^Brezeln"));
-		assertTrue(rC.looksLikeRegex("Um mit (?:dir|das) Brezeln"));
-		assertTrue(rC.looksLikeRegex("Um mit [asd] Brezeln"));
-		assertTrue(rC.looksLikeRegex("Gastst.tte"));
-		assertFalse(rC.looksLikeRegex("asd"));
-	}
-
 	@Test
 	public void testMatches() {
 		RegexCache rC = RegexCache.getInstance();

