2496 changed files with 498139 additions and 2007202 deletions
--- a/.classpath
+++ b/.classpath
--- a/.externalToolBuilders/Ant
+++ b/.externalToolBuilders/Ant
@ -1,16 +0,0 @@
				@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-    <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="get_git_info,"/>
-    <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="get_git_info,"/>
-    <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-    <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-    <booleanAttribute key="org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE" value="false"/>
-    <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources/&gt;}"/>
-    <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-    <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="superx"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/home/superx/git/kern/superx-build/build.xml"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-    <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>
--- a/.gitignore
+++ b/.gitignore
@ -1,270 +1,46 @@
				@@ -1,270 +1,46 @@
-# agent and copilot context - local/temporary files
-.github/
+# ignore all log files
+*.log
+*.err
+*.log.*

-# Gradle build output and wrapper cache
-build/
-.gradle/

-# ignore /dist/*
-*dist/
-
-# ignore swap files
-superx/WEB-INF/reports/swap_*
-
-# ignore eclipse settings
-.settings/org.eclipse.ltk.core.refactoring.prefs
-
-# vim .swp files
-*.swp
-
-# ignore gradle bin
-scripts/gradle/bin/
-scripts/gradle/.gradle/
-
-# cobertura
-superx-build/cobertura*
-
-# classes
-superx/WEB-INF/classes/
-
-#  tag files
-**/tags
-
-# .orig files
-**/*.orig
-
-# datum.alt files
-**/superx.datum.alt
-
-# script artefacts
-scripts/**/build/
-scripts/**/log/
-
-# build artefacts
-superx-build/declared-jars.txt
-superx-build/cobertura_build_tests/
-superx-build/cobertura_build_classes/
-superx-build/coveragereport/
-superx-build/results/
-superx-build/tmp_build/
-
-# Eclipse launch configurations are causing conflicts on 'pull' if you've got local ones; so they should not be under SCM
-scripts/eclipseExternalTools/
-
-# extracted h1-modules. These should only be links to folders in cs.bia.his_components
-src-modules/module/prom/
-src-modules/module/res/
-src-modules/module/astat/
-src-modules/module/tt/
-src-modules/module/star/
-src-modules/module/kern_s/
-src-modules/module/res_s/
-# also ignore symlinks on linux
-src-modules/module/prom
-src-modules/module/res
-src-modules/module/astat
-src-modules/module/tt
-src-modules/module/star
-src-modules/module/kern_s
-src-modules/module/res_s
-src-modules/module/biad
-
-# artifact folders for reduced/cleaned modules 
-superx/WEB-INF/conf/edustore/db/module/prom/
-superx/WEB-INF/conf/edustore/db/module/res/
-superx/WEB-INF/conf/edustore/db/module/zul/
-superx/WEB-INF/conf/edustore/db/module/sos/
-superx/WEB-INF/conf/edustore/db/module/sva/
-superx/WEB-INF/conf/edustore/db/module/ivs/
-superx/WEB-INF/conf/edustore/db/module/astat/
-superx/WEB-INF/conf/edustore/db/module/tt/
-superx/WEB-INF/conf/edustore/db/module/lm/
-superx/WEB-INF/conf/edustore/db/module/etl/
-superx/WEB-INF/conf/edustore/db/module/star/
-superx/WEB-INF/conf/edustore/db/module/cob/
-superx/WEB-INF/conf/edustore/db/module/kern_s/
-superx/WEB-INF/conf/edustore/db/module/res_s/
-superx/WEB-INF/conf/edustore/db/module/bau/
-superx/WEB-INF/conf/edustore/db/module/fin/
-superx/WEB-INF/conf/edustore/db/module/biad/
-superx/WEB-INF/conf/edustore/db/module/gang/
-superx/WEB-INF/conf/edustore/db/module/erfolg/
-superx/WEB-INF/conf/edustore/db/module/man/
-superx/WEB-INF/conf/edustore/db/module/kenn/
-superx/WEB-INF/conf/edustore/db/module/kennx/
-
-# module generation artifacts for module fin
-src/edustore/edustore_fin.xml
-superx/WEB-INF/fin_dbforms-config_ids.xml
-superx/WEB-INF/fin_dbforms-config_pg.xml
-
-# module generation artifacts for module bau
-src/edustore/edustore_bau.xml
-superx/WEB-INF/bau_dbforms-config_ids.xml
-superx/WEB-INF/bau_dbforms-config_pg.xml
-
-# module generation artifacts for module prom
-src/edustore/edustore_prom.xml
-superx/WEB-INF/prom_dbforms-config_ids.xml
-superx/WEB-INF/prom_dbforms-config_pg.xml
-superx/edit/prom/
-
-# module generation artifacts for module res
-src/edustore/edustore_res.xml
-superx/WEB-INF/res_dbforms-config_ids.xml
-superx/WEB-INF/res_dbforms-config_pg.xml
-
-# module generation artifacts for module gang
-src/edustore/edustore_gang.xml
-superx/WEB-INF/gang_dbforms-config_ids.xml
-superx/WEB-INF/gang_dbforms-config_pg.xml
-superx/edit/gang/*edit.jsp
-superx/edit/gang/*list.jsp
+# ignore all CVS + sub dirs
+*CVS/

+# ignore java classes
+*classes/

-# module generation artifacts for module kenn
-src/edustore/edustore_kenn.xml
-superx/WEB-INF/kenn_dbforms-config_ids.xml
-superx/WEB-INF/kenn_dbforms-config_pg.xml
-superx/edit/kenn/*edit.jsp
-superx/edit/kenn/*list.jsp
+# ignore files in directory rohdaten
+superx/WEB-INF/conf/edustore/db/module/*/rohdaten/unl/*.unl
+superx/WEB-INF/conf/edustore/db/install/rohdaten/unl/*.unl

-# module generation artifacts for module kennx
-src/edustore/edustore_kennx.xml
-superx/WEB-INF/kennx_dbforms-config_ids.xml
-superx/WEB-INF/kennx_dbforms-config_pg.xml
-superx/edit/kennx/*edit.jsp
-superx/edit/kennx/*list.jsp
+# ignore temporary files
+*.tmp
+*.tmp.sql
+temp.xml
+tmp.fo

+# ignore auto generated files
+db.properties
+dbforms-config.xml
+superx/WEB-INF/dbforms-config.old
+superx.datum

-# module generation artifacts for module man
-src/edustore/edustore_man.xml
-superx/WEB-INF/man_dbforms-config_ids.xml
-superx/WEB-INF/man_dbforms-config_pg.xml
-superx/edit/man/catdesc.jsp
-superx/edit/man/cat.jsp
-superx/edit/man/grouping.jsp
-superx/edit/man/man_reports.jsp
-superx/edit/man/organigramm_dialog.jsp
-superx/edit/man/rpt.jsp
-superx/edit/man/*edit.jsp
-superx/edit/man/*list.jsp
-
-# module generation artifacts for module erfolg
-src/edustore/edustore_erfolg.xml
-superx/WEB-INF/erfolg_dbforms-config_ids.xml
-superx/WEB-INF/erfolg_dbforms-config_pg.xml
-
-# module generation artifacts for module sos
-src/edustore/edustore_sos.xml
-superx/WEB-INF/sos_dbforms-config_ids.xml
-superx/WEB-INF/sos_dbforms-config_pg.xml
-superx/edit/sos/hoererstatus_edit.jsp
-superx/edit/sos/koepfe_oder_faelle_edit.jsp
-superx/edit/sos/lehr_stg_ab_edit.jsp
-superx/edit/sos/semester_edit.jsp
-superx/edit/sos/semester_list.jsp
-superx/edit/sos/sos_status_edit.jsp
-superx/edit/sos/sos_stichtag_edit.jsp
-superx/edit/sos/sos_stichtag_list.jsp
-superx/edit/sos/statistik_edit.jsp
-superx/edit/sos/studierendenuebertragung_edit.jsp
-
-# module generation artifacts for module sva
-src/edustore/edustore_sva.xml
-superx/WEB-INF/sva_dbforms-config_ids.xml
-superx/WEB-INF/sva_dbforms-config_pg.xml
-superx/edit/sva/konstanten_sva_edit.jsp
-superx/edit/sva/sichten_sva_dienstart_edit.jsp
-superx/edit/sva/sichten_sva_klr_geldgeber_kurz_edit.jsp
-superx/edit/sva/sva_stichtag_list.jsp
-superx/edit/sva/sx_repository_sva_edit.jsp
-superx/edit/sva/user_sva.jsp
-superx/edit/sva/user_sva_manuell.jsp
-
-# module generation artifacts for module ivs
-src/edustore/edustore_ivs.xml
-superx/edit/ivs/user_inventar_edit.jsp
-superx/WEB-INF/ivs_dbforms-config_ids.xml
-superx/WEB-INF/ivs_dbforms-config_pg.xml
-
-# module generation artifacts for module zul
-src/edustore/edustore_zul.xml
-superx/WEB-INF/zul_dbforms-config_ids.xml
-superx/WEB-INF/zul_dbforms-config_pg.xml
-
-# module generation artifacts for module astat
-src/edustore/edustore_astat.xml
-superx/WEB-INF/astat_dbforms-config_ids.xml
-superx/WEB-INF/astat_dbforms-config_pg.xml
-
-# module generation artifacts for module tt
-src/edustore/edustore_tt.xml
-superx/WEB-INF/tt_dbforms-config_ids.xml
-superx/WEB-INF/tt_dbforms-config_pg.xml
-superx/edit/tt/
-
-# module generation artifacts for module lm 
-src/edustore/edustore_lm.xml
-superx/WEB-INF/lm_dbforms-config_ids.xml
-superx/WEB-INF/lm_dbforms-config_pg.xml
-superx/edit/lm/
-
-# module generation artifacts for module etl 
-src/edustore/edustore_etl.xml
-superx/WEB-INF/etl_dbforms-config_ids.xml
-superx/WEB-INF/etl_dbforms-config_pg.xml
-superx/edit/etl/etl_job_edit.jsp
-superx/edit/etl/etl_step_edit.jsp
-superx/edit/etl/etl_step_type_list.jsp
-
-# module generation artifacts for module star
-src/edustore/edustore_star.xml
-superx/WEB-INF/star_dbforms-config_ids.xml
-superx/WEB-INF/star_dbforms-config_pg.xml
-
-# module generation artifacts for module cob
-src/edustore/edustore_cob.xml
-superx/WEB-INF/cob_dbforms-config_ids.xml
-superx/WEB-INF/cob_dbforms-config_pg.xml
-superx/edit/cob/sx_repository_cob_edit.jsp
-
-# module generation artifacts for module kern_s
-src/edustore/edustore_kern_s.xml
-superx/WEB-INF/kern_s_dbforms-config_ids.xml
-superx/WEB-INF/kern_s_dbforms-config_pg.xml
-
-# module generation artifacts for module res_s
-src/edustore/edustore_res_s.xml
-superx/WEB-INF/res_s_dbforms-config_ids.xml
-superx/WEB-INF/res_s_dbforms-config_pg.xml
-
-# module generation artifacts for module biad
-src/edustore/edustore_biad.xml
-superx/WEB-INF/biad_dbforms-config_ids.xml
-superx/WEB-INF/biad_dbforms-config_pg.xml
-
-# dbt project generation backups
-superx/dbt/projects/*_backup/
-
-# Saiku his icons
-superx/saiku/css/saiku/src/saiku_his.css
-
-# Dateifunktionalität im kenn und kennx Modul 
-superx\WEB-INF\downloads
+# ignore iReport Designer
+*.jasper

-# vscode personal settings
-.vscode/
-.metadata/
+# ignore /dist/*
+*dist/

-# edustore.xml soll nicht mehr ausgeliefert werden siehe #313658
-src/edustore/edustore.xml
+# ignore swap files
+superx/WEB-INF/reports/swap_*

-# package folder und config file für statisch generierte JSPs
-src/de/superx/jsp/
-superx/WEB-INF/jsp_servlet_config.xml
+src/edustore/edustore_*.xml

-# jaspers werden nicht mehr commitet, sondern im build gebaut
-*.jasper
-# updateUnmodifiedJars backup
-superx/WEB-INF/lib/backup/
+# ignore eclipse settings
+.settings/org.eclipse.ltk.core.refactoring.prefs
+#rpta files:
+superx/WEB-INF/reports/simple_table.jrtx
+superx/WEB-INF/reports/tabelle_jrxml_a4_quer.xsl.jrxml
+superx/xml/jr_templates.xsl
+superx/xml/rpta_assistent.xsl
--- a/.project
+++ b/.project
@ -1,58 +1,36 @@
				@@ -1,58 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>eduStore_superX</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Ant Superx Version.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature>
-		<nature>com.jaspersoft.studio.babel.editor.rbeNature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1617792163171</id>
-			<name></name>
-			<type>10</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-dist</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1617792163186</id>
-			<name></name>
-			<type>6</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-true-.+\.class</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1687335947806</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>eduStore_superX</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.babel.editor.rbeBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature>
+		<nature>com.jaspersoft.studio.babel.editor.rbeNature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1459344926910</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-dist</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
--- a/src-patches/com/sun/jersey/spi/container/servlet/WebComponent.java
+++ b/src-patches/com/sun/jersey/spi/container/servlet/WebComponent.java
@ -1,901 +0,0 @@
				@@ -1,901 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * http://glassfish.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-
-/* gepatchtes class-File:
- * im Rahmen von #331613 muss mit dem Update auf Tomcat 10 auch die Anwendung von Serlvet API 4.0 auf 6.0 umgestellt werden.
- * Dies leistet ein Migrationstool, welches in erster Linie den Packagenamen von 'javax' auf 'jakarta' umstellt.
- * Allerdings bestand danach immer noch in der 'jersey-bunde-1.19.4.jar' ein Zugriff auf die entfernte Methode
- * 'HttpServletResponse.setStatus(int, String)', welcher beim Laden von Saiku zu einer Exception geführt hat,
- * wodurch das Frontend in der Ladeanzeige geblieben ist.
- * Der Patch ändert die Klasse derart, dass sie die noch vorhandene Methode 'HttpServletResponse.setStatus(int)' aufruft,
- * was zu funktionieren scheint.
- * Ursprung entspricht https://github.com/javaee/jersey-1.x/blob/864a01d7be490ab93d2424da3e446ad8eb84b1e8/jersey-servlet/src/main/java/com/sun/jersey/spi/container/servlet/WebComponent.java
-*/
-
-package com.sun.jersey.spi.container.servlet;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.Type;
-import java.net.URI;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.GenericEntity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
-
-import javax.naming.NamingException;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import com.sun.jersey.api.container.ContainerException;
-import com.sun.jersey.api.container.MappableContainerException;
-import com.sun.jersey.api.core.ApplicationAdapter;
-import com.sun.jersey.api.core.ClasspathResourceConfig;
-import com.sun.jersey.api.core.PackagesResourceConfig;
-import com.sun.jersey.api.core.ResourceConfig;
-import com.sun.jersey.api.core.TraceInformation;
-import com.sun.jersey.api.core.servlet.WebAppResourceConfig;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.core.header.InBoundHeaders;
-import com.sun.jersey.core.header.MediaTypes;
-import com.sun.jersey.core.reflection.ReflectionHelper;
-import com.sun.jersey.core.util.ReaderWriter;
-import com.sun.jersey.server.impl.InitialContextHelper;
-import com.sun.jersey.server.impl.ThreadLocalInvoker;
-import com.sun.jersey.server.impl.application.DeferredResourceConfig;
-import com.sun.jersey.server.impl.cdi.CDIComponentProviderFactoryInitializer;
-import com.sun.jersey.server.impl.container.servlet.JSPTemplateProcessor;
-import com.sun.jersey.server.impl.ejb.EJBComponentProviderFactoryInitilizer;
-import com.sun.jersey.server.impl.managedbeans.ManagedBeanComponentProviderFactoryInitilizer;
-import com.sun.jersey.server.impl.model.method.dispatch.FormDispatchProvider;
-import com.sun.jersey.server.impl.monitoring.GlassFishMonitoringInitializer;
-import com.sun.jersey.server.probes.UriRuleProbeProvider;
-import com.sun.jersey.spi.container.ContainerListener;
-import com.sun.jersey.spi.container.ContainerNotifier;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerResponse;
-import com.sun.jersey.spi.container.ContainerResponseWriter;
-import com.sun.jersey.spi.container.ReloadListener;
-import com.sun.jersey.spi.container.WebApplication;
-import com.sun.jersey.spi.container.WebApplicationFactory;
-import com.sun.jersey.spi.inject.SingletonTypeInjectableProvider;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-
-/**
- * An abstract Web component that may be extended a Servlet and/or
- * Filter implementation, or encapsulated by a Servlet or Filter implementation.
- *
- * @author Paul Sandoz (paul.sandoz at oracle.com)
- */
-public class WebComponent implements ContainerListener {
-    /**
-     * The servlet initialization property whose value is a fully qualified
-     * class name of a class that implements {@link ResourceConfig} or
-     * {@link Application}.
-     */
-    public static final String APPLICATION_CONFIG_CLASS =
-            "javax.ws.rs.Application";
-
-    /**
-     * The servlet initialization property whose value is a fully qualified
-     * class name of a class that implements {@link ResourceConfig} or
-     * {@link Application}.
-     */
-    public static final String RESOURCE_CONFIG_CLASS =
-            "com.sun.jersey.config.property.resourceConfigClass";
-
-    /**
-     * The base path in the Web Pages where JSP templates, associated with
-     * viewables of resource classes, are located.
-     * <p/>
-     * If this property is not set then the base path will be the root path
-     * of the Web Pages.
-     */
-    public static final String JSP_TEMPLATES_BASE_PATH =
-            "com.sun.jersey.config.property.JSPTemplatesBasePath";
-
-
-    private static final Logger LOGGER =
-            Logger.getLogger(WebComponent.class.getName());
-
-    private final ThreadLocalInvoker<HttpServletRequest> requestInvoker =
-            new ThreadLocalInvoker<HttpServletRequest>();
-
-    private final ThreadLocalInvoker<HttpServletResponse> responseInvoker =
-            new ThreadLocalInvoker<HttpServletResponse>();
-
-
-    private WebConfig config;
-
-    private ResourceConfig resourceConfig;
-
-    private WebApplication application;
-
-    public WebComponent() {
-    }
-
-    public WebComponent(Application app) {
-        if (app == null)
-            throw new IllegalArgumentException();
-
-        if (app instanceof ResourceConfig) {
-            resourceConfig = (ResourceConfig) app;
-        } else {
-            resourceConfig = new ApplicationAdapter(app);
-        }
-    }
-
-    /**
-     * Get the Web configuration.
-     *
-     * @return the Web configuration.
-     */
-    public WebConfig getWebConfig() {
-        return config;
-    }
-
-    /**
-     * Get the resource configuration.
-     *
-     * @return the resource configuration.
-     */
-    public ResourceConfig getResourceConfig() {
-        return resourceConfig;
-    }
-
-    /**
-     * Initiate the Web component.
-     *
-     * @param webConfig the Web configuration.
-     * @throws javax.servlet.ServletException in case of any initialization error
-     */
-    public void init(WebConfig webConfig) throws ServletException {
-        config = webConfig;
-
-        if (resourceConfig == null)
-            resourceConfig = createResourceConfig(config);
-
-        load();
-
-        Object o = resourceConfig.getProperties().get(
-                ResourceConfig.PROPERTY_CONTAINER_NOTIFIER);
-        if (o instanceof List) {
-            List list = (List) o;
-            for (Object elem : list) {
-                if (elem instanceof ContainerNotifier) {
-                    ContainerNotifier crf = (ContainerNotifier) elem;
-                    crf.addListener(this);
-                }
-            }
-        } else if (o instanceof ContainerNotifier) {
-            ContainerNotifier crf = (ContainerNotifier) o;
-            crf.addListener(this);
-        }
-    }
-
-    /**
-     * Destroy this Web component.
-     * <p/>
-     * This will destroy the Web application created by this this Web component.
-     */
-    public void destroy() {
-        if (application != null)
-            application.destroy();
-    }
-
-    private final static class Writer extends OutputStream implements ContainerResponseWriter {
-        final HttpServletResponse response;
-
-        ContainerResponse cResponse;
-
-        long contentLength;
-
-        OutputStream out;
-
-        boolean statusAndHeadersWritten = false;
-
-        Writer(HttpServletResponse response) {
-            this.response = response;
-        }
-
-        public OutputStream writeStatusAndHeaders(long contentLength,
-                                                  ContainerResponse cResponse) throws IOException {
-            this.contentLength = contentLength;
-            this.cResponse = cResponse;
-            this.statusAndHeadersWritten = false;
-            return this;
-        }
-
-        public void finish() throws IOException {
-            if (statusAndHeadersWritten)
-                return;
-
-            // Note that the writing of headers MUST be performed before
-            // the invocation of sendError as on some Servlet implementations
-            // modification of the response headers will have no effect
-            // after the invocation of sendError.
-            writeHeaders();
-
-
-            writeStatus();
-        }
-
-        private void writeStatus() {
-            Response.StatusType statusType = cResponse.getStatusType();
-            final String reasonPhrase = statusType.getReasonPhrase();
-
-//            if (reasonPhrase != null) {
-//                response.setStatus(statusType.getStatusCode(), reasonPhrase);
-//            } else {
-                response.setStatus(statusType.getStatusCode());
-//            }
-        }
-
-        public void write(int b) throws IOException {
-            initiate();
-            out.write(b);
-        }
-
-        @Override
-        public void write(byte b[]) throws IOException {
-            if (b.length > 0) {
-                initiate();
-                out.write(b);
-            }
-        }
-
-        @Override
-        public void write(byte b[], int off, int len) throws IOException {
-            if (len > 0) {
-                initiate();
-                out.write(b, off, len);
-            }
-        }
-
-        @Override
-        public void flush() throws IOException {
-            writeStatusAndHeaders();
-            if (out != null)
-                out.flush();
-        }
-
-        @Override
-        public void close() throws IOException {
-            initiate();
-            out.close();
-        }
-
-        void initiate() throws IOException {
-            if (out == null) {
-                writeStatusAndHeaders();
-                out = response.getOutputStream();
-            }
-        }
-
-        void writeStatusAndHeaders() {
-            if (statusAndHeadersWritten)
-                return;
-
-            writeHeaders();
-            writeStatus();
-            statusAndHeadersWritten = true;
-        }
-
-        void writeHeaders() {
-            if (contentLength != -1 && contentLength < Integer.MAX_VALUE)
-                response.setContentLength((int) contentLength);
-
-            MultivaluedMap<String, Object> headers = cResponse.getHttpHeaders();
-            for (Map.Entry<String, List<Object>> e : headers.entrySet()) {
-                for (Object v : e.getValue()) {
-                    response.addHeader(e.getKey(), ContainerResponse.getHeaderValue(v));
-                }
-            }
-        }
-    }
-
-    /**
-     * Dispatch client requests to a resource class.
-     *
-     * @param baseUri    the base URI of the request.
-     * @param requestUri the URI of the request.
-     * @param request    the {@link HttpServletRequest} object that
-     *                   contains the request the client made to
-     *                   the Web component.
-     * @param response   the {@link HttpServletResponse} object that
-     *                   contains the response the Web component returns
-     *                   to the client.
-     * @return the status code of the response.
-     * @throws IOException      if an input or output error occurs
-     *                          while the Web component is handling the
-     *                          HTTP request.
-     * @throws ServletException if the HTTP request cannot
-     *                          be handled.
-     */
-    public int service(URI baseUri, URI requestUri,
-                       final HttpServletRequest request,
-                       final HttpServletResponse response)
-            throws ServletException, IOException {
-        // Copy the application field to local instance to ensure that the
-        // currently loaded web application is used to process
-        // request
-        final WebApplication _application = application;
-
-        final ContainerRequest cRequest = createRequest(
-                _application,
-                request,
-                baseUri,
-                requestUri);
-
-        cRequest.setSecurityContext(new SecurityContext() {
-            public Principal getUserPrincipal() {
-                return request.getUserPrincipal();
-            }
-
-            public boolean isUserInRole(String role) {
-                return request.isUserInRole(role);
-            }
-
-            public boolean isSecure() {
-                return request.isSecure();
-            }
-
-            public String getAuthenticationScheme() {
-                return request.getAuthType();
-            }
-        });
-
-        try {
-            // Check if any servlet filters have consumed a request entity
-            // of the media type application/x-www-form-urlencoded
-            // This can happen if a filter calls request.getParameter(...)
-            filterFormParameters(request, cRequest);
-
-            UriRuleProbeProvider.requestStart(requestUri);
-
-            requestInvoker.set(request);
-            responseInvoker.set(response);
-
-            final Writer w = new Writer(response);
-            _application.handleRequest(cRequest, w);
-            return w.cResponse.getStatus();
-        } catch (WebApplicationException ex) {
-            final Response exResponse = ex.getResponse();
-            final String entity = exResponse.getEntity() != null ? exResponse.getEntity().toString() : null;
-
-            response.sendError(exResponse.getStatus(), entity);
-
-            return exResponse.getStatus();
-        } catch (MappableContainerException ex) {
-            traceOnException(cRequest, response);
-            throw new ServletException(ex.getCause());
-        } catch (ContainerException ex) {
-            traceOnException(cRequest, response);
-            throw new ServletException(ex);
-        } catch (RuntimeException ex) {
-            traceOnException(cRequest, response);
-            throw ex;
-        } finally {
-            UriRuleProbeProvider.requestEnd();
-            requestInvoker.set(null);
-            responseInvoker.set(null);
-        }
-    }
-
-    /**
-     * Extension point for creating your custom container request.
-     *
-     * @param app        the web app
-     * @param request    the current servlet api request
-     * @param baseUri    the base uri
-     * @param requestUri the request uri
-     * @return the request container
-     * @throws IOException if any error occurs when getting the input stream
-     */
-    protected ContainerRequest createRequest(WebApplication app,
-                                             HttpServletRequest request, URI baseUri, URI requestUri) throws IOException {
-        return new ContainerRequest(
-                app,
-                request.getMethod(),
-                baseUri,
-                requestUri,
-                getHeaders(request),
-                request.getInputStream());
-    }
-
-    private void traceOnException(final ContainerRequest cRequest, final HttpServletResponse response) {
-        if (cRequest.isTracingEnabled()) {
-            final TraceInformation ti = (TraceInformation) cRequest.getProperties().
-                    get(TraceInformation.class.getName());
-
-            ti.addTraceHeaders(new TraceInformation.TraceHeaderListener() {
-                public void onHeader(String name, String value) {
-                    response.addHeader(name, value);
-                }
-            });
-        }
-    }
-
-    /**
-     * Create a new instance of a {@link WebApplication}.
-     *
-     * @return the {@link WebApplication} instance.
-     */
-    protected WebApplication create() {
-        return WebApplicationFactory.createWebApplication();
-    }
-
-    /**
-     * A helper class for creating an injectable provider that supports
-     * {@link Context} with a type and constant value.
-     *
-     * @param <T> the type of the constant value.
-     */
-    protected static class ContextInjectableProvider<T> extends
-            SingletonTypeInjectableProvider<Context, T> {
-
-        /**
-         * Create a new instance.
-         *
-         * @param type     the type of the constant value.
-         * @param instance the constant value.
-         */
-        protected ContextInjectableProvider(Type type, T instance) {
-            super(type, instance);
-        }
-    }
-
-    /**
-     * Configure the {@link ResourceConfig}.
-     * <p/>
-     * The {@link ResourceConfig} is configured such that the following classes
-     * may be injected onto the field of a root resource class or a parameter
-     * of a method of root resource class that is annotated with
-     * {@link javax.ws.rs.core.Context}: {@link HttpServletRequest}, {@link HttpServletResponse}
-     * , {@link ServletContext} and {@link WebConfig}.
-     * <p/>
-     * Any root resource class in registered in the resource configuration
-     * that is an interface is processed as follows.
-     * If the class is an interface and there exists a JNDI named object
-     * with the fully qualified class name as the JNDI name then that named
-     * object is added as a singleton root resource and the class is removed
-     * from the set of root resource classes.
-     * <p/>
-     * An inheriting class may override this method to configure the
-     * {@link ResourceConfig} to provide alternative or additional instances
-     * that are resource or provider classes or instances, and may modify the
-     * features and properties of the {@link ResourceConfig}. For an inheriting
-     * class to extend configuration behaviour the overriding method MUST call
-     * <code>super.configure(servletConfig, rc, wa)</code> as the first statement
-     * of that method.
-     * <p/>
-     * This method will be called only once at initiation. Subsequent
-     * reloads of the Web application will not result in subsequence calls to
-     * this method.
-     *
-     * @param wc the Web configuration
-     * @param rc the Resource configuration
-     * @param wa the Web application
-     */
-    protected void configure(WebConfig wc, ResourceConfig rc, WebApplication wa) {
-        configureJndiResources(rc);
-
-        rc.getSingletons().add(new ContextInjectableProvider<HttpServletRequest>(
-                HttpServletRequest.class,
-                (HttpServletRequest) Proxy.newProxyInstance(
-                        this.getClass().getClassLoader(),
-                        new Class[]{HttpServletRequest.class},
-                        requestInvoker)));
-
-        rc.getSingletons().add(new ContextInjectableProvider<HttpServletResponse>(
-                HttpServletResponse.class,
-                (HttpServletResponse) Proxy.newProxyInstance(
-                        this.getClass().getClassLoader(),
-                        new Class[]{HttpServletResponse.class},
-                        responseInvoker)));
-
-        GenericEntity<ThreadLocal<HttpServletRequest>> requestThreadLocal =
-                new GenericEntity<ThreadLocal<HttpServletRequest>>(requestInvoker.getImmutableThreadLocal()) {
-                };
-        rc.getSingletons().add(new ContextInjectableProvider<ThreadLocal<HttpServletRequest>>(
-                requestThreadLocal.getType(), requestThreadLocal.getEntity()));
-
-        GenericEntity<ThreadLocal<HttpServletResponse>> responseThreadLocal =
-                new GenericEntity<ThreadLocal<HttpServletResponse>>(responseInvoker.getImmutableThreadLocal()) {
-                };
-        rc.getSingletons().add(new ContextInjectableProvider<ThreadLocal<HttpServletResponse>>(
-                responseThreadLocal.getType(), responseThreadLocal.getEntity()));
-
-        rc.getSingletons().add(new ContextInjectableProvider<ServletContext>(
-                ServletContext.class,
-                wc.getServletContext()));
-
-        rc.getSingletons().add(new ContextInjectableProvider<WebConfig>(
-                WebConfig.class,
-                wc));
-
-        rc.getClasses().add(JSPTemplateProcessor.class);
-
-        // TODO
-        // If CDI is enabled should EJB injection be disabled?
-        EJBComponentProviderFactoryInitilizer.initialize(rc);
-
-        CDIComponentProviderFactoryInitializer.initialize(wc, rc, wa);
-
-        // TODO
-        // If CDI is enabled then no need to initialize managed beans
-        ManagedBeanComponentProviderFactoryInitilizer.initialize(rc);
-
-        GlassFishMonitoringInitializer.initialize();
-    }
-
-    /**
-     * Initiate the {@link WebApplication}.
-     * <p/>
-     * This method will be called once at initiation and for
-     * each reload of the Web application.
-     * <p/>
-     * An inheriting class may override this method to initiate the
-     * Web application with different parameters.
-     *
-     * @param rc the Resource configuration
-     * @param wa the Web application
-     */
-    protected void initiate(ResourceConfig rc, WebApplication wa) {
-        wa.initiate(rc);
-    }
-
-
-    /**
-     * Load the Web application. This will create, configure and initiate
-     * the web application.
-     */
-    public void load() {
-        WebApplication _application = create();
-        configure(config, resourceConfig, _application);
-        initiate(resourceConfig, _application);
-        application = _application;
-    }
-
-    /**
-     * Get the default resource configuration if one is not declared in the
-     * web.xml.
-     * <p/>
-     * This implementation returns an instance of {@link WebAppResourceConfig}
-     * that scans in files and directories as declared by the
-     * {@link ClasspathResourceConfig#PROPERTY_CLASSPATH} if present, otherwise
-     * in the "WEB-INF/lib" and "WEB-INF/classes" directories.
-     * <p/>
-     * An inheriting class may override this method to supply a different
-     * default resource configuration implementation.
-     *
-     * @param props the properties to pass to the resource configuration.
-     * @param wc    the web configuration.
-     * @return the default resource configuration.
-     * @throws javax.servlet.ServletException in case of any issues with providing \
-     *                                        the default resource configuration
-     */
-    protected ResourceConfig getDefaultResourceConfig(Map<String, Object> props,
-                                                      WebConfig wc) throws ServletException {
-        return getWebAppResourceConfig(props, wc);
-    }
-
-
-    // ContainerListener
-
-    /**
-     * Reload the Web application. This will create and initiate the web
-     * application using the same {@link ResourceConfig} implementation
-     * that was used to load the Web application.
-     * <p/>
-     * This method may be called at runtime, more than once, to reload the
-     * Web application. For example, if a {@link ResourceConfig} implementation
-     * is capable of detecting changes to resource classes (addition or removal)
-     * or providers then this method may be invoked to reload the web
-     * application for such changes to take effect.
-     * <p/>
-     * If this method is called when there are pending requests then such
-     * requests will be processed using the previously loaded web application.
-     */
-    public void onReload() {
-        WebApplication oldApplication = application;
-        WebApplication newApplication = create();
-        initiate(resourceConfig, newApplication);
-        application = newApplication;
-
-        if (resourceConfig instanceof ReloadListener)
-            ((ReloadListener) resourceConfig).onReload();
-
-        oldApplication.destroy();
-
-    }
-
-
-    //
-
-    /* package */ ResourceConfig getWebAppResourceConfig(Map<String, Object> props,
-                                                         WebConfig webConfig) throws ServletException {
-        // Default to using Web app resource config
-        return new WebAppResourceConfig(props, webConfig.getServletContext());
-    }
-
-    private ResourceConfig createResourceConfig(WebConfig webConfig)
-            throws ServletException {
-        final Map<String, Object> props = getInitParams(webConfig);
-        final ResourceConfig rc = createResourceConfig(webConfig, props);
-        rc.setPropertiesAndFeatures(props);
-        return rc;
-    }
-
-    private ResourceConfig createResourceConfig(WebConfig webConfig, Map<String, Object> props)
-            throws ServletException {
-        // Check if the resource config class property is present
-        String resourceConfigClassName = webConfig.getInitParameter(RESOURCE_CONFIG_CLASS);
-        // Otherwise check if the JAX-RS application config class property is
-        // present
-        if (resourceConfigClassName == null)
-            resourceConfigClassName = webConfig.getInitParameter(APPLICATION_CONFIG_CLASS);
-
-        // If no resource config class property is present
-        if (resourceConfigClassName == null) {
-            // If the packages property is present then
-            // use the packages resource config
-            String packages = webConfig.getInitParameter(
-                    PackagesResourceConfig.PROPERTY_PACKAGES);
-            if (packages != null) {
-                props.put(PackagesResourceConfig.PROPERTY_PACKAGES, packages);
-                return new PackagesResourceConfig(props);
-            }
-
-            ResourceConfig defaultConfig = webConfig.getDefaultResourceConfig(props);
-            if (defaultConfig != null)
-                return defaultConfig;
-
-            return getDefaultResourceConfig(props, webConfig);
-        }
-
-        try {
-            Class<?> resourceConfigClass = AccessController.doPrivileged(ReflectionHelper.
-                    classForNameWithExceptionPEA(resourceConfigClassName));
-
-            // TODO add support for WebAppResourceConfig
-            if (resourceConfigClass == ClasspathResourceConfig.class) {
-                String[] paths = getPaths(webConfig.getInitParameter(
-                        ClasspathResourceConfig.PROPERTY_CLASSPATH));
-                props.put(ClasspathResourceConfig.PROPERTY_CLASSPATH, paths);
-                return new ClasspathResourceConfig(props);
-            } else if (ResourceConfig.class.isAssignableFrom(resourceConfigClass)) {
-                try {
-                    Constructor constructor = resourceConfigClass.getConstructor(Map.class);
-                    if (ClasspathResourceConfig.class.isAssignableFrom(resourceConfigClass)) {
-                        String[] paths = getPaths(webConfig.getInitParameter(
-                                ClasspathResourceConfig.PROPERTY_CLASSPATH));
-                        props.put(ClasspathResourceConfig.PROPERTY_CLASSPATH, paths);
-                    }
-                    return (ResourceConfig) constructor.newInstance(props);
-                } catch (NoSuchMethodException ex) {
-                    // Pass through and try the default constructor
-                } catch (Exception e) {
-                    throw new ServletException(e);
-                }
-
-                return new DeferredResourceConfig(resourceConfigClass.asSubclass(ResourceConfig.class));
-            } else if (Application.class.isAssignableFrom(resourceConfigClass)) {
-                return new DeferredResourceConfig(resourceConfigClass.asSubclass(Application.class));
-            } else {
-                String message = "Resource configuration class, " + resourceConfigClassName +
-                        ", is not a super class of " + Application.class;
-                throw new ServletException(message);
-            }
-        } catch (ClassNotFoundException e) {
-            String message = "Resource configuration class, " + resourceConfigClassName +
-                    ", could not be loaded";
-            throw new ServletException(message, e);
-        } catch (PrivilegedActionException e) {
-            String message = "Resource configuration class, " + resourceConfigClassName +
-                    ", could not be loaded";
-            throw new ServletException(message, e.getCause());
-        }
-    }
-
-    private Map<String, Object> getInitParams(WebConfig webConfig) {
-        Map<String, Object> props = new HashMap<String, Object>();
-        Enumeration names = webConfig.getInitParameterNames();
-        while (names.hasMoreElements()) {
-            String name = (String) names.nextElement();
-            props.put(name, webConfig.getInitParameter(name));
-        }
-        return props;
-    }
-
-    private String[] getPaths(String classpath) throws ServletException {
-        final ServletContext context = config.getServletContext();
-        if (classpath == null) {
-            String[] paths = {
-                    context.getRealPath("/WEB-INF/lib"),
-                    context.getRealPath("/WEB-INF/classes")
-            };
-            if (paths[0] == null && paths[1] == null) {
-                String message = "The default deployment configuration that scans for " +
-                        "classes in /WEB-INF/lib and /WEB-INF/classes is not supported " +
-                        "for the application server." +
-                        "Try using the package scanning configuration, see the JavaDoc for " +
-                        PackagesResourceConfig.class.getName() + " and the property " +
-                        PackagesResourceConfig.PROPERTY_PACKAGES + ".";
-                throw new ServletException(message);
-            }
-            return paths;
-        } else {
-            String[] virtualPaths = classpath.split(";");
-            List<String> resourcePaths = new ArrayList<String>();
-            for (String virtualPath : virtualPaths) {
-                virtualPath = virtualPath.trim();
-                if (virtualPath.length() == 0) continue;
-                String path = context.getRealPath(virtualPath);
-                if (path != null) resourcePaths.add(path);
-            }
-            if (resourcePaths.isEmpty()) {
-                String message = "None of the declared classpath locations, " +
-                        classpath +
-                        ", could be resolved. " +
-                        "This could be because the default deployment configuration that scans for " +
-                        "classes in classpath locations is not supported. " +
-                        "Try using the package scanning configuration, see the JavaDoc for " +
-                        PackagesResourceConfig.class.getName() + " and the property " +
-                        PackagesResourceConfig.PROPERTY_PACKAGES + ".";
-                throw new ServletException(message);
-            }
-            return resourcePaths.toArray(new String[resourcePaths.size()]);
-        }
-    }
-
-    private void configureJndiResources(ResourceConfig rc) {
-        // Obtain any instances that are registered in JNDI
-        // Assumes such instances are singletons
-        // Registered classes have to be interfaces
-        javax.naming.Context x = InitialContextHelper.getInitialContext();
-        if (x != null) {
-            Iterator<Class<?>> i = rc.getClasses().iterator();
-            while (i.hasNext()) {
-                Class<?> c = i.next();
-                if (!c.isInterface()) continue;
-
-                try {
-                    Object o = x.lookup(c.getName());
-                    if (o != null) {
-                        i.remove();
-                        rc.getSingletons().add(o);
-                        LOGGER.log(Level.INFO,
-                                "An instance of the class " + c.getName() +
-                                        " is found by JNDI look up using the class name as the JNDI name. " +
-                                        "The instance will be registered as a singleton.");
-                    }
-                } catch (NamingException ex) {
-                    LOGGER.log(Level.CONFIG,
-                            "JNDI lookup failed for Jersey application resource " + c.getName(),
-                            ex);
-                }
-            }
-        }
-    }
-
-    private void filterFormParameters(HttpServletRequest servletRequest, ContainerRequest containerRequet) throws IOException {
-        if (MediaTypes.typeEquals(MediaType.APPLICATION_FORM_URLENCODED_TYPE, containerRequet.getMediaType())
-                && !isEntityPresent(containerRequet)) {
-            Form f = new Form();
-
-            Enumeration e = servletRequest.getParameterNames();
-            while (e.hasMoreElements()) {
-                String name = (String) e.nextElement();
-                String[] values = servletRequest.getParameterValues(name);
-
-                f.put(name, Arrays.asList(values));
-            }
-
-            if (!f.isEmpty()) {
-                containerRequet.getProperties().put(FormDispatchProvider.FORM_PROPERTY, f);
-                if (LOGGER.isLoggable(Level.WARNING)) {
-                    LOGGER.log(Level.WARNING,
-                            "A servlet request, to the URI " + containerRequet.getRequestUri() + ", " +
-                                    "contains form parameters in " +
-                                    "the request body but the request body has been consumed " +
-                                    "by the servlet or a servlet filter accessing the request " +
-                                    "parameters. Only resource methods using @FormParam " +
-                                    "will work as expected. Resource methods consuming the " +
-                                    "request body by other means will not work as expected.");
-                }
-            }
-        }
-    }
-
-    private boolean isEntityPresent(ContainerRequest cr) throws IOException {
-        InputStream in = cr.getEntityInputStream();
-        if (!in.markSupported()) {
-            in = new BufferedInputStream(in, ReaderWriter.BUFFER_SIZE);
-            cr.setEntityInputStream(in);
-        }
-
-        in.mark(1);
-        if (in.read() == -1)
-            return false;
-        else {
-            in.reset();
-            return true;
-        }
-    }
-
-    private InBoundHeaders getHeaders(HttpServletRequest request) {
-        InBoundHeaders rh = new InBoundHeaders();
-
-        for (Enumeration<String> names = request.getHeaderNames(); names.hasMoreElements();) {
-            String name = names.nextElement();
-            List<String> valueList = new LinkedList<String>();
-            for (Enumeration<String> values = request.getHeaders(name); values.hasMoreElements();) {
-                valueList.add(values.nextElement());
-            }
-            rh.put(name, valueList);
-        }
-
-        return rh;
-    }
-}
--- a/src-patches/org/dbforms/util/MultipartRequest.java
+++ b/src-patches/org/dbforms/util/MultipartRequest.java
@ -1,366 +0,0 @@
				@@ -1,366 +0,0 @@
-/*
- * $Header: /cvsroot/jdbforms/dbforms/src/org/dbforms/util/MultipartRequest.java,v 1.19 2005/02/19 21:26:32 hkollmann Exp $
- * $Revision: 1.19 $
- * $Date: 2005/02/19 21:26:32 $
- *
- * DbForms - a Rapid Application Development Framework
- * Copyright (C) 2001 Joachim Peer <joepeer@excite.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-package org.dbforms.util;
-
-import org.apache.commons.fileupload.DiskFileUpload;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletRequestWrapper;
-import jakarta.servlet.http.HttpServletRequest;
-import org.dbforms.util.external.FileUtil;
-
-import de.superx.util.multipart.support.DefaultMultipartHttpServletRequest;
-
-
-/**
- * A utility class to handle <code>multipart/form-data</code> requests, the
- * kind of requests that support file uploads. This class emulates the interface
- * of <code>HttpServletRequest</code>, making it familiar to use. It uses a
- * "push" model where any incoming files are read and saved directly to disk in
- * the constructor. If you wish to have more flexibility, e.g. write the files
- * to a database, use the "pull" model <code>MultipartParser</code> instead.
- * <p>
- * This class can receive arbitrarily large files (up to an artificial limit you
- * can set), and fairly efficiently too. It cannot handle nested data (multipart
- * content within multipart content) or internationalized content (such as non
- * Latin-1 filenames).
- * </p>
- * <p>
- * See the included <a href="upload.war">upload.war </a> for an example of how
- * to use this class.
- * <p>
- * The full file upload specification is contained in experimental RFC 1867,
- * available at <a href="http://www.ietf.org/rfc/rfc1867.txt"
- * http://www.ietf.org/rfc/rfc1867.txt </a>.
- * </p>
- * <p>
- * PLEASE NOTE: this class uses Multipart Support Classes by Jason Hunter.
- * Copyright (C) 1998 by Jason Hunter. All rights reserved.
- * Use of this class is limited. Please see the LICENSE for more information.
- * Make sure that you project meets the requierements defined by Jason Hunter
- * respective O'reilly!
- * </p>
- *
- * @see MultipartParser
- *
- * @author Jason Hunter
- * @author Geoff Soutter
- * @author Joe Peer - _changed_ it for use in DbForms (i apologize)
- */
-/* Witt: am 28.05.2026 als Basis für gepatchte Datei nach 'src-patches' übernommen, Basis waren meine
- * lokalen 'dbforms_2.5_20050226' Sourcen */
-public class MultipartRequest {
-   private static Log logCat = LogFactory.getLog(MultipartRequest.class); // logging category
-   private Hashtable  files = new Hashtable(); // name - UploadedFile
-
-   // for this class
-   //private File dir;
-   private Hashtable parameters = new Hashtable(); // name - Vector of values
-
-   /**
-    * Constructs a new MultipartRequest to handle the specified request,
-    * {saving any uploaded files to the given directory}, and limiting the
-    * upload size to the specified length. If the content is too large, an
-    * IOException is thrown. This constructor actually parses the
-    * <tt>multipart/form-data</tt> and throws an IOException if there's any
-    * problem reading or parsing the request.
-    *
-    * @param request
-    *            the servlet request.
-    * @param maxPostSize
-    *            the maximum size of the POST content.
-    * @exception IOException
-    *                if the uploaded content is larger than
-    *                <tt>maxPostSize</tt> or there's a problem reading or
-    *                parsing the request.
-    */
-   public MultipartRequest(HttpServletRequest request,
-                           int                maxPostSize)
-                    throws IOException {
-      // Sanity check values
-      if (request == null) {
-         throw new IllegalArgumentException("request cannot be null");
-      }
-
-      //    Create a new file upload handler
-      DiskFileUpload upload = new DiskFileUpload();
-
-      //    Set upload parameters
-      upload.setSizeMax(maxPostSize);
-
-      String tmpDir = System.getProperty("java.io.tmpdir");
-      upload.setRepositoryPath(tmpDir);
-
-      //    Parse the request
-      try {
-          // we initilize this list with 'null', as the following unwrapping code should do the work - contrary to the 'org.dbforms.util.MultipartRequest code, from which this is copied
-          List<FileItem> items = null; //upload.parseRequest(request); 
-
-          if (items == null || items.size() == 0) {
-              ServletRequest originalRequest = request;
-              DefaultMultipartHttpServletRequest dmhsr = null;
-              while (originalRequest instanceof ServletRequestWrapper) {
-                  if (originalRequest instanceof DefaultMultipartHttpServletRequest) {
-                      dmhsr = (DefaultMultipartHttpServletRequest) originalRequest;
-                      items = dmhsr.getFileItems();
-                      break;
-                  }
-                  originalRequest = ((ServletRequestWrapper) originalRequest).getRequest();
-              }
-          }
-
-         Iterator iter = items.iterator();
-
-         while (iter.hasNext()) {
-            FileItem item = (FileItem) iter.next();
-            String   name = item.getFieldName();
-
-            if (item.isFormField()) {
-               String value = item.getString();
-
-               // plain parameters get allways into parameters structure
-               Vector existingValues = (Vector) parameters.get(name);
-
-               if (existingValues == null) {
-                  existingValues = new Vector();
-                  parameters.put(name, existingValues);
-               }
-
-               existingValues.addElement(value);
-            } else {
-               String fileName = item.getName();
-
-               if (!Util.isNull(fileName)) {
-                  File f = new File(fileName);
-                  // 2004-08-05-HKK/Dziugas Baltrunas: 
-                  // FileItem always returns the full pathname!
-                  fileName = FileUtil.filename(f.getName());
-
-                  // The part actually contained a file
-                  // #changes by joe peer:
-                  // we must delay storing the file-inputstream (into
-                  // database, filesystem or whatever)
-                  // until we know exactly what should happen with it
-                  FileHolder fileHolder = new FileHolder(fileName, item);
-                  files.put(name, fileHolder);
-                  logCat.info("buffered and now added as " + name
-                              + " the following fileHolder:"
-                              + fileHolder.getFileName());
-
-                  // #changes by joe peer:
-                  // if a file parameter is not null it gets into the
-                  // parameters structures as well
-                  // this is important to provide a simple access to
-                  // request (no distinction between files and plain
-                  // params)
-                  Vector existingValues = (Vector) parameters.get(name);
-
-                  if (existingValues == null) {
-                     existingValues = new Vector();
-                     parameters.put(name, existingValues);
-                  }
-
-                  existingValues.addElement(fileName);
-               }
-            }
-         }
-      } catch (Exception e) {
-         logCat.error("MultipartRequest", e);
-      }
-   }
-
-   /**
-    * Returns the content type of the specified file (as supplied by the client
-    * browser), or null if the file was not included in the upload.
-    *
-    * @param name
-    *            the file name.
-    * @return the content type of the file.
-    */
-   public String getContentType(String name) {
-      try {
-         //#changed by joe peer
-         //UploadedFile file = (UploadedFile)files.get(name);
-         FileHolder filePart = (FileHolder) files.get(name);
-
-         return filePart.getContentType(); // may be null
-      } catch (Exception e) {
-         return null;
-      }
-   }
-
-
-   /**
-    * Returns a FilePart object for the specified file this method was added by
-    * joe peer
-    *
-    * @param name
-    *            the file name.
-    * @return a FilePart object for the named file.
-    */
-   public FileHolder getFileHolder(String name) {
-      try {
-         return (FileHolder) files.get(name);
-      } catch (Exception e) {
-         return null;
-      }
-   }
-
-
-   /**
-    * Returns a InputStream object for the specified file saved on the server's
-    * filesystem, or null if the file was not included in the upload.
-    *
-    * @param name
-    *            the file name.
-    * @return a InputStream object for the named file.
-    */
-   public InputStream getFileInputStream(String name) {
-      try {
-         //#changed by joe peer
-         //UploadedFile file = (UploadedFile)files.get(name);
-         FileHolder filePart = (FileHolder) files.get(name);
-
-         return filePart.getInputStreamFromBuffer(); // may be null
-      } catch (Exception e) {
-         return null;
-      }
-   }
-
-
-   /**
-    * Returns the names of all the uploaded files as an Enumeration of Strings.
-    * It returns an empty Enumeration if there are no uploaded files. Each file
-    * name is the name specified by the form, not by the user.
-    *
-    * @return the names of all the uploaded files as an Enumeration of Strings.
-    */
-   public Enumeration getFileNames() {
-      return files.keys();
-   }
-
-
-   /**
-    * Returns the filesystem name of the specified file, or null if the file
-    * was not included in the upload. A filesystem name is the name specified
-    * by the user. It is also the name under which the file is actually saved.
-    *
-    * @param name
-    *            the file name.
-    * @return the filesystem name of the file.
-    */
-   public String getFilesystemName(String name) {
-      try {
-         //#changed by joe peer
-         //UploadedFile file = (UploadedFile)files.get(name);
-         FileHolder filePart = (FileHolder) files.get(name);
-
-         return filePart.getFileName(); // may be null
-      } catch (Exception e) {
-         return null;
-      }
-   }
-
-
-   /**
-    * Returns the value of the named parameter as a String, or null if the
-    * parameter was not sent or was sent without a value. The value is
-    * guaranteed to be in its normal, decoded form. If the parameter has
-    * multiple values, only the last one is returned (for backward
-    * compatibility). For parameters with multiple values, it's possible the
-    * last "value" may be null.
-    *
-    * @param name
-    *            the parameter name.
-    * @return the parameter value.
-    */
-   public String getParameter(String name) {
-      try {
-         Vector values = (Vector) parameters.get(name);
-
-         if ((values == null) || (values.size() == 0)) {
-            return null;
-         }
-
-         String value = (String) values.elementAt(0);
-
-         return value;
-      } catch (Exception e) {
-         return null;
-      }
-   }
-
-
-   /**
-    * Returns the names of all the parameters as an Enumeration of Strings. It
-    * returns an empty Enumeration if there are no parameters.
-    *
-    * @return the names of all the parameters as an Enumeration of Strings.
-    */
-   public Enumeration getParameterNames() {
-      return parameters.keys();
-   }
-
-
-   /**
-    * Returns the values of the named parameter as a String array, or null if
-    * the parameter was not sent. The array has one entry for each parameter
-    * field sent. If any field was sent without a value that entry is stored in
-    * the array as a null. The values are guaranteed to be in their normal,
-    * decoded form. A single value is returned as a one-element array.
-    *
-    * @param name
-    *            the parameter name.
-    * @return the parameter values.
-    */
-   public String[] getParameterValues(String name) {
-      try {
-         Vector values = (Vector) parameters.get(name);
-
-         if ((values == null) || (values.size() == 0)) {
-            return null;
-         }
-
-         String[] valuesArray = new String[values.size()];
-         values.copyInto(valuesArray);
-
-         return valuesArray;
-      } catch (Exception e) {
-         return null;
-      }
-   }
-}
--- a/src-patches/org/springframework/security/web/util/OnCommittedResponseWrapper.java
+++ b/src-patches/org/springframework/security/web/util/OnCommittedResponseWrapper.java
@ -1,699 +0,0 @@
				@@ -1,699 +0,0 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* taken/copied from 'spring-security-web-6.2.8.jar' as a base for patching */
-
-package org.springframework.security.web.util;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Locale;
-
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.WriteListener;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpServletResponseWrapper;
-
-/**
- * Base class for response wrappers which encapsulate the logic for handling an event when
- * the {@link jakarta.servlet.http.HttpServletResponse} is committed.
- *
- * @author Rob Winch
- * @since 4.0.2
- */
-public abstract class OnCommittedResponseWrapper extends HttpServletResponseWrapper {
-
-    private boolean disableOnCommitted;
-
-    /**
-     * The Content-Length response header. If this is greater than 0, then once
-     * {@link #contentWritten} is larger than or equal the response is considered
-     * committed.
-     */
-    private long contentLength;
-
-    /**
-     * The size of data written to the response body. The field will only be updated when
-     * {@link #disableOnCommitted} is false.
-     */
-    private long contentWritten;
-
-    /**
-     * @param response the response to be wrapped
-     */
-    public OnCommittedResponseWrapper(HttpServletResponse response) {
-        super(response);
-    }
-
-    @Override
-    public void addHeader(String name, String value) {
-        checkContentLengthHeader(name, value);
-        super.addHeader(name, value);
-    }
-
-    @Override
-    public void addIntHeader(String name, int value) {
-        checkContentLengthHeader(name, value);
-        super.addIntHeader(name, value);
-    }
-
-    @Override
-    public void setHeader(String name, String value) {
-        checkContentLengthHeader(name, value);
-        super.setHeader(name, value);
-    }
-
-    @Override
-    public void setIntHeader(String name, int value) {
-        checkContentLengthHeader(name, value);
-        super.setIntHeader(name, value);
-    }
-
-    private void checkContentLengthHeader(String name, int value) {
-        if ("Content-Length".equalsIgnoreCase(name)) {
-            setContentLength(value);
-        }
-    }
-    
-    private void checkContentLengthHeader(String name, String value) {
-        if ("Content-Length".equalsIgnoreCase(name)) {
-            setContentLength(Long.parseLong(value));
-        }
-    }
-
-    @Override
-    public void setContentLength(int len) {
-        setContentLength((long) len);
-        super.setContentLength(len);
-    }
-
-    @Override
-    public void setContentLengthLong(long len) {
-        setContentLength(len);
-        super.setContentLengthLong(len);
-    }
-
-    private void setContentLength(long len) {
-        this.contentLength = len;
-        checkContentLength(0);
-    }
-
-    /**
-     * Invoke this method to disable invoking
-     * {@link OnCommittedResponseWrapper#onResponseCommitted()} when the
-     * {@link jakarta.servlet.http.HttpServletResponse} is committed. This can be useful
-     * in the event that Async Web Requests are made.
-     */
-    protected void disableOnResponseCommitted() {
-        this.disableOnCommitted = true;
-    }
-
-    /**
-     * Returns true if {@link #onResponseCommitted()} will be invoked when the response is
-     * committed, else false.
-     * @return if {@link #onResponseCommitted()} is enabled
-     */
-    protected boolean isDisableOnResponseCommitted() {
-        return this.disableOnCommitted;
-    }
-
-    /**
-     * Implement the logic for handling the
-     * {@link jakarta.servlet.http.HttpServletResponse} being committed
-     */
-    protected abstract void onResponseCommitted();
-
-    /**
-     * Makes sure {@link OnCommittedResponseWrapper#onResponseCommitted()} is invoked
-     * before calling the superclass <code>sendError()</code>
-     */
-    @Override
-    public final void sendError(int sc) throws IOException {
-        doOnResponseCommitted();
-        super.sendError(sc);
-    }
-
-    /**
-     * Makes sure {@link OnCommittedResponseWrapper#onResponseCommitted()} is invoked
-     * before calling the superclass <code>sendError()</code>
-     */
-    @Override
-    public final void sendError(int sc, String msg) throws IOException {
-        doOnResponseCommitted();
-        super.sendError(sc, msg);
-    }
-
-    /**
-     * Makes sure {@link OnCommittedResponseWrapper#onResponseCommitted()} is invoked
-     * before calling the superclass <code>sendRedirect()</code>
-     */
-    @Override
-    public final void sendRedirect(String location) throws IOException {
-        doOnResponseCommitted();
-        super.sendRedirect(location);
-    }
-
-    /**
-     * Makes sure {@link OnCommittedResponseWrapper#onResponseCommitted()} is invoked
-     * before calling the calling <code>getOutputStream().close()</code> or
-     * <code>getOutputStream().flush()</code>
-     */
-    @Override
-    public ServletOutputStream getOutputStream() throws IOException {
-        return new SaveContextServletOutputStream(super.getOutputStream());
-    }
-
-    /**
-     * Makes sure {@link OnCommittedResponseWrapper#onResponseCommitted()} is invoked
-     * before calling the <code>getWriter().close()</code> or
-     * <code>getWriter().flush()</code>
-     */
-    @Override
-    public PrintWriter getWriter() throws IOException {
-        return new SaveContextPrintWriter(super.getWriter());
-    }
-
-    /**
-     * Makes sure {@link OnCommittedResponseWrapper#onResponseCommitted()} is invoked
-     * before calling the superclass <code>flushBuffer()</code>
-     */
-    @Override
-    public void flushBuffer() throws IOException {
-        doOnResponseCommitted();
-        super.flushBuffer();
-    }
-
-    private void trackContentLength(boolean content) {
-        if (!this.disableOnCommitted) {
-            checkContentLength(content ? 4 : 5); // TODO Localization
-        }
-    }
-
-    private void trackContentLength(char content) {
-        if (!this.disableOnCommitted) {
-            checkContentLength(1);
-        }
-    }
-
-    private void trackContentLength(Object content) {
-        if (!this.disableOnCommitted) {
-            trackContentLength(String.valueOf(content));
-        }
-    }
-
-    private void trackContentLength(byte[] content) {
-        if (!this.disableOnCommitted) {
-            checkContentLength((content != null) ? content.length : 0);
-        }
-    }
-
-    private void trackContentLength(char[] content) {
-        if (!this.disableOnCommitted) {
-            checkContentLength((content != null) ? content.length : 0);
-        }
-    }
-
-    private void trackContentLength(int content) {
-        if (!this.disableOnCommitted) {
-            trackContentLength(String.valueOf(content));
-        }
-    }
-
-    private void trackContentLength(float content) {
-        if (!this.disableOnCommitted) {
-            trackContentLength(String.valueOf(content));
-        }
-    }
-
-    private void trackContentLength(double content) {
-        if (!this.disableOnCommitted) {
-            trackContentLength(String.valueOf(content));
-        }
-    }
-
-    private void trackContentLengthLn() {
-        if (!this.disableOnCommitted) {
-            trackContentLength("\r\n");
-        }
-    }
-
-    private void trackContentLength(String content) {
-        if (!this.disableOnCommitted) {
-            int contentLength = (content != null) ? content.length() : 4;
-            checkContentLength(contentLength);
-        }
-    }
-
-    /**
-     * Adds the contentLengthToWrite to the total contentWritten size and checks to see if
-     * the response should be written.
-     * @param contentLengthToWrite the size of the content that is about to be written.
-     */
-    private void checkContentLength(long contentLengthToWrite) {
-        this.contentWritten += contentLengthToWrite;
-        boolean isBodyFullyWritten = this.contentLength > 0 && this.contentWritten >= this.contentLength;
-        int bufferSize = getBufferSize();
-        boolean requiresFlush = bufferSize > 0 && this.contentWritten >= bufferSize;
-        if (isBodyFullyWritten || requiresFlush) {
-            doOnResponseCommitted();
-        }
-    }
-
-    /**
-     * Calls <code>onResponseCommmitted()</code> with the current contents as long as
-     * {@link #disableOnResponseCommitted()} was not invoked.
-     */
-    private void doOnResponseCommitted() {
-        if (!this.disableOnCommitted) {
-            onResponseCommitted();
-            disableOnResponseCommitted();
-        }
-    }
-
-    /**
-     * Ensures {@link OnCommittedResponseWrapper#onResponseCommitted()} is invoked before
-     * calling the prior to methods that commit the response. We delegate all methods to
-     * the original {@link java.io.PrintWriter} to ensure that the behavior is as close to
-     * the original {@link java.io.PrintWriter} as possible. See SEC-2039
-     *
-     * @author Rob Winch
-     */
-    private class SaveContextPrintWriter extends PrintWriter {
-
-        private final PrintWriter delegate;
-
-        SaveContextPrintWriter(PrintWriter delegate) {
-            super(delegate);
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void flush() {
-            doOnResponseCommitted();
-            this.delegate.flush();
-        }
-
-        @Override
-        public void close() {
-            doOnResponseCommitted();
-            this.delegate.close();
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            return this.delegate.equals(obj);
-        }
-
-        @Override
-        public int hashCode() {
-            return this.delegate.hashCode();
-        }
-
-        @Override
-        public String toString() {
-            return getClass().getName() + "[delegate=" + this.delegate.toString() + "]";
-        }
-
-        @Override
-        public boolean checkError() {
-            return this.delegate.checkError();
-        }
-
-        @Override
-        public void write(int c) {
-            trackContentLength(c);
-            this.delegate.write(c);
-        }
-
-        @Override
-        public void write(char[] buf, int off, int len) {
-            checkContentLength(len);
-            this.delegate.write(buf, off, len);
-        }
-
-        @Override
-        public void write(char[] buf) {
-            trackContentLength(buf);
-            this.delegate.write(buf);
-        }
-
-        @Override
-        public void write(String s, int off, int len) {
-            checkContentLength(len);
-            this.delegate.write(s, off, len);
-        }
-
-        @Override
-        public void write(String s) {
-            trackContentLength(s);
-            this.delegate.write(s);
-        }
-
-        @Override
-        public void print(boolean b) {
-            trackContentLength(b);
-            this.delegate.print(b);
-        }
-
-        @Override
-        public void print(char c) {
-            trackContentLength(c);
-            this.delegate.print(c);
-        }
-
-        @Override
-        public void print(int i) {
-            trackContentLength(i);
-            this.delegate.print(i);
-        }
-
-        @Override
-        public void print(long l) {
-            trackContentLength(l);
-            this.delegate.print(l);
-        }
-
-        @Override
-        public void print(float f) {
-            trackContentLength(f);
-            this.delegate.print(f);
-        }
-
-        @Override
-        public void print(double d) {
-            trackContentLength(d);
-            this.delegate.print(d);
-        }
-
-        @Override
-        public void print(char[] s) {
-            trackContentLength(s);
-            this.delegate.print(s);
-        }
-
-        @Override
-        public void print(String s) {
-            trackContentLength(s);
-            this.delegate.print(s);
-        }
-
-        @Override
-        public void print(Object obj) {
-            trackContentLength(obj);
-            this.delegate.print(obj);
-        }
-
-        @Override
-        public void println() {
-            trackContentLengthLn();
-            this.delegate.println();
-        }
-
-        @Override
-        public void println(boolean x) {
-            trackContentLength(x);
-            trackContentLengthLn();
-            this.delegate.println(x);
-        }
-
-        @Override
-        public void println(char x) {
-            trackContentLength(x);
-            trackContentLengthLn();
-            this.delegate.println(x);
-        }
-
-        @Override
-        public void println(int x) {
-            trackContentLength(x);
-            trackContentLengthLn();
-            this.delegate.println(x);
-        }
-
-        @Override
-        public void println(long x) {
-            trackContentLength(x);
-            trackContentLengthLn();
-            this.delegate.println(x);
-        }
-
-        @Override
-        public void println(float x) {
-            trackContentLength(x);
-            trackContentLengthLn();
-            this.delegate.println(x);
-        }
-
-        @Override
-        public void println(double x) {
-            trackContentLength(x);
-            trackContentLengthLn();
-            this.delegate.println(x);
-        }
-
-        @Override
-        public void println(char[] x) {
-            trackContentLength(x);
-            trackContentLengthLn();
-            this.delegate.println(x);
-        }
-
-        @Override
-        public void println(String x) {
-            trackContentLength(x);
-            trackContentLengthLn();
-            this.delegate.println(x);
-        }
-
-        @Override
-        public void println(Object x) {
-            trackContentLength(x);
-            trackContentLengthLn();
-            this.delegate.println(x);
-        }
-
-        @Override
-        public PrintWriter printf(String format, Object... args) {
-            return this.delegate.printf(format, args);
-        }
-
-        @Override
-        public PrintWriter printf(Locale l, String format, Object... args) {
-            return this.delegate.printf(l, format, args);
-        }
-
-        @Override
-        public PrintWriter format(String format, Object... args) {
-            return this.delegate.format(format, args);
-        }
-
-        @Override
-        public PrintWriter format(Locale l, String format, Object... args) {
-            return this.delegate.format(l, format, args);
-        }
-
-        @Override
-        public PrintWriter append(CharSequence csq) {
-            checkContentLength(csq.length());
-            return this.delegate.append(csq);
-        }
-
-        @Override
-        public PrintWriter append(CharSequence csq, int start, int end) {
-            checkContentLength(end - start);
-            return this.delegate.append(csq, start, end);
-        }
-
-        @Override
-        public PrintWriter append(char c) {
-            trackContentLength(c);
-            return this.delegate.append(c);
-        }
-
-    }
-
-    /**
-     * Ensures{@link OnCommittedResponseWrapper#onResponseCommitted()} is invoked before
-     * calling methods that commit the response. We delegate all methods to the original
-     * {@link jakarta.servlet.ServletOutputStream} to ensure that the behavior is as close
-     * to the original {@link jakarta.servlet.ServletOutputStream} as possible. See
-     * SEC-2039
-     *
-     * @author Rob Winch
-     */
-    private class SaveContextServletOutputStream extends ServletOutputStream {
-
-        private final ServletOutputStream delegate;
-
-        SaveContextServletOutputStream(ServletOutputStream delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void write(int b) throws IOException {
-            trackContentLength(b);
-            this.delegate.write(b);
-        }
-
-        @Override
-        public void flush() throws IOException {
-            doOnResponseCommitted();
-            this.delegate.flush();
-        }
-
-        @Override
-        public void close() throws IOException {
-            doOnResponseCommitted();
-            this.delegate.close();
-        }
-
-        @Override
-        public void print(boolean b) throws IOException {
-            trackContentLength(b);
-            this.delegate.print(b);
-        }
-
-        @Override
-        public void print(char c) throws IOException {
-            trackContentLength(c);
-            this.delegate.print(c);
-        }
-
-        @Override
-        public void print(double d) throws IOException {
-            trackContentLength(d);
-            this.delegate.print(d);
-        }
-
-        @Override
-        public void print(float f) throws IOException {
-            trackContentLength(f);
-            this.delegate.print(f);
-        }
-
-        @Override
-        public void print(int i) throws IOException {
-            trackContentLength(i);
-            this.delegate.print(i);
-        }
-
-        @Override
-        public void print(long l) throws IOException {
-            trackContentLength(l);
-            this.delegate.print(l);
-        }
-
-        @Override
-        public void print(String s) throws IOException {
-            trackContentLength(s);
-            this.delegate.print(s);
-        }
-
-        @Override
-        public void println() throws IOException {
-            trackContentLengthLn();
-            this.delegate.println();
-        }
-
-        @Override
-        public void println(boolean b) throws IOException {
-            trackContentLength(b);
-            trackContentLengthLn();
-            this.delegate.println(b);
-        }
-
-        @Override
-        public void println(char c) throws IOException {
-            trackContentLength(c);
-            trackContentLengthLn();
-            this.delegate.println(c);
-        }
-
-        @Override
-        public void println(double d) throws IOException {
-            trackContentLength(d);
-            trackContentLengthLn();
-            this.delegate.println(d);
-        }
-
-        @Override
-        public void println(float f) throws IOException {
-            trackContentLength(f);
-            trackContentLengthLn();
-            this.delegate.println(f);
-        }
-
-        @Override
-        public void println(int i) throws IOException {
-            trackContentLength(i);
-            trackContentLengthLn();
-            this.delegate.println(i);
-        }
-
-        @Override
-        public void println(long l) throws IOException {
-            trackContentLength(l);
-            trackContentLengthLn();
-            this.delegate.println(l);
-        }
-
-        @Override
-        public void println(String s) throws IOException {
-            trackContentLength(s);
-            trackContentLengthLn();
-            this.delegate.println(s);
-        }
-
-        @Override
-        public void write(byte[] b) throws IOException {
-            trackContentLength(b);
-            this.delegate.write(b);
-        }
-
-        @Override
-        public void write(byte[] b, int off, int len) throws IOException {
-            checkContentLength(len);
-            this.delegate.write(b, off, len);
-        }
-
-        @Override
-        public boolean isReady() {
-            return this.delegate.isReady();
-        }
-
-        @Override
-        public void setWriteListener(WriteListener writeListener) {
-            this.delegate.setWriteListener(writeListener);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            return this.delegate.equals(obj);
-        }
-
-        @Override
-        public int hashCode() {
-            return this.delegate.hashCode();
-        }
-
-        @Override
-        public String toString() {
-            return getClass().getName() + "[delegate=" + this.delegate.toString() + "]";
-        }
-
-    }
-
-}
--- a/src/de/memtext/baseobjects/ActivatableItem.java
+++ b/src/de/memtext/baseobjects/ActivatableItem.java
@ -1,35 +1,31 @@
				@@ -1,35 +1,31 @@
-package de.memtext.baseobjects;
-
-/**
- *
- *  @author MB
- * */
-public class ActivatableItem implements ActivatableItemI {
-    private static final long serialVersionUID = 1;
-
-    private boolean isActive;
-
-    /**
-     * 
-     */
-    public ActivatableItem() {
-        super();
-    }
-
-    /* (non-Javadoc)
-     * @see de.memtext.baseobjects.ActivatableItemI#isActive()
-     */
-    @Override
-    public boolean isActive() {
-        return isActive;
-    }
-
-    /* (non-Javadoc)
-     * @see de.memtext.baseobjects.ActivatableItemI#setActive(boolean)
-     */
-    @Override
-    public void setActive(boolean isActive) {
-        this.isActive = isActive;
-    }
-
-}
+package de.memtext.baseobjects;
+
+/**
+ *
+ *  @author MB
+ * */
+public class ActivatableItem implements ActivatableItemI {
+    private static final long serialVersionUID = 1;
+private boolean isActive;
+	/**
+	 * 
+	 */
+	public ActivatableItem() {
+		super();
+	}
+
+	/* (non-Javadoc)
+	 * @see de.memtext.baseobjects.ActivatableItemI#isActive()
+	 */
+	public boolean isActive() {
+		return isActive;
+	}
+
+	/* (non-Javadoc)
+	 * @see de.memtext.baseobjects.ActivatableItemI#setActive(boolean)
+	 */
+	public void setActive(boolean isActive) {
+		 this.isActive=isActive;
+	}
+
+}
--- a/src/de/memtext/baseobjects/ActivatableItemI.java
+++ b/src/de/memtext/baseobjects/ActivatableItemI.java
@ -1,11 +1,10 @@
				@@ -1,11 +1,10 @@
-package de.memtext.baseobjects;
-
-/**
- *
- *  @author MB
- * */
-public interface ActivatableItemI {
-    boolean isActive();
-
-    void setActive(boolean isActive);
-}
+package de.memtext.baseobjects;
+
+/**
+ *
+ *  @author MB
+ * */
+public interface ActivatableItemI {
+boolean isActive();
+void setActive(boolean isActive);
+}
--- a/src/de/memtext/baseobjects/ComparableObject.java
+++ b/src/de/memtext/baseobjects/ComparableObject.java
@ -1,39 +1,40 @@
				@@ -1,39 +1,40 @@
-package de.memtext.baseobjects;
-
-public class ComparableObject extends NamedObject implements Comparable {
-    private int sortNr;
-
-    private static final long serialVersionUID = 1;
-
-    public ComparableObject(String name, int sortNr) {
-        super(name);
-        this.sortNr = sortNr;
-    }
-
-    @Override
-    public int compareTo(Object o) {
-        int result = 0;
-        if (getSortNr() < ((ComparableObject) o).getSortNr()) result = -1;
-        if (getSortNr() > ((ComparableObject) o).getSortNr()) result = 1;
-        return result;
-    }
-
-    public int getSortNr() {
-        return sortNr;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        boolean result = false;
-        ComparableObject comp = (ComparableObject) o;
-        if (this.getName().equals(comp.getName()) && this.getSortNr() == comp.getSortNr()) result = true;
-
-        return result;
-    }
-
-    public void setSortNr(int sortNr) {
-        this.sortNr = sortNr;
-    }
-}
-
-//Created on 22.10.2004 at 16:20:48
+package de.memtext.baseobjects;
+
+public class ComparableObject extends NamedObject implements Comparable {
+    private int sortNr;
+    private static final long serialVersionUID = 1;
+
+    public ComparableObject(String name, int sortNr) {
+        super(name);
+        this.sortNr = sortNr;
+    }
+
+    public int compareTo(Object o) {
+        int result = 0;
+        if (getSortNr() < ((ComparableObject) o).getSortNr())
+            result = -1;
+        if (getSortNr() > ((ComparableObject) o).getSortNr())
+            result = 1;
+        return result;
+    }
+
+    public int getSortNr() {
+        return sortNr;
+    }
+
+    public boolean equals(Object o) {
+        boolean result = false;
+        ComparableObject comp = (ComparableObject) o;
+        if (this.getName().equals(comp.getName())
+                && this.getSortNr() == comp.getSortNr())
+            result = true;
+
+        return result;
+    }
+
+    public void setSortNr(int sortNr) {
+        this.sortNr = sortNr;
+    }
+}
+
+//Created on 22.10.2004 at 16:20:48
--- a/src/de/memtext/baseobjects/DataList.java
+++ b/src/de/memtext/baseobjects/DataList.java
@ -1,52 +1,50 @@
				@@ -1,52 +1,50 @@
-package de.memtext.baseobjects;
-
-import java.util.Collection;
-import java.util.LinkedList;
-
-/**
- *
- *  @author MB
- * List with different behaviour when setting items,
- * when index higher than count of elements doesn't throw
- * Exception, but adds as many nulls as necessary up to the
- * right count of elements and then sets the indicated position to 
- * the new value
- * 
- * * If for example a value for column 5 is to be stored, but the data List only
-	 * contains values for column 1 and 2, for column 3 and 4 null values are stored.
-	 
- * */
-public class DataList extends LinkedList {
-    private static final long serialVersionUID = 1;
-
-    /**
-     * 
-     */
-    public DataList() {
-        super();
-    }
-
-    /**
-     * @param c
-     */
-    public DataList(Collection c) {
-        super(c);
-
-    }
-
-    /**
-     * If for example a value for column 5 is to be stored, but the data List only
-     * contains values for column 1 and 2, for column 3 and 4 null values are stored.
-     
-     */
-    @Override
-    public Object set(int index, Object o) {
-        while (index > this.size() - 1) {
-            this.add(null);
-        }
-        Object previous = this.get(index);
-        super.set(index, o);
-        return previous;
-    }
-
-}
+package de.memtext.baseobjects;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+/**
+ *
+ *  @author MB
+ * List with different behaviour when setting items,
+ * when index higher than count of elements doesn't throw
+ * Exception, but adds as many nulls as necessary up to the
+ * right count of elements and then sets the indicated position to 
+ * the new value
+ * 
+ * * If for example a value for column 5 is to be stored, but the data List only
+	 * contains values for column 1 and 2, for column 3 and 4 null values are stored.
+	 
+ * */
+public class DataList extends LinkedList {
+    private static final long serialVersionUID = 1;
+
+	/**
+	 * 
+	 */
+	public DataList() {
+		super();
+	}
+
+	/**
+	 * @param c
+	 */
+	public DataList(Collection c) {
+		super(c);
+
+	}
+	/**
+	 * If for example a value for column 5 is to be stored, but the data List only
+	 * contains values for column 1 and 2, for column 3 and 4 null values are stored.
+	 
+	 */
+	public Object set(int index, Object o) {
+		while (index > this.size() - 1) {
+			this.add(null);
+		}
+		Object previous = this.get(index);
+		super.set(index, o);
+		return previous;
+	}
+	
+}
--- a/src/de/memtext/baseobjects/DoubleClickMouseListener.java
+++ b/src/de/memtext/baseobjects/DoubleClickMouseListener.java
@ -1,21 +1,18 @@
				@@ -1,21 +1,18 @@
-package de.memtext.baseobjects;
-
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-public abstract class DoubleClickMouseListener extends MouseAdapter {
-
-    public DoubleClickMouseListener() {
-        super();
-    }
-
-    @Override
-    public final void mousePressed(MouseEvent e) {
-        if (e.getClickCount() == 2) doubleClickOccured();
-    }
-
-    protected abstract void doubleClickOccured();
-
-
-}
+package de.memtext.baseobjects;
+
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public abstract class DoubleClickMouseListener extends MouseAdapter {
+
+	public DoubleClickMouseListener() {
+		super();
+	}
+	public final void mousePressed(MouseEvent e) {
+			if (e.getClickCount() == 2) doubleClickOccured();
+}
+	protected abstract void doubleClickOccured() ;
+
+
+}
 //Created on 16.03.2004 at 15:51:43
--- a/src/de/memtext/baseobjects/IdObject.java
+++ b/src/de/memtext/baseobjects/IdObject.java
@ -1,57 +1,50 @@
				@@ -1,57 +1,50 @@
-package de.memtext.baseobjects;
-
-import java.io.Serializable;
-
-/**
- *
- *  @author MB
- * */
-public class IdObject implements IdObjectI, Serializable {
-    private Object id;
-
-    private static final long serialVersionUID = 1;
-
-    public IdObject() {
-
-    }
-
-    public IdObject(Object id) {
-        setId(id);
-
-    }
-
-    /**
-     * @return
-     */
-    @Override
-    public Object getId() {
-        return id;
-    }
-
-
-
-    /**
-     * @param object
-     */
-    @Override
-    public void setId(Object object) {
-        id = object;
-    }
-
-    @Override
-    public String toString() {
-        return "id:" + getId();
-    }
-
-    /**
-     * Provides a deep copy
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        if (id != null && !(id instanceof String) && !(id instanceof Integer))
-            throw new CloneNotSupportedException(" You have to check in IdObject.clone if deep copying is necessary for class " + id.getClass());
-
-        IdObject cl = new IdObject(this.getId());
-        return cl;
-    }
-}
+package de.memtext.baseobjects;
+
+import java.io.Serializable;
+
+/**
+ *
+ *  @author MB
+ * */
+public class IdObject  implements IdObjectI,Serializable {
+	private Object id;
+	private static final long serialVersionUID = 1;
+	public IdObject() {
+
+	}
+	public IdObject(Object id) {
+		setId(id);
+		
+	}
+
+	/**
+	 * @return
+	 */
+	public Object getId() {
+		return id;
+	}
+
+
+
+	/**
+	 * @param object
+	 */
+	public void setId(Object object) {
+		id = object;
+	}
+
+	public String toString()
+	{
+	    return "id:"+getId();
+	}
+	/**
+	 * Provides a deep copy
+	 */
+    public Object clone() throws CloneNotSupportedException {
+        if (id!=null&&!(id instanceof String)&&!(id instanceof Integer))
+            throw new CloneNotSupportedException(" You have to check in IdObject.clone if deep copying is necessary for class "+id.getClass());
+         
+     IdObject cl=new IdObject(this.getId());
+       return cl;
+    }
+}
--- a/src/de/memtext/baseobjects/IdObjectI.java
+++ b/src/de/memtext/baseobjects/IdObjectI.java
@ -1,13 +1,11 @@
				@@ -1,13 +1,11 @@
-package de.memtext.baseobjects;
-
-/**
- * @see de.memtext.util.TreeUtils for a method creating key list (1,2,4) from nodes
- */
-public interface IdObjectI {
-    public Object getId();
-
-    public void setId(Object id);
-
-}
-
+package de.memtext.baseobjects;
+/**
+ * @see de.memtext.util.TreeUtils for a method creating key list (1,2,4) from nodes
+ */
+public interface IdObjectI {
+	public Object getId();
+	public void setId(Object id);
+
+}
+
 //Created on 30.01.2004 at 13:03:06
--- a/src/de/memtext/baseobjects/NameDecorator.java
+++ b/src/de/memtext/baseobjects/NameDecorator.java
@ -1,33 +1,28 @@
				@@ -1,33 +1,28 @@
-package de.memtext.baseobjects;
-
-
-/**
- * For classes up in the hierarchy which need a name in some context
- * but shouldn't pass it on to inheriting classes
- */
-public final class NameDecorator implements NamedObjectI {
-    private Object object;
-
-    private String name;
-
-    public NameDecorator(String name, Object object) {
-        this.name = name;
-        this.object = object;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Object getObject() {
-        return object;
-    }
-}
-
+package de.memtext.baseobjects;
+
+
+/**
+ * For classes up in the hierarchy which need a name in some context
+ * but shouldn't pass it on to inheriting classes
+ */
+public final class NameDecorator implements NamedObjectI{
+private Object object;
+private String name;
+	public NameDecorator(String name,Object object) {
+		this.name=name;
+		this.object=object;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name=name;
+	}
+
+	public Object getObject()
+	{
+		return object;
+	}
+}
+
 //Created on 25.11.2003 at 14:49:50
--- a/src/de/memtext/baseobjects/NamedIdObject.java
+++ b/src/de/memtext/baseobjects/NamedIdObject.java
@ -1,88 +1,83 @@
				@@ -1,88 +1,83 @@
-package de.memtext.baseobjects;
-
-import java.io.Serializable;
-
-import de.memtext.util.EqualsUtil;
-import de.memtext.util.HashCodeUtil;
-
-/**
- * 
- * @author MB
- */
-public class NamedIdObject extends NamedObject implements NamedIdObjectI, Serializable {
-    private Object id;
-
-    private static final long serialVersionUID = 1;
-
-    public NamedIdObject() {
-    }
-
-    public NamedIdObject(NamedObjectI namedObject) {
-        setName(namedObject.getName());
-    }
-
-    public NamedIdObject(Object id, String name) {
-        setId(id);
-        setName(name);
-    }
-
-    /**
-     * @return
-     */
-    @Override
-    public Object getId() {
-        return id;
-    }
-
-    /**
-     * @param object
-     */
-    @Override
-    public void setId(Object id) {
-        this.id = id;
-    }
-
-    @Override
-    public String toString() {
-        return getId() + " - " + getName();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        boolean result = false;
-        if (o instanceof NamedIdObject) {
-            NamedIdObject o2 = (NamedIdObject) o;
-            result = EqualsUtil.areEqual(this.getId(), o2.getId()) && EqualsUtil.areEqual(this.getName(), o2.getName());
-
-
-        }
-        return result;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = HashCodeUtil.SEED;
-        //collect the contributions of various fields
-        result = HashCodeUtil.hash(result, getId());
-        result = HashCodeUtil.hash(result, getName());
-
-        return result;
-    }
-
-    /**
-     * Provides a deep copy
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-
-        NamedIdObject cl = new NamedIdObject((NamedObject) super.clone());
-
-        if (id != null && !(id instanceof String) && !(id instanceof Integer))
-            throw new CloneNotSupportedException(" You have to check in NamedIdObject.clone if deep copying is necessary for class " + id.getClass());
-
-        if (this.id != null) cl.setId(id);
-        return cl;
-    }
-
-
+package de.memtext.baseobjects;
+
+import java.io.Serializable;
+
+import de.memtext.util.EqualsUtil;
+import de.memtext.util.HashCodeUtil;
+
+/**
+ * 
+ * @author MB
+ */
+public class NamedIdObject extends NamedObject implements NamedIdObjectI,
+        Serializable {
+    private Object id;
+    private static final long serialVersionUID = 1;
+    public NamedIdObject() {
+    }
+
+    public NamedIdObject(NamedObjectI namedObject) {
+        setName(namedObject.getName());
+    }
+
+    public NamedIdObject(Object id, String name) {
+        setId(id);
+        setName(name);
+    }
+
+    /**
+     * @return
+     */
+    public Object getId() {
+        return id;
+    }
+
+    /**
+     * @param object
+     */
+    public void setId(Object id) {
+        this.id = id;
+    }
+
+    public String toString() {
+        return getId() + " - " + getName();
+    }
+public boolean equals(Object o)
+{
+    boolean result=false;
+    if (o instanceof NamedIdObject)
+    {
+        NamedIdObject o2=(NamedIdObject)o;
+        result=EqualsUtil.areEqual(this.getId(),o2.getId())&&EqualsUtil.areEqual(this.getName(),o2.getName());
+        
+    
+    }
+    return result;
+}
+public int hashCode(){
+        int result = HashCodeUtil.SEED;
+        //collect the contributions of various fields
+        result = HashCodeUtil.hash(result, getId());
+       result = HashCodeUtil.hash(result, getName());
+    
+        return result;
+      }
+    /**
+     * Provides a deep copy
+     */
+    public Object clone() throws CloneNotSupportedException {
+
+        NamedIdObject cl = new NamedIdObject((NamedObject) super.clone());
+
+        if (id != null && !(id instanceof String) && !(id instanceof Integer))
+            throw new CloneNotSupportedException(
+                    " You have to check in NamedIdObject.clone if deep copying is necessary for class "
+                            + id.getClass());
+
+        if (this.id != null)
+            cl.setId(id);
+        return cl;
+    }
+
+    
 }
--- a/src/de/memtext/baseobjects/NamedIdObjectI.java
+++ b/src/de/memtext/baseobjects/NamedIdObjectI.java
@ -1,10 +1,10 @@
				@@ -1,10 +1,10 @@
-package de.memtext.baseobjects;
-
-/**
- *
- *  @author MB
- * */
-public interface NamedIdObjectI extends NamedObjectI, IdObjectI {
-
-
+package de.memtext.baseobjects;
+
+/**
+ *
+ *  @author MB
+ * */
+public interface NamedIdObjectI extends NamedObjectI, IdObjectI{
+
+	
 }
--- a/src/de/memtext/baseobjects/NamedIdObjectWithParent.java
+++ b/src/de/memtext/baseobjects/NamedIdObjectWithParent.java
@ -1,88 +1,91 @@
				@@ -1,88 +1,91 @@
-package de.memtext.baseobjects;
-
-import java.io.Serializable;
-
-import de.memtext.tree.KeyParentEqualException;
-import de.memtext.util.EqualsUtil;
-import de.memtext.util.HashCodeUtil;
-
-public class NamedIdObjectWithParent extends NamedIdObject implements NamedIdObjectWithParentI, Serializable {
-    private Object parentKey;
-
-    private static final long serialVersionUID = 1;
-
-    public NamedIdObjectWithParent() {
-        super();
-    }
-
-    public NamedIdObjectWithParent(NamedIdObjectI namedIdObject) {
-        setId(namedIdObject.getId());
-        setName(namedIdObject.getName());
-    }
-
-    public NamedIdObjectWithParent(Object id, String name) {
-        super(id, name);
-    }
-
-    public NamedIdObjectWithParent(Object id, String name, Object parentKey) throws KeyParentEqualException {
-        super(id, name);
-        setParentKey(parentKey);
-    }
-
-    @Override
-    public Object getParentKey() {
-        return parentKey;
-    }
-
-    @Override
-    public void setParentKey(Object parentKey) throws KeyParentEqualException {
-        this.parentKey = parentKey;
-        if ((getId() == null && getParentKey() == null) || (getId() != null && getId().equals(getParentKey()))) throw new KeyParentEqualException((NamedIdObjectWithParentI) this);
-    }
-
-    //TODO aufteilen auf übergeordnete Objekte
-    @Override
-    public boolean equals(Object obj) {
-
-        if (this == obj) return true;
-        if (obj == null || obj.getClass() != this.getClass()) return false;
-
-        NamedIdObjectWithParent i2 = (NamedIdObjectWithParent) obj;
-        return EqualsUtil.areEqual(this.getId(), i2.getId()) && EqualsUtil.areEqual(this.getName(), i2.getName()) && EqualsUtil.areEqual(this.getParentKey(), i2.getParentKey());
-
-
-    }
-
-    /* 
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        int result = HashCodeUtil.SEED;
-        result = HashCodeUtil.hash(result, getId());
-        result = HashCodeUtil.hash(result, getName());
-        result = HashCodeUtil.hash(result, getParentKey());
-        return result;
-    }
-
-    /**
-     * Provides a deep copy
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-
-        NamedIdObjectWithParent cl = new NamedIdObjectWithParent((NamedIdObject) super.clone());
-
-        if (parentKey != null && !(parentKey instanceof String) && !(parentKey instanceof Integer))
-            throw new CloneNotSupportedException(" You have to check in NamedIdObjectWithParent.clone if deep copying is necessary for class " + parentKey.getClass());
-
-        if (this.parentKey != null) try {
-            cl.setParentKey(this.parentKey);
-        } catch (KeyParentEqualException e) {
-            throw new CloneNotSupportedException("Cloning didn't work" + e);
-        }
-        return cl;
-    }
-}
-
-//Created on 18.11.2003
+package de.memtext.baseobjects;
+
+import java.io.Serializable;
+
+import de.memtext.tree.KeyParentEqualException;
+import de.memtext.util.EqualsUtil;
+import de.memtext.util.HashCodeUtil;
+
+public class NamedIdObjectWithParent extends NamedIdObject implements
+        NamedIdObjectWithParentI, Serializable {
+    private Object parentKey;
+    private static final long serialVersionUID = 1;
+    public NamedIdObjectWithParent() {
+        super();
+    }
+
+    public NamedIdObjectWithParent(NamedIdObjectI namedIdObject) {
+        setId(namedIdObject.getId());
+        setName(namedIdObject.getName());
+    }
+
+    public NamedIdObjectWithParent(Object id, String name) {
+        super(id, name);
+    }
+
+    public NamedIdObjectWithParent(Object id, String name, Object parentKey)
+            throws KeyParentEqualException {
+        super(id, name);
+        setParentKey(parentKey);
+    }
+
+    public Object getParentKey() {
+        return parentKey;
+    }
+
+    public void setParentKey(Object parentKey) throws KeyParentEqualException {
+        this.parentKey = parentKey;
+        if ((getId() == null && getParentKey() == null)
+                || (getId() != null && getId().equals(getParentKey())))
+            throw new KeyParentEqualException((NamedIdObjectWithParentI) this);
+    }
+//TODO aufteilen auf übergeordnete Objekte
+    public boolean equals(Object obj) {
+
+        if ( this == obj ) return true;
+      if ( obj == null || obj.getClass() != this.getClass() ) return false;
+      
+      NamedIdObjectWithParent i2=(NamedIdObjectWithParent)obj;
+      return
+        EqualsUtil.areEqual(this.getId(), i2.getId()) &&
+        EqualsUtil.areEqual(this.getName(), i2.getName()) &&
+        EqualsUtil.areEqual(this.getParentKey(), i2.getParentKey());
+                
+       
+    }
+
+    /* 
+     * @see java.lang.Object#hashCode()
+     */
+    public int hashCode() {
+        int result = HashCodeUtil.SEED;
+         result = HashCodeUtil.hash(result, getId());
+         result = HashCodeUtil.hash(result, getName());
+         result = HashCodeUtil.hash(result, getParentKey());
+         return result ;
+    }
+    /**
+     * Provides a deep copy
+     */
+    public Object clone() throws CloneNotSupportedException {
+
+        NamedIdObjectWithParent cl = new NamedIdObjectWithParent(
+                (NamedIdObject) super.clone());
+
+        if (parentKey != null && !(parentKey instanceof String)
+                && !(parentKey instanceof Integer))
+            throw new CloneNotSupportedException(
+                    " You have to check in NamedIdObjectWithParent.clone if deep copying is necessary for class "
+                            + parentKey.getClass());
+
+        if (this.parentKey != null)
+            try {
+                cl.setParentKey(this.parentKey);
+            } catch (KeyParentEqualException e) {
+                throw new CloneNotSupportedException("Cloning didn't work" + e);
+            }
+        return cl;
+    }
+}
+
+//Created on 18.11.2003
--- a/src/de/memtext/baseobjects/NamedIdObjectWithParentI.java
+++ b/src/de/memtext/baseobjects/NamedIdObjectWithParentI.java
@ -1,10 +1,9 @@
				@@ -1,10 +1,9 @@
-package de.memtext.baseobjects;
-
-import de.memtext.tree.KeyParentEqualException;
-
-public interface NamedIdObjectWithParentI extends NamedIdObjectI {
-    public Object getParentKey();
-
-    public void setParentKey(Object parentKey) throws KeyParentEqualException;
-}
+package de.memtext.baseobjects;
+
+import de.memtext.tree.KeyParentEqualException;
+
+public interface NamedIdObjectWithParentI extends NamedIdObjectI {
+	public Object getParentKey();
+	public void setParentKey(Object parentKey) throws KeyParentEqualException;
+}
 //Created on 18.11.2003
--- a/src/de/memtext/baseobjects/NamedObject.java
+++ b/src/de/memtext/baseobjects/NamedObject.java
@ -1,57 +1,49 @@
				@@ -1,57 +1,49 @@
-package de.memtext.baseobjects;
-
-import java.io.Serializable;
-
-/**
- *
- *  @author MB
- * */
-public class NamedObject implements NamedObjectI, Serializable {
-    private String name;
-
-    private static final long serialVersionUID = 1;
-
-    /**
-     * 
-     */
-
-    public NamedObject() {
-
-    }
-
-    public NamedObject(String name) {
-        setName(name);
-    }
-
-
-    /**
-     * @return
-     */
-    @Override
-    public String getName() {
-        return name;
-    }
-
-
-
-    /**
-     * @param string
-     */
-    @Override
-    public void setName(String string) {
-        name = string;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
-    /**
-     * Provides a deep copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        return new NamedObject(this.getName());
-    }
-}
+package de.memtext.baseobjects;
+
+import java.io.Serializable;
+
+/**
+ *
+ *  @author MB
+ * */
+public class NamedObject implements NamedObjectI,Serializable {
+		private String name;
+		private static final long serialVersionUID = 1;
+	/**
+	 * 
+	 */
+
+	public NamedObject() {
+
+	}
+	public NamedObject(String name) {
+				setName(name);
+	}
+
+	
+	/**
+	 * @return
+	 */
+	public String getName() {
+		return name;
+	}
+
+	
+
+	/**
+	 * @param string
+	 */
+	public void setName(String string) {
+		name = string;
+	}
+	public String toString() {
+		return name;
+	}
+
+	/**
+	 * Provides a deep copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+              return new NamedObject(this.getName());
+    }
+}
--- a/src/de/memtext/baseobjects/NamedObjectI.java
+++ b/src/de/memtext/baseobjects/NamedObjectI.java
@ -1,15 +1,13 @@
				@@ -1,15 +1,13 @@
-package de.memtext.baseobjects;
-
-/**
- *
- *  @author MB
- * */
-public interface NamedObjectI {
-
-    public String getName();
-
-    public void setName(String name);
-
-    @Override
-    public String toString();
+package de.memtext.baseobjects;
+
+/**
+ *
+ *  @author MB
+ * */
+public interface NamedObjectI {
+	
+	public String getName();
+	
+	public void setName(String name);
+	public String toString();
 }
--- a/src/de/memtext/baseobjects/SearchReplaceTextHolder.java
+++ b/src/de/memtext/baseobjects/SearchReplaceTextHolder.java
@ -1,34 +1,32 @@
				@@ -1,34 +1,32 @@
-package de.memtext.baseobjects;
-
-/**
- * This class holds information about a string that is to be 
- * searched for and another string that the former is to be 
- * replaced with.
- * By default both are empty strings.
- */
-public class SearchReplaceTextHolder {
-    private String searchText = "", replaceText = "";
-
-    public SearchReplaceTextHolder() {
-        super();
-    }
-
-    public String getReplaceText() {
-        return replaceText;
-    }
-
-    public String getSearchText() {
-        return searchText;
-    }
-
-    public void setReplaceText(String string) {
-        replaceText = string;
-    }
-
-    public void setSearchText(String string) {
-        searchText = string;
-    }
-
-}
-
+package de.memtext.baseobjects;
+/**
+ * This class holds information about a string that is to be 
+ * searched for and another string that the former is to be 
+ * replaced with.
+ * By default both are empty strings.
+ */
+public class SearchReplaceTextHolder {
+	private String searchText="", replaceText="";
+	public SearchReplaceTextHolder() {
+		super();
+	}
+
+	public String getReplaceText() {
+		return replaceText;
+	}
+
+	public String getSearchText() {
+		return searchText;
+	}
+
+	public void setReplaceText(String string) {
+		replaceText = string;
+	}
+
+	public void setSearchText(String string) {
+		searchText = string;
+	}
+
+}
+
 //Created on 04.02.2004 at 11:40:47
--- a/src/de/memtext/baseobjects/User.java
+++ b/src/de/memtext/baseobjects/User.java
@ -1,98 +1,86 @@
				@@ -1,98 +1,86 @@
-package de.memtext.baseobjects;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import de.memtext.rights.Rights;
-
-/**
- * stellt einen User dar, könnte sicherer gemacht werden mit
- * defensive Copying
- *  @author MB
- * */
-public class User extends NamedIdObject implements Serializable {
-    private List groupMembershipIds = new ArrayList(5);
-
-    private String passwd;
-
-    private Rights rights;
-
-    private boolean isAdmin = false;
-
-    private static final long serialVersionUID = 1;
-
-    public User() {
-        setName("");
-        setPasswd("");
-    }
-
-    public User(String username, String passwd) {
-        setName(username);
-        setPasswd(passwd);
-
-    }
-
-    public User(String username, Integer userid) {
-        super(userid, username);
-        if (userid == null) throw new IllegalArgumentException("No user without userid allowed");
-    }
-
-    public User(String username) {
-        setName(username);
-    }
-
-    /**
-     * @param groupmemberships
-     */
-    public void addAllGroupmembershipsById(List groupmemberships) {
-        groupMembershipIds.addAll(groupmemberships);
-    }
-
-    public void addGroupMembershipById(Integer groupid) {
-        groupMembershipIds.add(groupid);
-    }
-
-    public String getPasswd() {
-        return passwd;
-    }
-
-
-
-    public Iterator groupmembershipIdIterator() {
-        return groupMembershipIds.iterator();
-    }
-
-    public void removeGroupMembershipById(Integer groupid) {
-        groupMembershipIds.remove(groupid);
-    }
-
-    public void setPasswd(String pwd) {
-        passwd = pwd;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return getName();
-    }
-
-    public Rights getRights() {
-        return rights;
-    }
-
-    public void setRights(Rights rights) {
-        this.rights = rights;
-    }
-
-    public boolean isAdmin() {
-        return isAdmin;
-    }
-
-    public void setAdmin(boolean isAdmin) {
-        this.isAdmin = isAdmin;
-    }
-
-}
+package de.memtext.baseobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import de.memtext.rights.Rights;
+
+/**
+ * stellt einen User dar, könnte sicherer gemacht werden mit
+ * defensive Copying
+ *  @author MB
+ * */
+public class User extends NamedIdObject implements Serializable {
+	private List groupMembershipIds = new ArrayList(5);
+	private String passwd;
+	
+	private Rights rights;
+	private boolean isAdmin=false;
+	private static final long serialVersionUID = 1;
+	public User() {
+		setName("");
+		setPasswd("");
+	}
+	public User(String username, String passwd) {
+	setName(username);
+		setPasswd(passwd);
+
+	}
+
+	public User(String username, Integer userid) {
+		super(userid,username);
+		if (userid == null)
+			throw new IllegalArgumentException("No user without userid allowed");
+	}
+	public User(String username) {
+	    setName(username);
+    }
+    /**
+	 * @param groupmemberships
+	 */
+	public void addAllGroupmembershipsById(List groupmemberships) {
+		groupMembershipIds.addAll(groupmemberships);
+	}
+	public void addGroupMembershipById(Integer groupid) {
+		groupMembershipIds.add(groupid);
+	}
+
+	public String getPasswd() {
+		return passwd;
+	}
+	
+
+	
+	public Iterator groupmembershipIdIterator() {
+		return groupMembershipIds.iterator();
+	}
+	public void removeGroupMembershipById(Integer groupid) {
+		groupMembershipIds.remove(groupid);
+	}
+
+	public void setPasswd(String pwd) {
+		passwd = pwd;
+	}
+
+	
+	public String toString()
+	{
+		
+		return getName();
+	}
+    public Rights getRights() {
+        return rights;
+    }
+    public void setRights(Rights rights) {
+        this.rights = rights;
+    }
+    public boolean isAdmin() {
+        return isAdmin;
+    }
+    public void setAdmin(boolean isAdmin) {
+        this.isAdmin = isAdmin;
+    }
+    
+}
--- a/src/de/memtext/baseobjects/coll/ActivatableItemList.java
+++ b/src/de/memtext/baseobjects/coll/ActivatableItemList.java
@ -1,347 +1,321 @@
				@@ -1,347 +1,321 @@
-package de.memtext.baseobjects.coll;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-import de.memtext.baseobjects.ActivatableItemI;
-
-/**
- *
- *  @author MB
- * */
-public class ActivatableItemList implements List, Serializable {
-    private List collect = new LinkedList();
-
-    private static final long serialVersionUID = 1;
-
-    /**
-     * 
-     */
-    public ActivatableItemList() {
-        super();
-    }
-
-    public Iterator activeItemIterator() {
-        return getActiveItems().iterator();
-    }
-
-    public Collection getActiveItems() {
-        Collection result = new LinkedList();
-        for (Iterator iter = this.iterator(); iter.hasNext();) {
-            ActivatableItemI element = (ActivatableItemI) iter.next();
-            if (element.isActive()) result.add(element);
-        }
-        return result;
-    }
-
-    public void setAllActive(boolean active) {
-        for (Iterator iter = this.iterator(); iter.hasNext();) {
-            ActivatableItemI element = (ActivatableItemI) iter.next();
-            element.setActive(active);
-        }
-    }
-
-    public boolean isAllActive() {
-        boolean result = true;
-        for (Iterator iter = this.iterator(); iter.hasNext();) {
-            ActivatableItemI element = (ActivatableItemI) iter.next();
-            if (!element.isActive()) {
-                result = false;
-                break;
-            }
-        }
-        return result;
-    }
-
-    public boolean isAllDeactivated() {
-        boolean result = true;
-        for (Iterator iter = this.iterator(); iter.hasNext();) {
-            ActivatableItemI element = (ActivatableItemI) iter.next();
-            if (element.isActive()) {
-                result = false;
-                break;
-            }
-        }
-        return result;
-    }
-
-    public int activeCount() {
-        int count = 0;
-        for (Iterator iter = this.iterator(); iter.hasNext();) {
-            ActivatableItemI element = (ActivatableItemI) iter.next();
-            if (element.isActive()) count++;
-        }
-        return count;
-    }
-
-    public int deactivatedCount() {
-
-        int count = 0;
-        for (Iterator iter = this.iterator(); iter.hasNext();) {
-            ActivatableItemI element = (ActivatableItemI) iter.next();
-            if (!element.isActive()) count++;
-        }
-        return count;
-
-    }
-
-    public ActivatableItemI getActiveItem(int pos) {
-        ActivatableItemI result = null;
-        int i = 0;
-
-        for (Iterator it = activeItemIterator(); it.hasNext();) {
-            ActivatableItemI element = (ActivatableItemI) it.next();
-            if (i == pos) {
-                result = element;
-                break;
-            }
-            i++;
-        }
-        if (result == null) throw new RuntimeException("not found");
-
-        return result;
-    }
-
-    /**
-     * 
-     * @return null if all deactivated
-     */
-    public ActivatableItemI getFirstActive() {
-        ActivatableItemI result = null;
-        for (Iterator iter = this.iterator(); iter.hasNext();) {
-            ActivatableItemI element = (ActivatableItemI) iter.next();
-            if (element.isActive()) {
-                result = element;
-                break;
-            }
-        }
-        return result;
-    }
-
-    /**
-    	 * 
-    	 * @return null if all active
-    	 */
-    public ActivatableItemI getFirstDeactivated() {
-        ActivatableItemI result = null;
-        for (Iterator iter = this.iterator(); iter.hasNext();) {
-            ActivatableItemI element = (ActivatableItemI) iter.next();
-            if (!element.isActive()) {
-                result = element;
-                break;
-            }
-        }
-        return result;
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#size()
-     */
-    @Override
-    public int size() {
-        return collect.size();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#isEmpty()
-     */
-    @Override
-    public boolean isEmpty() {
-        return collect.isEmpty();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#contains(java.lang.Object)
-     */
-    @Override
-    public boolean contains(Object o) {
-        return collect.contains(o);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#iterator()
-     */
-    @Override
-    public Iterator iterator() {
-        return collect.iterator();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#toArray()
-     */
-    @Override
-    public Object[] toArray() {
-        return collect.toArray();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#toArray(java.lang.Object[])
-     */
-    @Override
-    public Object[] toArray(Object[] a) {
-        return collect.toArray(a);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#containsAll(java.util.Collection)
-     */
-    @Override
-    public boolean containsAll(Collection c) {
-        return collect.containsAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#addAll(java.util.Collection)
-     */
-    @Override
-    public boolean addAll(Collection c) {
-        for (Iterator iter = c.iterator(); iter.hasNext();) {
-            Object element = iter.next();
-            if (!(element instanceof ActivatableItemI)) throw new IllegalArgumentException("only Activatable items");
-
-        }
-        return collect.addAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#removeAll(java.util.Collection)
-     */
-    @Override
-    public boolean removeAll(Collection c) {
-        return collect.removeAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#retainAll(java.util.Collection)
-     */
-    @Override
-    public boolean retainAll(Collection c) {
-        for (Iterator iter = c.iterator(); iter.hasNext();) {
-            Object element = iter.next();
-            if (!(element instanceof ActivatableItemI)) throw new IllegalArgumentException("only Activatable items");
-
-        }
-        return collect.retainAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#clear()
-     */
-    @Override
-    public void clear() {
-        collect.clear();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#add(java.lang.Object)
-     */
-    @Override
-    public boolean add(Object o) {
-        if (!(o instanceof ActivatableItemI)) throw new IllegalArgumentException("only Activatable items");
-        return collect.add(o);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#remove(java.lang.Object)
-     */
-    @Override
-    public boolean remove(Object o) {
-        return collect.remove(o);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.List#addAll(int, java.util.Collection)
-     */
-    @Override
-    public boolean addAll(int index, Collection c) {
-        for (Iterator iter = c.iterator(); iter.hasNext();) {
-            Object element = iter.next();
-            if (!(element instanceof ActivatableItemI)) throw new IllegalArgumentException("only Activatable items");
-
-        }
-        return collect.addAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.List#get(int)
-     */
-    @Override
-    public Object get(int index) {
-        return collect.get(index);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.List#set(int, java.lang.Object)
-     */
-    @Override
-    public Object set(int index, Object element) {
-        if (!(element instanceof ActivatableItemI)) throw new IllegalArgumentException("only Activatable items");
-        return collect.set(index, element);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.List#add(int, java.lang.Object)
-     */
-    @Override
-    public void add(int index, Object element) {
-        if (!(element instanceof ActivatableItemI)) throw new IllegalArgumentException("only Activatable items");
-        collect.add(index, element);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.List#remove(int)
-     */
-    @Override
-    public Object remove(int index) {
-        return collect.remove(index);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.List#indexOf(java.lang.Object)
-     */
-    @Override
-    public int indexOf(Object o) {
-        return collect.indexOf(o);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.List#lastIndexOf(java.lang.Object)
-     */
-    @Override
-    public int lastIndexOf(Object o) {
-        return collect.lastIndexOf(o);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.List#listIterator()
-     */
-    @Override
-    public ListIterator listIterator() {
-        return collect.listIterator();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.List#listIterator(int)
-     */
-    @Override
-    public ListIterator listIterator(int index) {
-        return collect.listIterator(index);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.List#subList(int, int)
-     */
-    @Override
-    public List subList(int fromIndex, int toIndex) {
-        return collect.subList(fromIndex, toIndex);
-    }
-
-    @Override
-    public String toString() {
-        return "ActivatableItemsList " + size() + " items";
-    }
-}
+package de.memtext.baseobjects.coll;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+import de.memtext.baseobjects.ActivatableItemI;
+
+/**
+ *
+ *  @author MB
+ * */
+public class ActivatableItemList implements List,Serializable {
+	private List collect = new LinkedList();
+	 private static final long serialVersionUID = 1;
+	/**
+	 * 
+	 */
+	public ActivatableItemList() {
+		super();
+	}
+
+	public Iterator activeItemIterator() {
+		return getActiveItems().iterator();
+	}
+
+	public Collection getActiveItems() {
+		Collection result = new LinkedList();
+		for (Iterator iter = this.iterator(); iter.hasNext();) {
+			ActivatableItemI element = (ActivatableItemI) iter.next();
+			if (element.isActive())
+				result.add(element);
+		}
+		return result;
+	}
+	public void setAllActive(boolean active) {
+		for (Iterator iter = this.iterator(); iter.hasNext();) {
+			ActivatableItemI element = (ActivatableItemI) iter.next();
+			element.setActive(active);
+		}
+	}
+	public boolean isAllActive() {
+		boolean result = true;
+		for (Iterator iter = this.iterator(); iter.hasNext();) {
+			ActivatableItemI element = (ActivatableItemI) iter.next();
+			if (!element.isActive()) {
+				result = false;
+				break;
+			}
+		}
+		return result;
+	}
+	public boolean isAllDeactivated() {
+		boolean result = true;
+		for (Iterator iter = this.iterator(); iter.hasNext();) {
+			ActivatableItemI element = (ActivatableItemI) iter.next();
+			if (element.isActive()) {
+				result = false;
+				break;
+			}
+		}
+		return result;
+	}
+	public int activeCount() {
+		int count = 0;
+		for (Iterator iter = this.iterator(); iter.hasNext();) {
+			ActivatableItemI element = (ActivatableItemI) iter.next();
+			if (element.isActive())
+				count++;
+		}
+		return count;
+	}
+	public int deactivatedCount() {
+
+		int count = 0;
+		for (Iterator iter = this.iterator(); iter.hasNext();) {
+			ActivatableItemI element = (ActivatableItemI) iter.next();
+			if (!element.isActive())
+				count++;
+		}
+		return count;
+
+	}
+	public ActivatableItemI getActiveItem(int pos) {
+		ActivatableItemI result = null;
+		int i = 0;
+
+		for (Iterator it = activeItemIterator(); it.hasNext();) {
+			ActivatableItemI element = (ActivatableItemI) it.next();
+			if (i == pos) {
+				result = element;
+				break;
+			}
+			i++;
+		}
+		if (result == null)
+			throw new RuntimeException("not found");
+
+		return result;
+	}
+	/**
+	 * 
+	 * @return null if all deactivated
+	 */
+	public ActivatableItemI getFirstActive() {
+		ActivatableItemI result = null;
+		for (Iterator iter = this.iterator(); iter.hasNext();) {
+			ActivatableItemI element = (ActivatableItemI) iter.next();
+			if (element.isActive()) {
+				result = element;
+				break;
+			}
+		}
+		return result;
+	}
+	/**
+		 * 
+		 * @return null if all active
+		 */
+	public ActivatableItemI getFirstDeactivated() {
+		ActivatableItemI result = null;
+		for (Iterator iter = this.iterator(); iter.hasNext();) {
+			ActivatableItemI element = (ActivatableItemI) iter.next();
+			if (!element.isActive()) {
+				result = element;
+				break;
+			}
+		}
+		return result;
+	}
+	/* (non-Javadoc)
+	 * @see java.util.Collection#size()
+	 */
+	public int size() {
+		return collect.size();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#isEmpty()
+	 */
+	public boolean isEmpty() {
+		return collect.isEmpty();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#contains(java.lang.Object)
+	 */
+	public boolean contains(Object o) {
+		return collect.contains(o);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#iterator()
+	 */
+	public Iterator iterator() {
+		return collect.iterator();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#toArray()
+	 */
+	public Object[] toArray() {
+		return collect.toArray();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#toArray(java.lang.Object[])
+	 */
+	public Object[] toArray(Object[] a) {
+		return collect.toArray(a);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#containsAll(java.util.Collection)
+	 */
+	public boolean containsAll(Collection c) {
+		return collect.containsAll(c);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#addAll(java.util.Collection)
+	 */
+	public boolean addAll(Collection c) {
+		for (Iterator iter = c.iterator(); iter.hasNext();) {
+			Object element = iter.next();
+			if (!(element instanceof ActivatableItemI))
+				throw new IllegalArgumentException("only Activatable items");
+
+		}
+		return collect.addAll(c);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#removeAll(java.util.Collection)
+	 */
+	public boolean removeAll(Collection c) {
+		return collect.removeAll(c);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#retainAll(java.util.Collection)
+	 */
+	public boolean retainAll(Collection c) {
+		for (Iterator iter = c.iterator(); iter.hasNext();) {
+			Object element = iter.next();
+			if (!(element instanceof ActivatableItemI))
+				throw new IllegalArgumentException("only Activatable items");
+
+		}
+		return collect.retainAll(c);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#clear()
+	 */
+	public void clear() {
+		collect.clear();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#add(java.lang.Object)
+	 */
+	public boolean add(Object o) {
+		if (!(o instanceof ActivatableItemI))
+			throw new IllegalArgumentException("only Activatable items");
+		return collect.add(o);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#remove(java.lang.Object)
+	 */
+	public boolean remove(Object o) {
+		return collect.remove(o);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.List#addAll(int, java.util.Collection)
+	 */
+	public boolean addAll(int index, Collection c) {
+		for (Iterator iter = c.iterator(); iter.hasNext();) {
+			Object element = iter.next();
+			if (!(element instanceof ActivatableItemI))
+				throw new IllegalArgumentException("only Activatable items");
+
+		}
+		return collect.addAll(c);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.List#get(int)
+	 */
+	public Object get(int index) {
+		return collect.get(index);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.List#set(int, java.lang.Object)
+	 */
+	public Object set(int index, Object element) {
+		if (!(element instanceof ActivatableItemI))
+			throw new IllegalArgumentException("only Activatable items");
+		return collect.set(index, element);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.List#add(int, java.lang.Object)
+	 */
+	public void add(int index, Object element) {
+		if (!(element instanceof ActivatableItemI))
+			throw new IllegalArgumentException("only Activatable items");
+		collect.add(index, element);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.List#remove(int)
+	 */
+	public Object remove(int index) {
+		return collect.remove(index);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.List#indexOf(java.lang.Object)
+	 */
+	public int indexOf(Object o) {
+		return collect.indexOf(o);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.List#lastIndexOf(java.lang.Object)
+	 */
+	public int lastIndexOf(Object o) {
+		return collect.lastIndexOf(o);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.List#listIterator()
+	 */
+	public ListIterator listIterator() {
+		return collect.listIterator();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.List#listIterator(int)
+	 */
+	public ListIterator listIterator(int index) {
+		return collect.listIterator(index);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.List#subList(int, int)
+	 */
+	public List subList(int fromIndex, int toIndex) {
+		return collect.subList(fromIndex, toIndex);
+	}
+	public String toString() {
+		return "ActivatableItemsList " + size() + " items";
+	}
+}
--- a/src/de/memtext/baseobjects/coll/BaseObjectCollection.java
+++ b/src/de/memtext/baseobjects/coll/BaseObjectCollection.java
@ -1,141 +1,125 @@
				@@ -1,141 +1,125 @@
-package de.memtext.baseobjects.coll;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-/**
- * Basis for the collections, but default the used collection is a 
- * linkedList, subclasses may change to use a list or set
- *  @author MB
- * */
-public class BaseObjectCollection implements Collection, Serializable {
-    protected Collection collect;
-
-    private static final long serialVersionUID = 1;
-
-    public BaseObjectCollection() {
-        super();
-        collect = new LinkedList();
-    }
-
-
-
-    @Override
-    public int size() {
-        return collect.size();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#isEmpty()
-     */
-    @Override
-    public boolean isEmpty() {
-        return collect.isEmpty();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#contains(java.lang.Object)
-     */
-    @Override
-    public boolean contains(Object o) {
-        return collect.contains(o);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#iterator()
-     */
-    @Override
-    public Iterator iterator() {
-        return collect.iterator();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#toArray()
-     */
-    @Override
-    public Object[] toArray() {
-        return collect.toArray();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#toArray(java.lang.Object[])
-     */
-    @Override
-    public Object[] toArray(Object[] a) {
-        return collect.toArray(a);
-    }
-
-
-
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#containsAll(java.util.Collection)
-     */
-    @Override
-    public boolean containsAll(Collection c) {
-        return collect.containsAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#addAll(java.util.Collection)
-     */
-    @Override
-    public boolean addAll(Collection c) {
-        return collect.addAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#removeAll(java.util.Collection)
-     */
-    @Override
-    public boolean removeAll(Collection c) {
-        return collect.removeAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#retainAll(java.util.Collection)
-     */
-    @Override
-    public boolean retainAll(Collection c) {
-        return collect.retainAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#clear()
-     */
-    @Override
-    public void clear() {
-        collect.clear();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#add(java.lang.Object)
-     */
-    @Override
-    public boolean add(Object o) {
-        if (o == null) throw new IllegalArgumentException("can't add null value");
-        return collect.add(o);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#remove(java.lang.Object)
-     */
-    @Override
-    public boolean remove(Object o) {
-        return collect.remove(o);
-    }
-
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        BaseObjectCollection c = new BaseObjectCollection();
-        c.addAll(this);
-        return c;
-    }
-}
+package de.memtext.baseobjects.coll;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+/**
+ * Basis for the collections, but default the used collection is a 
+ * linkedList, subclasses may change to use a list or set
+ *  @author MB
+ * */
+public class BaseObjectCollection implements Collection,Serializable {
+	protected Collection collect;
+	 private static final long serialVersionUID = 1;
+	public BaseObjectCollection() {
+		super();
+		collect = new LinkedList();
+	}
+
+
+
+		public int size() {
+		return collect.size();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#isEmpty()
+	 */
+	public boolean isEmpty() {
+		return collect.isEmpty();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#contains(java.lang.Object)
+	 */
+	public boolean contains(Object o) {
+		return collect.contains(o);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#iterator()
+	 */
+	public Iterator iterator() {
+		return collect.iterator();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#toArray()
+	 */
+	public Object[] toArray() {
+		return collect.toArray();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#toArray(java.lang.Object[])
+	 */
+	public Object[] toArray(Object[] a) {
+		return collect.toArray(a);
+	}
+
+	
+	
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#containsAll(java.util.Collection)
+	 */
+	public boolean containsAll(Collection c) {
+		return collect.containsAll(c);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#addAll(java.util.Collection)
+	 */
+	public boolean addAll(Collection c) {
+		return collect.addAll(c);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#removeAll(java.util.Collection)
+	 */
+	public boolean removeAll(Collection c) {
+		return collect.removeAll(c);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#retainAll(java.util.Collection)
+	 */
+	public boolean retainAll(Collection c) {
+		return collect.retainAll(c);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#clear()
+	 */
+	public void clear() {
+		collect.clear();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#add(java.lang.Object)
+	 */
+	public boolean add(Object o) {
+		if (o==null) throw new IllegalArgumentException("can't add null value");
+	return collect.add(o);
+		}
+
+	/* (non-Javadoc)
+	 * @see java.util.Collection#remove(java.lang.Object)
+	 */
+	public boolean remove(Object o) {
+		return collect.remove(o);
+	}
+
+	
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        BaseObjectCollection c=new BaseObjectCollection();
+        c.addAll(this);
+        return c;
+    }
+}
 //Created on 30.1.2004
--- a/src/de/memtext/baseobjects/coll/IdObjectCollection.java
+++ b/src/de/memtext/baseobjects/coll/IdObjectCollection.java
@ -1,107 +1,108 @@
				@@ -1,107 +1,108 @@
-package de.memtext.baseobjects.coll;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-
-import de.memtext.baseobjects.IdObjectI;
-import de.memtext.util.StringUtils;
-
-/**
- *
- *  @author MB
- * */
-public class IdObjectCollection extends BaseObjectCollection implements Collection, Serializable {
-    private static final long serialVersionUID = 1;
-
-    public IdObjectCollection() {
-        super();
-    }
-
-    /**
-     * 
-     * @param id
-     * @return object
-     * @throws IllegalArgumentException if nothing found
-     */
-    public IdObjectI getById(Object id) {
-        IdObjectI test, result = null;
-        for (Iterator it = collect.iterator(); it.hasNext();) {
-            test = (IdObjectI) it.next();
-            if ((id == null && test.getId() == null) || (test.getId() != null && test.getId().equals(id))) {
-                result = test;
-                break;
-            }
-        }
-        if (result == null) throw new IllegalArgumentException("No element with id " + id + " found!");
-        return result;
-    }
-
-    /**
-     * like '12','34','343'
-     * useful for creating sqls like where x in (...)
-     * @return
-     */
-    public String getIdsApostropheString() {
-        StringBuffer result = new StringBuffer();
-        IdObjectI test;
-        for (Iterator it = collect.iterator(); it.hasNext();) {
-            test = (IdObjectI) it.next();
-            result.append("'" + test.getId() + "',");
-        }
-        StringUtils.deleteLastChar(result);
-        return result.toString();
-    }
-
-    public boolean containsItemWithId(Object id) {
-        boolean result = false;
-        IdObjectI test;
-        for (Iterator it = collect.iterator(); it.hasNext();) {
-            test = (IdObjectI) it.next();
-            if (test.getId().equals(id)) {
-                result = true;
-                break;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Checks if the collection contains only the ids given in the param collection ids
-     * @param Collection ids
-     * @return 
-     */
-    public boolean consistsOfIds(Collection ids) {
-
-        if (this.size() != ids.size()) return false;
-        boolean result = true;
-        for (Iterator it = ids.iterator(); it.hasNext();) {
-            Object id = it.next();
-            try {
-                Object dummy = getById(id);
-            } catch (IllegalArgumentException e) {
-                result = false;
-                break;
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public boolean add(Object o) {
-        if (o == null) throw new IllegalArgumentException("can't add null value");
-        if (!(o instanceof IdObjectI)) throw new IllegalArgumentException("only named IdObjects allowed");
-        return collect.add(o);
-    }
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        IdObjectCollection c = new IdObjectCollection();
-        c.addAll(this);
-        return c;
-    }
-}
+package de.memtext.baseobjects.coll;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+
+import de.memtext.baseobjects.IdObjectI;
+import de.memtext.util.StringUtils;
+
+/**
+ *
+ *  @author MB
+ * */
+public class IdObjectCollection
+	extends BaseObjectCollection
+	implements Collection ,Serializable{
+    private static final long serialVersionUID = 1;
+	public IdObjectCollection() {
+		super();
+	}
+	/**
+	 * 
+	 * @param id
+	 * @return object
+	 * @throws IllegalArgumentException if nothing found
+	 */
+	public IdObjectI getById(Object id) {
+		IdObjectI test, result = null;
+		for (Iterator it = collect.iterator(); it.hasNext();) {
+			test = (IdObjectI) it.next();
+			if ((id == null && test.getId() == null)
+				|| (test.getId() != null && test.getId().equals(id))) {
+				result = test;
+				break;
+			}
+		}
+		if (result == null)
+			throw new IllegalArgumentException(
+				"No element with id " + id + " found!");
+		return result;
+	}
+	/**
+	 * like '12','34','343'
+	 * useful for creating sqls like where x in (...)
+	 * @return
+	 */
+	public String getIdsApostropheString() {
+		StringBuffer result = new StringBuffer();
+		IdObjectI test;
+		for (Iterator it = collect.iterator(); it.hasNext();) {
+			test = (IdObjectI) it.next();
+			result.append("'" + test.getId() + "',");
+		}
+		StringUtils.deleteLastChar(result);
+		return result.toString();
+	}
+	public boolean containsItemWithId(Object id) {
+		boolean result = false;
+		IdObjectI test;
+		for (Iterator it = collect.iterator(); it.hasNext();) {
+			test = (IdObjectI) it.next();
+			if (test.getId().equals(id)) {
+				result = true;
+				break;
+			}
+		}
+		return result;
+	}
+	/**
+	 * Checks if the collection contains only the ids given in the param collection ids
+	 * @param Collection ids
+	 * @return 
+	 */
+	public boolean consistsOfIds(Collection ids) {
+
+		if (this.size() != ids.size())
+			return false;
+		boolean result = true;
+		for (Iterator it = ids.iterator(); it.hasNext();) {
+			Object id = it.next();
+			try {
+				Object dummy = getById(id);
+			} catch (IllegalArgumentException e) {
+				result = false;
+				break;
+			}
+		}
+		return result;
+	}
+
+	public boolean add(Object o) {
+		if (o == null)
+			throw new IllegalArgumentException("can't add null value");
+		if (!(o instanceof IdObjectI))
+			throw new IllegalArgumentException("only named IdObjects allowed");
+		return collect.add(o);
+	}
+
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        IdObjectCollection c=new IdObjectCollection();
+        c.addAll(this);
+        return c;
+    }
+}
 //Created on 30.1.2004
--- a/src/de/memtext/baseobjects/coll/IdObjectList.java
+++ b/src/de/memtext/baseobjects/coll/IdObjectList.java
@ -1,97 +1,84 @@
				@@ -1,97 +1,84 @@
-package de.memtext.baseobjects.coll;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-import de.memtext.baseobjects.IdObjectI;
-import de.memtext.util.StringUtils;
-
-/**
- *
- *  @author MB
- * */
-public class IdObjectList extends IdObjectCollection implements List {
-    private static final long serialVersionUID = 1;
-
-    public IdObjectList() {
-        super();
-        collect = new LinkedList();
-    }
-
-
-    @Override
-    public Object get(int pos) {
-        return ((List) collect).get(pos);
-    }
-
-    @Override
-    public boolean addAll(int arg0, Collection arg1) {
-        return ((List) collect).addAll(arg0, arg1);
-    }
-
-    @Override
-    public Object set(int arg0, Object arg1) {
-        return ((List) collect).set(arg0, arg1);
-    }
-
-    @Override
-    public void add(int pos, Object arg1) {
-        ((List) collect).add(pos, arg1);
-    }
-
-    @Override
-    public Object remove(int arg0) {
-        return ((List) collect).remove(arg0);
-    }
-
-
-    @Override
-    public ListIterator listIterator(int arg0) {
-        return ((List) collect).listIterator(arg0);
-    }
-    
-    @Override
-    public List subList(int arg0, int arg1) {
-        return ((List) collect).subList(arg0, arg1);
-    }
-
-    @Override
-    public int indexOf(Object arg0) {
-        return ((List) collect).indexOf(arg0);
-    }
-
-    @Override
-    public int lastIndexOf(Object arg0) {
-        return ((List) collect).lastIndexOf(arg0);
-    }
-
-    @Override
-    public ListIterator listIterator() {
-        return ((List) collect).listIterator();
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer result = new StringBuffer("idobject list:");
-        for (Iterator it = this.iterator(); it.hasNext();) {
-            IdObjectI element = (IdObjectI) it.next();
-            result.append(element.toString() + ",");
-        }
-        StringUtils.getLastChar(result);
-        return result.toString();
-    }
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        IdObjectList c = new IdObjectList();
-        c.addAll(this);
-        return c;
-    }
-}
-//Created on 30.1.2004
+package de.memtext.baseobjects.coll;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+import de.memtext.baseobjects.IdObjectI;
+import de.memtext.util.StringUtils;
+
+/**
+ *
+ *  @author MB
+ * */
+public class IdObjectList extends IdObjectCollection implements List {
+    private static final long serialVersionUID = 1;
+	public IdObjectList() {
+		super();
+		collect=new LinkedList();
+	}
+
+
+	public Object get(int pos)
+	{
+		return ((List)collect).get(pos);
+	}
+	
+	public boolean addAll(int arg0, Collection arg1) {
+		return ((List)collect).addAll(arg0,arg1);
+	}
+
+	public Object set(int arg0, Object arg1) {
+		return ((List)collect).set(arg0,arg1);
+	}
+
+	public void add(int pos, Object arg1) {
+		((List)collect).add(pos,arg1);
+	}
+
+	public Object remove(int arg0) {
+		return ((List)collect).remove(arg0);
+	}
+
+	
+	public ListIterator listIterator(int arg0) {
+		return ((List)collect).listIterator(arg0);
+	}
+
+	public List subList(int arg0, int arg1) {
+		return ((List)collect).subList(arg0,arg1);
+	}
+
+	public int indexOf(Object arg0) {
+		return ((List)collect).indexOf(arg0);
+	}
+
+	public int lastIndexOf(Object arg0) {
+		return ((List)collect).lastIndexOf(arg0);
+	}
+
+	public ListIterator listIterator() {
+		return ((List)collect).listIterator();
+	}
+	public String toString()
+	{
+	    StringBuffer result=new StringBuffer("idobject list:");
+	    for (Iterator it = this.iterator(); it.hasNext();) {
+            IdObjectI element = (IdObjectI) it.next();
+            result.append(element.toString()+",");
+        }
+	    StringUtils.getLastChar(result);
+	    return result.toString();
+	}
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        IdObjectList c=new IdObjectList();
+        c.addAll(this);
+        return c;
+    }
+}
+//Created on 30.1.2004
--- a/src/de/memtext/baseobjects/coll/IdObjectSet.java
+++ b/src/de/memtext/baseobjects/coll/IdObjectSet.java
@ -1,26 +1,24 @@
				@@ -1,26 +1,24 @@
-package de.memtext.baseobjects.coll;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class IdObjectSet extends IdObjectCollection implements Set {
-    private static final long serialVersionUID = 1;
-
-    public IdObjectSet() {
-        super();
-        collect = new HashSet();
-    }
-
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        IdObjectSet c = new IdObjectSet();
-        c.addAll(this);
-        return c;
-    }
-}
-
+package de.memtext.baseobjects.coll;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class IdObjectSet extends IdObjectCollection implements Set  {
+    private static final long serialVersionUID = 1;
+	public IdObjectSet() {
+		super();
+		collect=new HashSet();
+	}
+
+	
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        IdObjectSet c=new IdObjectSet();
+        c.addAll(this);
+        return c;
+    }
+}
+
 //Created on 30.1.2004
--- a/src/de/memtext/baseobjects/coll/NamedIdObjectCollection.java
+++ b/src/de/memtext/baseobjects/coll/NamedIdObjectCollection.java
@ -1,135 +1,138 @@
				@@ -1,135 +1,138 @@
-package de.memtext.baseobjects.coll;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-
-import de.memtext.baseobjects.NamedIdObjectI;
-import de.memtext.util.EqualsUtil;
-import de.memtext.util.StringUtils;
-
-/**
- * 
- * @author MB
- */
-public class NamedIdObjectCollection extends NamedObjectCollection implements Collection, Serializable {
-    private static final long serialVersionUID = 1;
-
-    public NamedIdObjectCollection() {
-        super();
-    }
-
-    /**
-     * 
-     * @param id
-     * @return object
-     * @throws IllegalArgumentException
-     *             if nothing found
-     */
-    public NamedIdObjectI getById(Object id) {
-        NamedIdObjectI test, result = null;
-        for (Iterator it = collect.iterator(); it.hasNext();) {
-            test = (NamedIdObjectI) it.next();
-            if ((id == null && test.getId() == null) || (test.getId() != null && test.getId().equals(id))) {
-                result = test;
-                break;
-            }
-        }
-        if (result == null) throw new IllegalArgumentException("No element with id " + id + " found!");
-        return result;
-    }
-
-    /**
-     * like '12','34','343' useful for creating sqls like where x in (...)
-     * 
-     * @return
-     */
-    public String getIdsApostropheString() {
-        StringBuffer result = new StringBuffer();
-        NamedIdObjectI test;
-        for (Iterator it = collect.iterator(); it.hasNext();) {
-            test = (NamedIdObjectI) it.next();
-            result.append("'" + test.getId() + "',");
-        }
-        StringUtils.deleteLastChar(result);
-        return result.toString();
-    }
-
-    @Override
-    public boolean containsItemWithName(String name) {
-        boolean result = false;
-        NamedIdObjectI test;
-        for (Iterator it = collect.iterator(); it.hasNext();) {
-            test = (NamedIdObjectI) it.next();
-            if (test.getName().equals(name)) {
-                result = true;
-                break;
-            }
-        }
-        return result;
-    }
-
-    public boolean containsItemWithId(Object id) {
-        boolean result = false;
-        NamedIdObjectI test;
-        for (Iterator it = collect.iterator(); it.hasNext();) {
-            test = (NamedIdObjectI) it.next();
-            if (EqualsUtil.areEqual(test.getId(), id)) {
-                result = true;
-                break;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Checks if the collection contains only the ids given in the param
-     * collection ids
-     * 
-     * @param Collection
-     *            ids
-     * @return
-     */
-    public boolean consistsOfIds(Collection ids) {
-
-        if (this.size() != ids.size()) return false;
-        boolean result = true;
-        for (Iterator it = ids.iterator(); it.hasNext();) {
-            Object id = it.next();
-            try {
-                Object dummy = getById(id);
-            } catch (IllegalArgumentException e) {
-                result = false;
-                break;
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public boolean add(Object o) {
-        if (o == null) throw new IllegalArgumentException("can't add null value");
-        if (!(o instanceof NamedIdObjectI)) throw new IllegalArgumentException("only named IdObjects allowed");
-        return collect.add(o);
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer result = new StringBuffer(size() + " NamedIdObjects: ");
-        for (Iterator it = this.iterator(); it.hasNext();) {
-            NamedIdObjectI element = (NamedIdObjectI) it.next();
-            result.append(element + " - ");
-        }
-        return result.toString();
-    }
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectCollection c = new NamedIdObjectCollection();
-        c.addAll(this);
-        return c;
-    }
+package de.memtext.baseobjects.coll;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+
+import de.memtext.baseobjects.NamedIdObject;
+import de.memtext.baseobjects.NamedIdObjectI;
+import de.memtext.util.EqualsUtil;
+import de.memtext.util.StringUtils;
+
+/**
+ * 
+ * @author MB
+ */
+public class NamedIdObjectCollection extends NamedObjectCollection implements
+        Collection, Serializable {
+    private static final long serialVersionUID = 1;
+    public NamedIdObjectCollection() {
+        super();
+    }
+
+    /**
+     * 
+     * @param id
+     * @return object
+     * @throws IllegalArgumentException
+     *             if nothing found
+     */
+    public NamedIdObjectI getById(Object id) {
+        NamedIdObjectI test, result = null;
+        for (Iterator it = collect.iterator(); it.hasNext();) {
+            test = (NamedIdObjectI) it.next();
+            if ((id == null && test.getId() == null)
+                    || (test.getId() != null && test.getId().equals(id))) {
+                result = test;
+                break;
+            }
+        }
+        if (result == null)
+            throw new IllegalArgumentException("No element with id " + id
+                    + " found!");
+        return result;
+    }
+
+    /**
+     * like '12','34','343' useful for creating sqls like where x in (...)
+     * 
+     * @return
+     */
+    public String getIdsApostropheString() {
+        StringBuffer result = new StringBuffer();
+        NamedIdObjectI test;
+        for (Iterator it = collect.iterator(); it.hasNext();) {
+            test = (NamedIdObjectI) it.next();
+            result.append("'" + test.getId() + "',");
+        }
+        StringUtils.deleteLastChar(result);
+        return result.toString();
+    }
+
+    public boolean containsItemWithName(String name) {
+        boolean result = false;
+        NamedIdObjectI test;
+        for (Iterator it = collect.iterator(); it.hasNext();) {
+            test = (NamedIdObjectI) it.next();
+            if (test.getName().equals(name)) {
+                result = true;
+                break;
+            }
+        }
+        return result;
+    }
+
+    public boolean containsItemWithId(Object id) {
+        boolean result = false;
+        NamedIdObjectI test;
+        for (Iterator it = collect.iterator(); it.hasNext();) {
+            test = (NamedIdObjectI) it.next();
+            if (EqualsUtil.areEqual(test.getId(),id)) {
+                result = true;
+                break;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Checks if the collection contains only the ids given in the param
+     * collection ids
+     * 
+     * @param Collection
+     *            ids
+     * @return
+     */
+    public boolean consistsOfIds(Collection ids) {
+
+        if (this.size() != ids.size())
+            return false;
+        boolean result = true;
+        for (Iterator it = ids.iterator(); it.hasNext();) {
+            Object id = it.next();
+            try {
+                Object dummy = getById(id);
+            } catch (IllegalArgumentException e) {
+                result = false;
+                break;
+            }
+        }
+        return result;
+    }
+
+    public boolean add(Object o) {
+        if (o == null)
+            throw new IllegalArgumentException("can't add null value");
+        if (!(o instanceof NamedIdObjectI))
+            throw new IllegalArgumentException("only named IdObjects allowed");
+               return collect.add(o);
+    }
+
+    public String toString() {
+        StringBuffer result = new StringBuffer(size() + " NamedIdObjects: ");
+        for (Iterator it = this.iterator(); it.hasNext();) {
+            NamedIdObjectI element = (NamedIdObjectI) it.next();
+            result.append(element + " - ");
+        }
+        return result.toString();
+    }
+    
+    /**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        NamedIdObjectCollection c=new NamedIdObjectCollection();
+        c.addAll(this);
+        return c;
+    }
 }
--- a/src/de/memtext/baseobjects/coll/NamedIdObjectList.java
+++ b/src/de/memtext/baseobjects/coll/NamedIdObjectList.java
@ -1,82 +1,71 @@
				@@ -1,82 +1,71 @@
-package de.memtext.baseobjects.coll;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-/**
- *
- *  @author MB
- * */
-public class NamedIdObjectList extends NamedIdObjectCollection implements List {
-    private static final long serialVersionUID = 1;
-
-    public NamedIdObjectList() {
-        super();
-        collect = new LinkedList();
-    }
-
-
-    @Override
-    public Object get(int pos) {
-        return ((List) collect).get(pos);
-    }
-
-    @Override
-    public boolean addAll(int arg0, Collection arg1) {
-        return ((List) collect).addAll(arg0, arg1);
-    }
-
-    @Override
-    public Object set(int arg0, Object arg1) {
-        return ((List) collect).set(arg0, arg1);
-    }
-
-    @Override
-    public void add(int pos, Object arg1) {
-        ((List) collect).add(pos, arg1);
-    }
-
-    @Override
-    public Object remove(int arg0) {
-        return ((List) collect).remove(arg0);
-    }
-
-
-    @Override
-    public ListIterator listIterator(int arg0) {
-        return ((List) collect).listIterator(arg0);
-    }
-
-    @Override
-    public List subList(int arg0, int arg1) {
-        return ((List) collect).subList(arg0, arg1);
-    }
-
-    @Override
-    public int indexOf(Object arg0) {
-        return ((List) collect).indexOf(arg0);
-    }
-
-    @Override
-    public int lastIndexOf(Object arg0) {
-        return ((List) collect).lastIndexOf(arg0);
-    }
-
-    @Override
-    public ListIterator listIterator() {
-        return ((List) collect).listIterator();
-    }
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectList c = new NamedIdObjectList();
-        c.addAll(this);
-        return c;
-    }
-
-}
+package de.memtext.baseobjects.coll;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+/**
+ *
+ *  @author MB
+ * */
+public class NamedIdObjectList extends NamedIdObjectCollection implements List {
+    private static final long serialVersionUID = 1;
+	public NamedIdObjectList() {
+		super();
+		collect=new LinkedList();
+	}
+
+
+	public Object get(int pos)
+	{
+		return ((List)collect).get(pos);
+	}
+	
+	public boolean addAll(int arg0, Collection arg1) {
+		return ((List)collect).addAll(arg0,arg1);
+	}
+
+	public Object set(int arg0, Object arg1) {
+		return ((List)collect).set(arg0,arg1);
+	}
+
+	public void add(int pos, Object arg1) {
+		((List)collect).add(pos,arg1);
+	}
+
+	public Object remove(int arg0) {
+		return ((List)collect).remove(arg0);
+	}
+
+	
+	public ListIterator listIterator(int arg0) {
+		return ((List)collect).listIterator(arg0);
+	}
+
+	public List subList(int arg0, int arg1) {
+		return ((List)collect).subList(arg0,arg1);
+	}
+
+	public int indexOf(Object arg0) {
+		return ((List)collect).indexOf(arg0);
+	}
+
+	public int lastIndexOf(Object arg0) {
+		return ((List)collect).lastIndexOf(arg0);
+	}
+
+	public ListIterator listIterator() {
+		return ((List)collect).listIterator();
+	}
+
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        NamedIdObjectList c=new NamedIdObjectList();
+        c.addAll(this);
+        return c;
+    }
+	
+}
--- a/src/de/memtext/baseobjects/coll/NamedIdObjectSet.java
+++ b/src/de/memtext/baseobjects/coll/NamedIdObjectSet.java
@ -1,38 +1,35 @@
				@@ -1,38 +1,35 @@
-package de.memtext.baseobjects.coll;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class NamedIdObjectSet extends NamedIdObjectCollection implements Set {
-    private static final long serialVersionUID = 1;
-
-    /**
-     * Default uses a HashSet internally;
-     *
-     */
-    public NamedIdObjectSet() {
-        super();
-        collect = new HashSet();
-    }
-
-    /**
-     *  
-     * @param set the implementation of Set interface to use internally
-     */
-    public NamedIdObjectSet(Set set) {
-        super();
-        collect = set;
-    }
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectSet c = new NamedIdObjectSet();
-        c.addAll(this);
-        return c;
-    }
-}
-
+package de.memtext.baseobjects.coll;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class NamedIdObjectSet extends NamedIdObjectCollection implements Set  {
+    private static final long serialVersionUID = 1;
+	/**
+	 * Default uses a HashSet internally;
+	 *
+	 */
+    public NamedIdObjectSet() {
+		super();
+		collect=new HashSet();
+	}
+	/**
+	 *  
+	 * @param set the implementation of Set interface to use internally
+	 */
+	public NamedIdObjectSet(Set set) {
+		super();
+		collect=set;
+	}
+	
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        NamedIdObjectSet c=new NamedIdObjectSet();
+        c.addAll(this);
+        return c;
+    }
+}
+
 //Created on 03.12.2003
--- a/src/de/memtext/baseobjects/coll/NamedIdObjectWithParentCollection.java
+++ b/src/de/memtext/baseobjects/coll/NamedIdObjectWithParentCollection.java
@ -1,75 +1,82 @@
				@@ -1,75 +1,82 @@
-package de.memtext.baseobjects.coll;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import de.memtext.baseobjects.NamedIdObjectWithParentI;
-import de.memtext.util.EqualsUtil;
-
-public class NamedIdObjectWithParentCollection extends NamedIdObjectCollection implements Collection {
-    private static final long serialVersionUID = 1;
-
-    public NamedIdObjectWithParentCollection() {
-        super();
-    }
-
-    public boolean containsItemWithParent(Object parent) {
-        boolean result = false;
-        NamedIdObjectWithParentI test;
-        for (Iterator it = collect.iterator(); it.hasNext();) {
-            test = (NamedIdObjectWithParentI) it.next();
-            if (EqualsUtil.areEqual(test.getParentKey(), parent)) {
-                result = true;
-                break;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * get a collection with all objects in the collection that have a 
-     * given parentKey
-     * @param parentKey
-     * @return collection if concrete object is a NamedIdObjectWithParentList also
-     * returns a NamedIdObjectWithParentList, same for NamedIdObjectWithParentSet
-     * makes casting possible
-     */
-    public NamedIdObjectWithParentCollection getByParent(Object parentKey) {
-        NamedIdObjectWithParentCollection result = new NamedIdObjectWithParentCollection();
-        if (this instanceof NamedIdObjectWithParentList) result = new NamedIdObjectWithParentList();
-        if (this instanceof NamedIdObjectWithParentSet) result = new NamedIdObjectWithParentSet();
-
-        for (Iterator it = this.iterator(); it.hasNext();) {
-            NamedIdObjectWithParentI element = (NamedIdObjectWithParentI) it.next();
-            if (EqualsUtil.areEqual(element.getParentKey(), parentKey)) result.add(element);
-        }
-        return result;
-    }
-
-    public int countItemsWithParent(Object parent) {
-        return getByParent(parent).size();
-
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer result = new StringBuffer(size() + " NamedIdObjectsWithParent: ");
-        for (Iterator it = this.iterator(); it.hasNext();) {
-            NamedIdObjectWithParentI element = (NamedIdObjectWithParentI) it.next();
-            result.append(element + " - ");
-        }
-        return result.toString();
-    }
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectWithParentCollection c = new NamedIdObjectWithParentCollection();
-        c.addAll(this);
-        return c;
-    }
-}
-
+package de.memtext.baseobjects.coll;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import de.memtext.baseobjects.NamedIdObject;
+import de.memtext.baseobjects.NamedIdObjectI;
+import de.memtext.baseobjects.NamedIdObjectWithParent;
+import de.memtext.baseobjects.NamedIdObjectWithParentI;
+import de.memtext.util.EqualsUtil;
+
+public class NamedIdObjectWithParentCollection
+	extends NamedIdObjectCollection
+	implements Collection {
+    private static final long serialVersionUID = 1;
+	public NamedIdObjectWithParentCollection() {
+		super();
+	}
+	
+	public boolean containsItemWithParent(Object parent) {
+        boolean result = false;
+        NamedIdObjectWithParentI test;
+        for (Iterator it = collect.iterator(); it.hasNext();) {
+            test = (NamedIdObjectWithParentI) it.next();
+            if (EqualsUtil.areEqual(test.getParentKey(),parent)) {
+                result = true;
+                break;
+            }
+        }
+        return result;
+    }
+	/**
+	 * get a collection with all objects in the collection that have a 
+	 * given parentKey
+	 * @param parentKey
+	 * @return collection if concrete object is a NamedIdObjectWithParentList also
+	 * returns a NamedIdObjectWithParentList, same for NamedIdObjectWithParentSet
+	 * makes casting possible
+	 */
+	public NamedIdObjectWithParentCollection getByParent(Object parentKey) {
+		NamedIdObjectWithParentCollection result =
+			new NamedIdObjectWithParentCollection();
+		if (this instanceof NamedIdObjectWithParentList)
+			result = new NamedIdObjectWithParentList();
+		if (this instanceof NamedIdObjectWithParentSet)
+			result = new NamedIdObjectWithParentSet();
+
+		for (Iterator it = this.iterator(); it.hasNext();) {
+			NamedIdObjectWithParentI element =
+				(NamedIdObjectWithParentI) it.next();
+			if (EqualsUtil.areEqual(element.getParentKey(),parentKey))
+				result.add(element);
+		}
+		return result;
+	}
+
+	public int countItemsWithParent(Object parent)
+	{
+	   return getByParent(parent).size();
+  
+	}
+	public String toString()
+	{
+	    StringBuffer result=new StringBuffer(size()+" NamedIdObjectsWithParent: ");
+	    for (Iterator it = this.iterator(); it.hasNext();) {
+	        NamedIdObjectWithParentI element = (NamedIdObjectWithParentI) it.next();
+	        result.append(element+" - ");
+	    }
+	    return result.toString();
+	}
+
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        NamedIdObjectWithParentCollection c=new NamedIdObjectWithParentCollection();
+        c.addAll(this);
+        return c;
+    }
+}
+
 //Created on 18.11.2003
--- a/src/de/memtext/baseobjects/coll/NamedIdObjectWithParentList.java
+++ b/src/de/memtext/baseobjects/coll/NamedIdObjectWithParentList.java
@ -1,77 +1,66 @@
				@@ -1,77 +1,66 @@
-package de.memtext.baseobjects.coll;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-public class NamedIdObjectWithParentList extends NamedIdObjectWithParentCollection implements List {
-    private static final long serialVersionUID = 1;
-
-    public NamedIdObjectWithParentList() {
-        super();
-        collect = new LinkedList();
-    }
-
-    @Override
-    public Object get(int pos) {
-        return ((List) collect).get(pos);
-    }
-    @Override
-    public boolean addAll(int arg0, Collection arg1) {
-        return ((List) collect).addAll(arg0, arg1);
-    }
-
-    @Override
-    public Object set(int arg0, Object arg1) {
-        return ((List) collect).set(arg0, arg1);
-    }
-
-    @Override
-    public void add(int pos, Object arg1) {
-        ((List) collect).add(pos, arg1);
-    }
-
-    @Override
-    public Object remove(int arg0) {
-        return ((List) collect).remove(arg0);
-    }
-
-    @Override
-    public ListIterator listIterator(int arg0) {
-        return ((List) collect).listIterator(arg0);
-    }
-    
-    @Override
-    public List subList(int arg0, int arg1) {
-        return ((List) collect).subList(arg0, arg1);
-    }
-
-    @Override
-    public int indexOf(Object arg0) {
-        return ((List) collect).indexOf(arg0);
-    }
-
-    @Override
-    public int lastIndexOf(Object arg0) {
-        return ((List) collect).lastIndexOf(arg0);
-    }
-    
-    @Override
-    public ListIterator listIterator() {
-        return ((List) collect).listIterator();
-    }
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectWithParentList c = new NamedIdObjectWithParentList();
-        c.addAll(this);
-        return c;
-    }
-}
-
-
+package de.memtext.baseobjects.coll;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+public class NamedIdObjectWithParentList extends NamedIdObjectWithParentCollection implements List {
+    private static final long serialVersionUID = 1;
+	public NamedIdObjectWithParentList() {
+		super();
+		collect=new LinkedList();
+	}
+	public Object get(int pos)
+	{
+		return ((List)collect).get(pos);
+	}
+	
+	public boolean addAll(int arg0, Collection arg1) {
+		return ((List)collect).addAll(arg0,arg1);
+	}
+
+	public Object set(int arg0, Object arg1) {
+		return ((List)collect).set(arg0,arg1);
+	}
+
+	public void add(int pos, Object arg1) {
+		((List)collect).add(pos,arg1);
+	}
+
+	public Object remove(int arg0) {
+		return ((List)collect).remove(arg0);
+	}
+
+	
+	public ListIterator listIterator(int arg0) {
+		return ((List)collect).listIterator(arg0);
+	}
+
+	public List subList(int arg0, int arg1) {
+		return ((List)collect).subList(arg0,arg1);
+	}
+
+	public int indexOf(Object arg0) {
+		return ((List)collect).indexOf(arg0);
+	}
+
+	public int lastIndexOf(Object arg0) {
+		return ((List)collect).lastIndexOf(arg0);
+	}
+
+	public ListIterator listIterator() {
+		return ((List)collect).listIterator();
+	}
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        NamedIdObjectWithParentList c=new NamedIdObjectWithParentList();
+        c.addAll(this);
+        return c;
+    }
+}
+
+
 //Created on 18.11.2003
--- a/src/de/memtext/baseobjects/coll/NamedIdObjectWithParentSet.java
+++ b/src/de/memtext/baseobjects/coll/NamedIdObjectWithParentSet.java
@ -1,27 +1,25 @@
				@@ -1,27 +1,25 @@
-package de.memtext.baseobjects.coll;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class NamedIdObjectWithParentSet extends NamedIdObjectWithParentCollection implements Set {
-    private static final long serialVersionUID = 1;
-
-    public NamedIdObjectWithParentSet() {
-        super();
-        collect = new HashSet();
-    }
-
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectWithParentCollection c = new NamedIdObjectWithParentSet();
-        c.addAll(this);
-        return c;
-    }
-}
-
-
+package de.memtext.baseobjects.coll;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class NamedIdObjectWithParentSet extends NamedIdObjectWithParentCollection implements Set  {
+    private static final long serialVersionUID = 1;
+	public NamedIdObjectWithParentSet() {
+		super();
+		collect=new HashSet();
+	}
+
+	
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        NamedIdObjectWithParentCollection c=new NamedIdObjectWithParentSet();
+        c.addAll(this);
+        return c;
+    }
+}
+
+
 //Created on 03.12.2003 
--- a/src/de/memtext/baseobjects/coll/NamedObjectCollection.java
+++ b/src/de/memtext/baseobjects/coll/NamedObjectCollection.java
@ -1,99 +1,102 @@
				@@ -1,99 +1,102 @@
-package de.memtext.baseobjects.coll;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-
-import de.memtext.baseobjects.NamedObjectI;
-import de.memtext.util.EqualsUtil;
-import de.memtext.util.StringUtils;
-
-/**
- *
- *  @author MB
- * */
-public class NamedObjectCollection extends BaseObjectCollection implements Collection, Serializable {
-    private static final long serialVersionUID = 1;
-
-    public NamedObjectCollection() {
-        super();
-    }
-
-
-    /**
-     * Tries to find an element with the given name
-     * @param name
-     * @return first element with given name
-     * @throws IllegalArgumentException if nothing found
-     */
-    public NamedObjectI getByName(String name) {
-        NamedObjectI test, result = null;
-        for (Iterator it = collect.iterator(); it.hasNext();) {
-            test = (NamedObjectI) it.next();
-            if (test.getName().equals(name)) {
-                result = test;
-                break;
-            }
-        }
-        if (result == null) throw new IllegalArgumentException("No element with name " + name + " found.");
-        return result;
-    }
-
-    /**
-     * like '12','34','343'
-     * useful for creating sqls like where x in (...)
-     * @return '' if collection is empty
-     */
-
-    public String getNamesApostropheString() {
-        StringBuffer result = new StringBuffer();
-        NamedObjectI test;
-        for (Iterator it = collect.iterator(); it.hasNext();) {
-            test = (NamedObjectI) it.next();
-            result.append("'" + test.getName() + "',");
-        }
-        StringUtils.deleteLastChar(result);
-        if (result.length() == 0) result.append("''");
-        return result.toString();
-    }
-
-    public boolean containsItemWithName(String name) {
-        boolean result = false;
-        NamedObjectI test;
-        for (Iterator it = collect.iterator(); it.hasNext();) {
-            test = (NamedObjectI) it.next();
-            if (EqualsUtil.areEqual(test.getName(), name)) {
-                result = true;
-                break;
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public boolean add(Object o) {
-        if (o == null) throw new IllegalArgumentException("can't add null value");
-        if (!(o instanceof NamedObjectI)) throw new IllegalArgumentException("only named Objects allowed");
-        return collect.add(o);
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer result = new StringBuffer(size() + " NamedObjects: ");
-        for (Iterator it = this.iterator(); it.hasNext();) {
-            NamedObjectI element = (NamedObjectI) it.next();
-            result.append(element + " - ");
-        }
-        return result.toString();
-    }
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        NamedObjectCollection c = new NamedObjectCollection();
-        c.addAll(this);
-        return c;
-    }
-}
+package de.memtext.baseobjects.coll;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+
+import de.memtext.baseobjects.NamedObjectI;
+import de.memtext.util.EqualsUtil;
+import de.memtext.util.StringUtils;
+
+/**
+ *
+ *  @author MB
+ * */
+public class NamedObjectCollection
+	extends BaseObjectCollection
+	implements Collection,Serializable {
+    private static final long serialVersionUID = 1;
+   
+	public NamedObjectCollection() {
+		super();
+	}
+
+	
+	/**
+	 * Tries to find an element with the given name
+	 * @param name
+	 * @return first element with given name
+	 * @throws IllegalArgumentException if nothing found
+	 */public NamedObjectI getByName(String name) {
+		NamedObjectI test, result = null;
+		for (Iterator it = collect.iterator(); it.hasNext();) {
+			test = (NamedObjectI) it.next();
+			if (test.getName().equals(name)) {
+				result = test;
+				break;
+			}
+		}
+		if (result == null)
+			throw new IllegalArgumentException(
+				"No element with name " + name + " found.");
+		return result;
+	}
+	/**
+	 * like '12','34','343'
+	 * useful for creating sqls like where x in (...)
+	 * @return '' if collection is empty
+	 */
+
+	public String getNamesApostropheString() {
+		StringBuffer result = new StringBuffer();
+		NamedObjectI test;
+		for (Iterator it = collect.iterator(); it.hasNext();) {
+			test = (NamedObjectI) it.next();
+			result.append("'" + test.getName() + "',");
+		}
+		StringUtils.deleteLastChar(result);
+		if (result.length() == 0)
+			result.append("''");
+		return result.toString();
+	}
+
+	public boolean containsItemWithName(String name) {
+		boolean result = false;
+		NamedObjectI test;
+		for (Iterator it = collect.iterator(); it.hasNext();) {
+			test = (NamedObjectI) it.next();
+			  if (EqualsUtil.areEqual(test.getName(),name))
+		          {
+				result = true;
+				break;
+			}
+		}
+		return result;
+	}
+
+	public boolean add(Object o) {
+		if (o == null)
+			throw new IllegalArgumentException("can't add null value");
+		if (!(o instanceof NamedObjectI))
+			throw new IllegalArgumentException("only named Objects allowed");
+		return collect.add(o);
+	}
+	public String toString()
+	{
+	    StringBuffer result=new StringBuffer(size()+" NamedObjects: ");
+	    for (Iterator it = this.iterator(); it.hasNext();) {
+	        NamedObjectI element = (NamedObjectI) it.next();
+	        result.append(element+" - ");
+	    }
+	    return result.toString();
+	}
+
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        NamedObjectCollection c=new NamedObjectCollection();
+        c.addAll(this);
+        return c;
+    }
+}
--- a/src/de/memtext/baseobjects/coll/NamedObjectList.java
+++ b/src/de/memtext/baseobjects/coll/NamedObjectList.java
@ -1,79 +1,70 @@
				@@ -1,79 +1,70 @@
-package de.memtext.baseobjects.coll;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-
-/**
- *
- *  @author MB
- * */
-public class NamedObjectList extends NamedObjectCollection implements List {
-    private static final long serialVersionUID = 1;
-
-    public NamedObjectList() {
-        super();
-        collect = new LinkedList();
-    }
-
-    @Override
-    public Object get(int pos) {
-        return ((List) collect).get(pos);
-    }
-    @Override
-    public boolean addAll(int arg0, Collection arg1) {
-        return ((List) collect).addAll(arg0, arg1);
-    }
-
-    @Override
-    public Object set(int arg0, Object arg1) {
-        return ((List) collect).set(arg0, arg1);
-    }
-
-    @Override
-    public void add(int pos, Object arg1) {
-        ((List) collect).add(pos, arg1);
-    }
-
-    @Override
-    public Object remove(int arg0) {
-        return ((List) collect).remove(arg0);
-    }
-
-    @Override
-    public ListIterator listIterator(int arg0) {
-        return ((List) collect).listIterator(arg0);
-    }
-
-    @Override
-    public List subList(int arg0, int arg1) {
-        return ((List) collect).subList(arg0, arg1);
-    }
-
-    @Override
-    public int indexOf(Object arg0) {
-        return ((List) collect).indexOf(arg0);
-    }
-
-    @Override
-    public int lastIndexOf(Object arg0) {
-        return ((List) collect).lastIndexOf(arg0);
-    }
-    
-    @Override
-    public ListIterator listIterator() {
-        return ((List) collect).listIterator();
-    }
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        NamedObjectCollection c = new NamedObjectList();
-        c.addAll(this);
-        return c;
-    }
-}
+package de.memtext.baseobjects.coll;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+
+/**
+ *
+ *  @author MB
+ * */
+public class NamedObjectList extends NamedObjectCollection implements List {
+    private static final long serialVersionUID = 1;
+	public NamedObjectList() {
+		super();
+		collect = new LinkedList();
+	}
+
+	public Object get(int pos)
+	{
+		return ((List)collect).get(pos);
+	}
+	
+	public boolean addAll(int arg0, Collection arg1) {
+		return ((List)collect).addAll(arg0,arg1);
+	}
+
+	public Object set(int arg0, Object arg1) {
+		return ((List)collect).set(arg0,arg1);
+	}
+
+	public void add(int pos, Object arg1) {
+		((List)collect).add(pos,arg1);
+	}
+
+	public Object remove(int arg0) {
+		return ((List)collect).remove(arg0);
+	}
+
+	
+	public ListIterator listIterator(int arg0) {
+		return ((List)collect).listIterator(arg0);
+	}
+
+	public List subList(int arg0, int arg1) {
+		return ((List)collect).subList(arg0,arg1);
+	}
+
+	public int indexOf(Object arg0) {
+		return ((List)collect).indexOf(arg0);
+	}
+
+	public int lastIndexOf(Object arg0) {
+		return ((List)collect).lastIndexOf(arg0);
+	}
+
+	public ListIterator listIterator() {
+		return ((List)collect).listIterator();
+	}
+
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        NamedObjectCollection c=new NamedObjectList();
+        c.addAll(this);
+        return c;
+    }
+}
--- a/src/de/memtext/baseobjects/coll/NamedObjectSet.java
+++ b/src/de/memtext/baseobjects/coll/NamedObjectSet.java
@ -1,31 +1,29 @@
				@@ -1,31 +1,29 @@
-package de.memtext.baseobjects.coll;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class NamedObjectSet extends NamedObjectCollection implements Set {
-    private static final long serialVersionUID = 1;
-
-    public NamedObjectSet() {
-        super();
-        collect = new HashSet();
-    }
-
-    public NamedObjectSet(Set set) {
-        super();
-        if (set == null) throw new IllegalArgumentException("set must not be null");
-        collect = set;
-    }
-
-    /**
-     * Only shallow copy
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        NamedObjectCollection c = new NamedObjectSet();
-        c.addAll(this);
-        return c;
-    }
-}
-
+package de.memtext.baseobjects.coll;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class NamedObjectSet extends NamedObjectCollection implements Set  {
+    private static final long serialVersionUID = 1;
+	public NamedObjectSet() {
+		super();
+		collect=new HashSet();
+	}
+
+	public NamedObjectSet(Set set) {
+			super();
+			if (set==null)throw new IllegalArgumentException("set must not be null");
+			collect=set;
+		}
+
+	/**
+	 * Only shallow copy
+	 */
+    protected Object clone() throws CloneNotSupportedException {
+        NamedObjectCollection c=new NamedObjectSet();
+        c.addAll(this);
+        return c;
+    }
+}
+
 //Created on 02.12.2003 at 19:08:30
--- a/src/de/memtext/buttons/ButtonGroupPanel.java
+++ b/src/de/memtext/buttons/ButtonGroupPanel.java
@ -1,92 +1,89 @@
				@@ -1,92 +1,89 @@
-package de.memtext.buttons;
-
-import java.util.Enumeration;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-
-public class ButtonGroupPanel extends JPanel {
-    ButtonGroup group = new ButtonGroup();
-
-    ButtonWithValue hiddenNoSelectionButton = new ButtonWithValue("", null);
-
-    public ButtonGroupPanel() {
-        this(null);
-    }
-
-    public ButtonGroupPanel(String header) {
-        super();
-        if (header != null) this.add(new JLabel(header));
-
-        hiddenNoSelectionButton.setVisible(false);
-        hiddenNoSelectionButton.setSelected(true);
-        group.add(hiddenNoSelectionButton);
-    }
-
-    public void addCategory(String label, Object value, boolean isSelected) {
-        ButtonWithValue b = new ButtonWithValue(label, value);
-        this.add(b);
-        group.add(b);
-        b.setSelected(isSelected);
-    }
-
-    public void addCategory(String label, Object value) {
-        addCategory(label, value, false);
-    }
-
-    public void addCategory(String label, int i) {
-        addCategory(label, Integer.valueOf(i));
-    }
-
-    public void addCategory(String label, int i, boolean isSelected) {
-        addCategory(label, Integer.valueOf(i), isSelected);
-    }
-
-    /**
-     * If you pass null as an argument no element will be selected 
-     * @param label
-     */
-    public void setSelected(String label) {
-        if (label == null)
-            hiddenNoSelectionButton.setSelected(true);
-        else
-            for (Enumeration en = group.getElements(); en.hasMoreElements();) {
-                ButtonWithValue b = (ButtonWithValue) en.nextElement();
-                if (b.getText().equals(label)) {
-                    b.doClick();
-                    break;
-                }
-            }
-    }
-
-    public Object getSelectedValue() {
-        ButtonWithValue selectedButton = null;
-        for (Enumeration en = group.getElements(); en.hasMoreElements();) {
-            ButtonWithValue b = (ButtonWithValue) en.nextElement();
-            if (b.isSelected()) {
-                selectedButton = b;
-                break;
-            }
-        }
-        return selectedButton.getValue();
-    }
-
-    class ButtonWithValue extends JRadioButton {
-        private Object value;
-
-        ButtonWithValue(String label, Object value) {
-            super(label);
-            this.value = value;
-        }
-
-        Object getValue() {
-            return value;
-        }
-
-    }
-
-}
-
+package de.memtext.buttons;
+
+import java.util.Enumeration;
+
+import javax.swing.ButtonGroup;
+import javax.swing.ButtonModel;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+
+public class ButtonGroupPanel extends JPanel {
+	ButtonGroup group = new ButtonGroup();
+	ButtonWithValue hiddenNoSelectionButton = new ButtonWithValue("", null);
+
+	public ButtonGroupPanel() {
+		this(null);
+	}
+	public ButtonGroupPanel(String header) {
+		super();
+		if (header != null)
+			this.add(new JLabel(header));
+			
+		hiddenNoSelectionButton.setVisible(false);
+		hiddenNoSelectionButton.setSelected(true);
+		group.add(hiddenNoSelectionButton);
+	}
+	public void addCategory(String label, Object value,boolean isSelected) {
+		ButtonWithValue b = new ButtonWithValue(label, value);
+		this.add(b);
+		group.add(b);
+		b.setSelected(isSelected);
+	}
+	public void addCategory(String label, Object value) {
+		addCategory(label, value,false);
+		}
+	
+	public void addCategory(String label, int i) {
+			addCategory(label, new Integer(i));
+		}
+	public void addCategory(String label, int i,boolean isSelected) {
+				addCategory(label, new Integer(i),isSelected);
+			}
+	/**
+	 * If you pass null as an argument no element will be selected 
+	 * @param label
+	 */
+	public void setSelected(String label) {
+		if (label == null)
+			hiddenNoSelectionButton.setSelected(true);
+		else
+			for (Enumeration en = group.getElements();
+				en.hasMoreElements();
+				) {
+				ButtonWithValue b = (ButtonWithValue) en.nextElement();
+				if (b.getText().equals(label)) {
+									b.doClick();
+										break;
+				}
+			}
+	}
+
+	public Object getSelectedValue() {
+		ButtonWithValue selectedButton=null;
+		for (Enumeration en = group.getElements();
+			en.hasMoreElements();
+			) {
+			ButtonWithValue b = (ButtonWithValue) en.nextElement();
+			if (b.isSelected()) {
+				selectedButton=b;
+				break;
+			}
+		}
+		return selectedButton.getValue();
+	}
+	class ButtonWithValue extends JRadioButton {
+		private Object value;
+		ButtonWithValue(String label, Object value) {
+			super(label);
+			this.value = value;
+		}
+		Object getValue() {
+			return value;
+		}
+
+	}
+	
+}
+
 //Created on 17.02.2004 at 13:40:06
--- a/src/de/memtext/buttons/Standard.java
+++ b/src/de/memtext/buttons/Standard.java
@ -1,38 +1,39 @@
				@@ -1,38 +1,39 @@
-package de.memtext.buttons;
-
-import javax.swing.JButton;
-
-/**
- * @author MB
- *
- * JButtons not as static variables, because can be used in different 
- * places in one application, setting one be invisible would make all invisible
- */
-public class Standard {
-
-    /**
-     * Constructor for Standard.
-     */
-    private Standard() {
-        super();
-    }
-
-    public static JButton getCopy() {
-
-        JButton copy = new JButton(de.memtext.icons.MBStandardIcons.getCopy());
-        copy.setToolTipText("Kopieren");
-        copy.setActionCommand("copy");
-        return copy;
-
-    }
-
-    public static JButton getCopyWithText() {
-
-        JButton copy = new JButton("Kopieren", de.memtext.icons.MBStandardIcons.getCopy());
-        copy.setToolTipText("Kopieren");
-        copy.setActionCommand("copy");
-        return copy;
-
-    }
-
-}
+package de.memtext.buttons;
+
+import javax.swing.JButton;
+
+/**
+ * @author MB
+ *
+ * JButtons not as static variables, because can be used in different 
+ * places in one application, setting one be invisible would make all invisible
+ */
+public class Standard {
+
+	/**
+	 * Constructor for Standard.
+	 */
+	private Standard() {
+		super();
+	}
+	
+	public static JButton getCopy()
+	{
+		
+		JButton copy=new JButton(de.memtext.icons.MBStandardIcons.getCopy());
+		copy.setToolTipText("Kopieren");
+		copy.setActionCommand("copy");
+		return copy;
+	
+	}
+	public static JButton getCopyWithText()
+	{
+		
+		JButton copy=new JButton("Kopieren",de.memtext.icons.MBStandardIcons.getCopy());
+		copy.setToolTipText("Kopieren");
+		copy.setActionCommand("copy");
+		return copy;
+	
+	}
+
+}
--- a/src/de/memtext/db/AbstractHsqlStandaloneMgrResources.java
+++ b/src/de/memtext/db/AbstractHsqlStandaloneMgrResources.java
@ -1,44 +1,43 @@
				@@ -1,44 +1,43 @@
-/*
- * Copyright (c) 2001-2004, The HSQL Development Group All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * 
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 
- * Neither the name of the HSQL Development Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package de.memtext.db;
-
-import java.util.ListResourceBundle;
-
-/**
- * Resources for HsqlStandaloneMgr.
- * For other locales extend AbstractHsqlStandloneMgrResources, i.e.
- * by copying HsqlStandaloneMgrResources_de to your locale
- */
-public abstract class AbstractHsqlStandaloneMgrResources extends ListResourceBundle {
-
-    public abstract String getDbInUseBy(String dbname, String user);
-}
-
+/*
+ * Copyright (c) 2001-2004, The HSQL Development Group All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the HSQL Development Group nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package de.memtext.db;
+
+import java.util.ListResourceBundle;
+/**
+ * Resources for HsqlStandaloneMgr.
+ * For other locales extend AbstractHsqlStandloneMgrResources, i.e.
+ * by copying HsqlStandaloneMgrResources_de to your locale
+ */
+public abstract class AbstractHsqlStandaloneMgrResources extends ListResourceBundle {
+       
+    public abstract String getDbInUseBy(String dbname,String user);
+}
+
--- a/src/de/memtext/db/AddProc.java
+++ b/src/de/memtext/db/AddProc.java
@ -1,158 +1,174 @@
				@@ -1,158 +1,174 @@
-package de.memtext.db;
-
-import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * Additional procedures for HSQLDB 
- *  make sure that this class in the classpath.
- * To constantly add it to hsql. 
- * Go to the directory where your hsqldb.jar is located
- * Call jar -xf hsqlAddOn.jar
- *      jar -uf hsqldb.jar org/hsqldb/Library2.class
- * Delete the directory org.
- * 
- * Open your Database in Database Manager and execute
- * the following commands once:  
- *  GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC and
- * CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"
-
-	
- */
-public class AddProc {
-    private static DateFormat dfUS = new SimpleDateFormat("yyyy-MM-dd");
-
-    private AddProc() {
-        super();
-    }
-
-    /**
-     * Fills regular tables with values from a CSV-file.
-     * Similar to Postgres COPY FROM command.
-     * 
-     * If you want to fill your table TEST with data from test.csv
-     * make sure that this class in the classpath and that<br>
-     * GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC;<br>
-      CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"<br>
-     * has been called in your database at some point.
-    <br>
-     *   Then execute   <br>
-     * CALL  COPYFROM('TEST','test.csv',null)<br>
-     * <br>
-     * if your not using , but | as a field separator<br>
-      CALL COPYFROM('TEST','test.csv','fs=|')<br>
-    <br>
-     * 
-     * @param con - Connection is automatically handed over by HSQL
-     * @param table - the name of the table that is to be filled
-     *  if you created your table with "",  e.g. create table "myData" <br>
-     *  also pass the inverted commans like this CALL COPYFROM('\"myData\"','test.csv',null); 
-     * 				
-     * @param file - the filename of the CSV-file
-     * @param options - you can specify options separated by ; 
-     * which are described in the text table documentation e.g.<br>
-     * fs=| to use pipe instead of default comma as field separator or<br>
-     * 
-     * fs=|;vs=.;lvs=~" varchar separator, longvarchar separator<br>
-     * ignore_first=true; ignore first line<br>
-     * all_quoted=true or<br>
-     * encoding=UTF-8 if you don't have ASCII<br>
-     * @throws SQLException
-     */
-    public static String copyFrom(Connection con, String table, String file, String options) throws SQLException {
-        if (table == null || table.equals("")) throw new IllegalArgumentException("Table must not be null or empty");
-        if (file == null || file.equals("")) throw new IllegalArgumentException("File must not be null or empty");
-        File f = new File(file);
-        if (!f.exists()) throw new IllegalArgumentException("source file " + file + " doesn't exist");
-
-        //normally created tables are in UPPERCASE in the metadata,
-        //but tables in inverted commas (create table "myData")
-        //are stored case sensitive
-        String tableNameInMetaData;
-        if (table.startsWith("\""))
-            tableNameInMetaData = table.substring(1, table.length() - 1);
-        else
-            tableNameInMetaData = table.toUpperCase();
-        StringBuffer buf = new StringBuffer("create temp text table TMP_COPYFROM(");
-
-        ResultSet rs = con.getMetaData().getColumns(null, null, tableNameInMetaData, null);
-        String colname, coltype;
-        boolean tableFound = false;
-        while (rs.next()) {
-            tableFound = true;
-            colname = rs.getObject(4).toString();
-            coltype = rs.getObject(6).toString();
-            buf.append(colname + " " + coltype + ",");
-        }
-        rs.close();
-        if (!tableFound) throw new SQLException("Copy from failed - table " + table + " not found");
-        buf.deleteCharAt(buf.lastIndexOf(","));
-        buf.append("); SET TABLE TMP_COPYFROM SOURCE \"" + file);
-        if (options != null) buf.append(";" + options);
-        buf.append("\";");
-        buf.append("insert into " + table + " select * from TMP_COPYFROM");
-        System.out.println(buf);
-        Statement stmt = con.createStatement();
-        try {
-            stmt.execute(buf.toString());
-            return "success";
-        }
-        //finally is executed before returning whether an exception occurs or not
-        finally {
-            stmt.execute("drop table TMP_COPYFROM IF EXISTS");
-        }
-
-    }
-
-
-    public static String toDate(String year, String month, String day) throws ParseException {
-        String result;
-        Date d = dfUS.parse(year.trim() + "-" + month.trim() + "-" + day.trim());
-        result = dfUS.format(d);
-        return result;
-    }
-
-    public static String toDate(String year, int month, int day) throws ParseException {
-        return toDate(year + "", month + "", day + "");
-    }
-
-    public static String toDate(int year, int month, int day) throws ParseException {
-        return toDate(year + "", month + "", day + "");
-
-    }
-
-    public static void main(String a[]) {
-        Connection conn = null;
-        try {
-            Class.forName("org.hsqldb.jdbcDriver");
-            conn = DriverManager.getConnection("jdbc:hsqldb:test", "sa", "");
-            java.sql.Statement stmt = conn.createStatement();
-            stmt.execute("drop table \"test\" if exists;create table \"test\" (col1 integer,col2 varchar, col3 double,col4 date)");
-            copyFrom(conn, "\"test\"", "test.csv", "fs=;");
-            System.out.println("2");
-            copyFrom(conn, "\"test\"", "test.csv", "fs=;");
-            stmt.close();
-
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                conn.close();
-            } catch (SQLException e1) {
-                e1.printStackTrace();
-            }
-        }
-    }
-}
-
+package de.memtext.db;
+
+import java.io.File;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+/**
+ * Additional procedures for HSQLDB 
+ *  make sure that this class in the classpath.
+ * To constantly add it to hsql. 
+ * Go to the directory where your hsqldb.jar is located
+ * Call jar -xf hsqlAddOn.jar
+ *      jar -uf hsqldb.jar org/hsqldb/Library2.class
+ * Delete the directory org.
+ * 
+ * Open your Database in Database Manager and execute
+ * the following commands once:  
+ *  GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC and
+ * CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"
+
+	
+ */
+public class AddProc {
+	private static DateFormat dfUS = new SimpleDateFormat("yyyy-MM-dd");
+
+	private AddProc() {
+		super();
+	}
+	/**
+	 * Fills regular tables with values from a CSV-file.
+	 * Similar to Postgres COPY FROM command.
+	 * 
+	 * If you want to fill your table TEST with data from test.csv
+	 * make sure that this class in the classpath and that<br>
+	 * GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC;<br>
+	  CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"<br>
+	 * has been called in your database at some point.
+	<br>
+	 *   Then execute   <br>
+	 * CALL  COPYFROM('TEST','test.csv',null)<br>
+	 * <br>
+	 * if your not using , but | as a field separator<br>
+	  CALL COPYFROM('TEST','test.csv','fs=|')<br>
+	<br>
+	 * 
+	 * @param con - Connection is automatically handed over by HSQL
+	 * @param table - the name of the table that is to be filled
+	 *  if you created your table with "",  e.g. create table "myData" <br>
+	 *  also pass the inverted commans like this CALL COPYFROM('\"myData\"','test.csv',null); 
+	 * 				
+	 * @param file - the filename of the CSV-file
+	 * @param options - you can specify options separated by ; 
+	 * which are described in the text table documentation e.g.<br>
+	 * fs=| to use pipe instead of default comma as field separator or<br>
+	 * 
+	 * fs=|;vs=.;lvs=~" varchar separator, longvarchar separator<br>
+	 * ignore_first=true; ignore first line<br>
+	 * all_quoted=true or<br>
+	 * encoding=UTF-8 if you don't have ASCII<br>
+	 * @throws SQLException
+	 */
+	public static String copyFrom(
+		Connection con,
+		String table,
+		String file,
+		String options)
+		throws SQLException {
+		if (table == null || table.equals(""))
+			throw new IllegalArgumentException("Table must not be null or empty");
+		if (file == null || file.equals(""))
+			throw new IllegalArgumentException("File must not be null or empty");
+		File f = new File(file);
+		if (!f.exists())
+			throw new IllegalArgumentException(
+				"source file " + file + " doesn't exist");
+	
+    //normally created tables are in UPPERCASE in the metadata,
+    //but tables in inverted commas (create table "myData")
+    //are stored case sensitive
+	String tableNameInMetaData;
+		if (table.startsWith("\""))
+			tableNameInMetaData = table.substring(1, table.length() - 1);
+		else
+			tableNameInMetaData = table.toUpperCase();
+		StringBuffer buf =
+			new StringBuffer("create temp text table TMP_COPYFROM(");
+
+		ResultSet rs =
+			con.getMetaData().getColumns(null, null, tableNameInMetaData, null);
+		String colname, coltype;
+		boolean tableFound = false;
+		while (rs.next()) {
+			tableFound = true;
+			colname = rs.getObject(4).toString();
+			coltype = rs.getObject(6).toString();
+			buf.append(colname + " " + coltype + ",");
+		}
+		rs.close();
+		if (!tableFound)
+			throw new SQLException(
+				"Copy from failed - table "
+					+ table
+					+ " not found");
+		buf.deleteCharAt(buf.lastIndexOf(","));
+		buf.append("); SET TABLE TMP_COPYFROM SOURCE \"" + file);
+		if (options != null)
+			buf.append(";" + options);
+		buf.append("\";");
+		buf.append("insert into " + table + " select * from TMP_COPYFROM");
+		System.out.println(buf);
+		Statement stmt = con.createStatement();
+		try {
+			stmt.execute(buf.toString());
+			return "success";
+		}
+		//finally is executed before returning whether an exception occurs or not
+		finally {
+			stmt.execute("drop table TMP_COPYFROM IF EXISTS");
+		}
+
+	}
+	
+	
+	public static String toDate(String year, String month, String day)
+		throws ParseException {
+		String result;
+		Date d =
+			dfUS.parse(year.trim() + "-" + month.trim() + "-" + day.trim());
+		result = dfUS.format(d);
+		return result;
+	}
+	public static String toDate(String year, int month, int day)
+		throws ParseException {
+		return toDate(year + "", month + "", day + "");
+	}
+	public static String toDate(int year, int month, int day)
+		throws ParseException {
+		return toDate(year + "", month + "", day + "");
+
+	}
+	public static void main(String a[]) {
+		Connection conn = null;
+		try {
+			Class.forName("org.hsqldb.jdbcDriver");
+			conn = DriverManager.getConnection("jdbc:hsqldb:test", "sa", "");
+			java.sql.Statement stmt = conn.createStatement();
+			stmt.execute(
+				"drop table \"test\" if exists;create table \"test\" (col1 integer,col2 varchar, col3 double,col4 date)");
+			copyFrom(conn, "\"test\"", "test.csv", "fs=;");
+			System.out.println("2");
+			copyFrom(conn, "\"test\"", "test.csv", "fs=;");
+			stmt.close();
+
+		} catch (ClassNotFoundException e) {
+			e.printStackTrace();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				conn.close();
+			} catch (SQLException e1) {
+				e1.printStackTrace();
+			}
+		}
+	}
+}
+
 //Created on 08.03.2004 at 13:48:03
--- a/src/de/memtext/db/Comparison.java
+++ b/src/de/memtext/db/Comparison.java
@ -1,49 +1,43 @@
				@@ -1,49 +1,43 @@
-/*
- * Created on 23.07.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package de.memtext.db;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-/**
- * @author Gast
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class Comparison {
-    private String name;
-
-    private Collection units = new LinkedList();
-
-    public Comparison(String name) {
-        this.name = name;
-    }
-
-    public void addUnit(ComparisonUnit unit) {
-        units.add(unit);
-
-    }
-
-    public Iterator iterator() {
-        return units.iterator();
-    }
-
-    public int getUnitCount() {
-        return units.size();
-    }
-
-    public void removeUnit(ComparisonUnit unit) {
-        units.remove(unit);
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-}
+/*
+ * Created on 23.07.2003
+ *
+ * To change the template for this generated file go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package de.memtext.db;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+/**
+ * @author Gast
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class Comparison {
+	private String name;
+	private Collection units = new LinkedList();
+	public Comparison(String name) {
+		this.name = name;
+	}
+	public void addUnit(ComparisonUnit unit) {
+		units.add(unit);
+
+	}
+	public Iterator iterator()
+	{
+		return units.iterator();
+	}
+	public int getUnitCount()
+	{
+		return units.size();
+	}
+	public void removeUnit(ComparisonUnit unit) {
+		units.remove(unit);
+	}
+	public String toString() {
+		return name;
+	}
+}
--- a/src/de/memtext/db/ComparisonUnit.java
+++ b/src/de/memtext/db/ComparisonUnit.java
@ -1,51 +1,50 @@
				@@ -1,51 +1,50 @@
-/*
- * Created on 23.07.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package de.memtext.db;
-
-/**
- * @author Gast
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ComparisonUnit {
-    private String name, sql;
-
-    public ComparisonUnit(String name, String sql) {
-        this.name = name;
-        this.sql = sql;
-    }
-
-    /**
-     * @return
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @return
-     */
-    public String getSql() {
-        return sql;
-    }
-
-    /**
-     * @param string
-     */
-    public void setName(String string) {
-        name = string;
-    }
-
-    /**
-     * @param string
-     */
-    public void setSql(String string) {
-        sql = string;
-    }
-
-}
+/*
+ * Created on 23.07.2003
+ *
+ * To change the template for this generated file go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package de.memtext.db;
+
+/**
+ * @author Gast
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class ComparisonUnit {
+private String name,sql;
+public ComparisonUnit(String name,String sql)
+{
+	this.name=name;
+	this.sql=sql;
+}
+/**
+ * @return
+ */
+public String getName() {
+	return name;
+}
+
+/**
+ * @return
+ */
+public String getSql() {
+	return sql;
+}
+
+/**
+ * @param string
+ */
+public void setName(String string) {
+	name = string;
+}
+
+/**
+ * @param string
+ */
+public void setSql(String string) {
+	sql = string;
+}
+
+}
--- a/src/de/memtext/db/ConnectionCreator.java
+++ b/src/de/memtext/db/ConnectionCreator.java
@ -1,100 +1,127 @@
				@@ -1,100 +1,127 @@
-package de.memtext.db;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Properties;
-
-import de.memtext.util.CryptUtils;
-import de.memtext.util.PropUtils;
-
-/**
- * This class is a utility that makes the creation of database connections
- * easier. If necessary, one can use loadClass("jdbdcDriver-class") and then 
- * use one of the static getConnection(..) methods
- * @author MB
- *
- 
- */
-public class ConnectionCreator {
-    public static void loadClass(String className) {
-        try {
-            Class.forName(className);
-
-        } catch (Exception e) {
-            System.out.println(e.toString());
-            System.exit(0);
-        }
-    }
-
-    public static Connection getConnection(String url, String username, String passwd) throws SQLException {
-
-        return DriverManager.getConnection(url, username, passwd);
-    }
-
-    public static Connection getConnection(String driver, String url, String username, String passwd) throws SQLException, ClassNotFoundException {
-        Class.forName(driver);
-        return getConnection(url, username, passwd);
-    }
-
-    public static Connection getConnectionQuitOnException(String driver, String url, String username, String passwd) {
-        Connection con = null;
-        try {
-            con = getConnection(driver, url, username, passwd);
-        } catch (Exception e) {
-            System.out.println("Couldn't create connection to database " + url + "\n" + e.toString());
-            System.exit(-1);
-        }
-        return con;
-    }
-
-    public static Connection getConnection(String propfilename, String driverkey, String urlkey, String usernamekey, String passwordkey)
-                    throws IOException, SQLException, ClassNotFoundException {
-        Properties props = PropUtils.getProps(propfilename);
-        String driver = PropUtils.getProperty(props, driverkey);
-        String url = PropUtils.getProperty(props, urlkey);
-        String username = PropUtils.getProperty(props, usernamekey);
-        String passwd = PropUtils.getProperty(props, passwordkey);
-        return getConnection(driver, url, username, passwd);
-
-    }
-
-    public static Connection getConnection(String propfilename) throws IOException, SQLException, ClassNotFoundException {
-        return getConnection(propfilename, "driver", "url", "username", "password");
-    }
-
-    /**
-     * Method getConnectionCryptPassword.
-     * 28.10.08 EInfache Verschlüsselungsmethode wird nicht mehr unterstützt
-     * @param propfilename
-     * @param string
-     * @param string1
-     * @param string11
-     * @param string111
-     * @return Connection
-     * @throws IOException
-     * @throws ClassNotFoundException
-     * @throws SQLException
-     */
-    public static Connection getConnectionCryptPassword(String propfilename, String driverkey, String urlkey, String usernamekey, String passwordkey)
-                    throws IOException, SQLException, ClassNotFoundException {
-        Properties props = PropUtils.getProps(propfilename);
-        String driver = PropUtils.getProperty(props, driverkey);
-        String url = PropUtils.getProperty(props, urlkey);
-        String username = PropUtils.getProperty(props, usernamekey);
-        String passwd = PropUtils.getProperty(props, passwordkey);
-        if (passwd.startsWith("sx_des")) {
-            try {
-                passwd = CryptUtils.decryptStringDES(passwd.substring(6));
-            } catch (Exception e) {
-                e.printStackTrace();
-                throw new SQLException("DES-Passwort konnte nicht entschlüsselt werden");
-            }
-        }
-        // else
-        //	passwd=de.memtext.util.CryptUtils.decryptSimple(passwd	);
-        return getConnection(driver, url, username, passwd);
-    }
-
-}
+package de.memtext.db;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import de.memtext.util.CryptUtils;
+import de.memtext.util.PropUtils;
+/**
+ * This class is a utility that makes the creation of database connections
+ * easier. If necessary, one can use loadClass("jdbdcDriver-class") and then 
+ * use one of the static getConnection(..) methods
+ * @author MB
+ *
+ 
+ */
+public class ConnectionCreator {
+	public static void loadClass(String className) {
+		try {
+			Class.forName(className);
+
+		} catch (Exception e) {
+			System.out.println(e.toString());
+			System.exit(0);
+		}
+	}
+	public static Connection getConnection(
+		String url,
+		String username,
+		String passwd) throws SQLException
+		{
+
+		return DriverManager.getConnection(url, username, passwd);
+	}
+	public static Connection getConnection(
+		String driver,
+		String url,
+		String username,
+		String passwd)
+		throws SQLException, ClassNotFoundException {
+		Class.forName(driver);
+		return getConnection(url, username, passwd);
+	}
+
+	public static Connection getConnectionQuitOnException(
+		String driver,
+		String url,
+		String username,
+		String passwd) {
+		Connection con = null;
+		try {
+			con = getConnection(driver, url, username, passwd);
+		} catch (Exception e) {
+			System.out.println(
+				"Couldn't create connection to database "
+					+ url
+					+ "\n"
+					+ e.toString());
+			System.exit(-1);
+		}
+		return con;
+	}
+	public static Connection getConnection(
+		String propfilename,
+		String driverkey,
+		String urlkey,
+		String usernamekey,
+		String passwordkey) throws IOException, SQLException, ClassNotFoundException
+		 {
+		Properties props = PropUtils.getProps(propfilename);
+		String driver = PropUtils.getProperty(props, driverkey);
+		String url = PropUtils.getProperty(props, urlkey);
+		String username = PropUtils.getProperty(props, usernamekey);
+		String passwd = PropUtils.getProperty(props, passwordkey);
+		return getConnection(driver, url, username, passwd);
+
+	}
+	public static Connection getConnection(String propfilename) throws IOException, SQLException, ClassNotFoundException
+		 {
+		return getConnection(
+			propfilename,
+			"driver",
+			"url",
+			"username",
+			"password");
+	}
+
+	/**
+	 * Method getConnectionCryptPassword.
+	 * 28.10.08 EInfache Verschlüsselungsmethode wird nicht mehr unterstützt
+	 * @param propfilename
+	 * @param string
+	 * @param string1
+	 * @param string11
+	 * @param string111
+	 * @return Connection
+	 * @throws IOException
+	 * @throws ClassNotFoundException
+	 * @throws SQLException
+	 */
+	public static Connection getConnectionCryptPassword(
+		String propfilename,
+		String driverkey,
+		String urlkey,
+		String usernamekey,
+		String passwordkey) throws IOException, SQLException, ClassNotFoundException
+		 {
+		Properties props = PropUtils.getProps(propfilename);
+		String driver = PropUtils.getProperty(props, driverkey);
+		String url = PropUtils.getProperty(props, urlkey);
+		String username = PropUtils.getProperty(props, usernamekey);
+		String passwd =PropUtils.getProperty(props, passwordkey);
+		   if (passwd.startsWith("sx_des")) {
+	            try {
+                    passwd = CryptUtils.decryptStringDES(passwd.substring(6));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    throw new SQLException("DES-Passwort konnte nicht entschlüsselt werden");
+                }
+	        } 
+		  // else
+		//	passwd=de.memtext.util.CryptUtils.decryptSimple(passwd	);
+		return getConnection(driver, url, username, passwd);
+	}
+
+}
--- a/src/de/memtext/db/DB.java
+++ b/src/de/memtext/db/DB.java
@ -1,43 +1,37 @@
				@@ -1,43 +1,37 @@
-package de.memtext.db;
-
-import de.memtext.baseobjects.NamedObject;
-
-/**
- * This class represents a Database system like Informix or Postgres
- */
-public class DB extends NamedObject {
-    private String version;
-
-    static public final DB INFORMIX = new DB("Informix", "7.3");
-
-    static public final DB POSTGRES = new DB("Postgres", "7.3");
-
-    static public final DB ACCESS = new DB("Access", "2000");
-
-    /**
-     * The public constructors are needed because the DB class is
-     * a java bean which is cool for XMLEncoding
-     *
-     */
-    public DB() {
-        this("Unbekannte Datenbank", "");
-    }
-
-    public DB(String name) {
-        this(name, "");
-    }
-
-    public DB(String name, String version) {
-        super(name);
-        this.version = version;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof DB)) return false;
-        DB db = (DB) o;
-        return this.getName().equals(db.getName());
-    }
-}
-
+package de.memtext.db;
+
+import de.memtext.baseobjects.NamedObject;
+/**
+ * This class represents a Database system like Informix or Postgres
+ */
+public class DB extends NamedObject {
+	private String version;
+	static public final DB INFORMIX = new DB("Informix", "7.3");
+	static public final DB POSTGRES = new DB("Postgres", "7.3");
+	static public final DB ACCESS = new DB("Access", "2000");
+	/**
+	 * The public constructors are needed because the DB class is
+	 * a java bean which is cool for XMLEncoding
+	 *
+	 */
+	public DB() {
+		this("Unbekannte Datenbank","");
+	}
+	public DB(String name) {
+		this(name, "");
+	}
+
+	public DB(String name, String version) {
+		super(name);
+		this.version = version;
+	}
+
+	public boolean equals(Object o) {
+		if (!(o instanceof DB))
+			return false;
+		DB db = (DB) o;
+		return this.getName().equals(db.getName());
+	}
+}
+
 //Created on 03.12.2003 at 15:54:27
--- a/src/de/memtext/db/DBAccess.java
+++ b/src/de/memtext/db/DBAccess.java
--- a/src/de/memtext/db/DBComparison.java
+++ b/src/de/memtext/db/DBComparison.java
@ -1,78 +1,104 @@
				@@ -1,78 +1,104 @@
-package de.memtext.db;
-
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.List;
-
-import de.memtext.util.StringUtils;
-
-public class DBComparison {
-
-    private DBComparison() {
-        super();
-    }
-
-    public static void main(String a[]) {
-        try {
-            Class.forName("org.hsqldb.jdbcDriver");
-
-            java.sql.Connection con = DriverManager.getConnection("jdbc:hsqldb:hsql://localhost:9000", "sa", "");
-            DBAccess.addConnection("ssc", con);
-            java.sql.Connection con2 = DriverManager.getConnection("jdbc:hsqldb:hsql://localhost:9500", "sa", "");
-            DBAccess.addConnection("ssc-test", con2);
-            compare("ssc", "ssc-test");
-
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    private static void compare(String db1, String db2) throws SQLException {
-        System.out.println("Start comparing...");
-        StringBuffer fineTables = new StringBuffer("The following tables are fine: ");
-        List tableList = DBAccess.get(db1).getTableList();
-        boolean isOk = false;
-        for (Iterator it = tableList.iterator(); it.hasNext();) {
-            String table = (String) it.next();
-
-            if (DBAccess.get(db2).hasTable(table)) {
-                isOk = true;
-                if (DBAccess.get(db1).getColumnCount(table) != DBAccess.get(db2).getColumnCount(table)) {
-                    System.out.println("Table " + table + " has a different number of columns");
-                    isOk = false;
-                } else {
-                    List colList = DBAccess.get(db1).getColumnNames(table);
-                    for (Iterator it2 = colList.iterator(); it2.hasNext();) {
-                        String colname = (String) it2.next();
-                        if (!DBAccess.get(db2).hasColumn(table, colname)) {
-                            System.out.println("Table " + table + " in " + db2 + " doesn't have column:" + colname);
-                            isOk = false;
-                        } else {
-
-                            if (DBAccess.get(db1).getColumnType(table, colname) != DBAccess.get(db2).getColumnType(table, colname)) {
-                                System.out.println("Table " + table + " column:" + colname + " are of different types");
-                                isOk = false;
-                            }
-
-                        }
-                    }
-                    if (isOk) fineTables.append(table + ",");
-                }
-
-            } else {
-                System.out.println(db2 + " doesn't contain table:" + table);
-            }
-        }
-        StringUtils.deleteLastChar(fineTables);
-        System.out.println(fineTables);
-        System.out.println("..done");
-    }
-}
-
+package de.memtext.db;
+
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.List;
+
+import de.memtext.util.StringUtils;
+
+public class DBComparison {
+
+	private DBComparison() {
+		super();
+	}
+	public static void main(String a[]) {
+		try {
+			Class.forName("org.hsqldb.jdbcDriver");
+
+			java.sql.Connection con =
+				DriverManager.getConnection(
+					"jdbc:hsqldb:hsql://localhost:9000",
+					"sa",
+					"");
+			DBAccess.addConnection("ssc", con);
+			java.sql.Connection con2 =
+				DriverManager.getConnection(
+					"jdbc:hsqldb:hsql://localhost:9500",
+					"sa",
+					"");
+			DBAccess.addConnection("ssc-test", con2);
+			compare("ssc", "ssc-test");
+
+		} catch (ClassNotFoundException e) {
+			e.printStackTrace();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
+	private static void compare(String db1, String db2) {
+		System.out.println("Start comparing...");
+		StringBuffer fineTables =
+			new StringBuffer("The following tables are fine: ");
+		List tableList = DBAccess.get(db1).getTableList();
+		boolean isOk = false;
+		for (Iterator it = tableList.iterator(); it.hasNext();) {
+			String table = (String) it.next();
+
+			if (DBAccess.get(db2).hasTable(table)) {
+				isOk = true;
+				if (DBAccess.get(db1).getColumnCount(table)
+					!= DBAccess.get(db2).getColumnCount(table)) {
+					System.out.println(
+						"Table "
+							+ table
+							+ " has a different number of columns");
+					isOk = false;
+				} else {
+					List colList = DBAccess.get(db1).getColumnNames(table);
+					for (Iterator it2 = colList.iterator(); it2.hasNext();) {
+						String colname = (String) it2.next();
+						if (!DBAccess.get(db2).hasColumn(table, colname)) {
+							System.out.println(
+								"Table "
+									+ table
+									+ " in "
+									+ db2
+									+ " doesn't have column:"
+									+ colname);
+							isOk = false;
+						} else {
+
+							if (DBAccess.get(db1).getColumnType(table, colname)
+								!= DBAccess.get(db2).getColumnType(
+									table,
+									colname)) {
+								System.out.println(
+									"Table "
+										+ table
+										+ " column:"
+										+ colname
+										+ " are of different types");
+								isOk = false;
+							}
+
+						}
+					}
+					if (isOk)
+						fineTables.append(table + ",");
+				}
+
+			} else {
+				System.out.println(db2 + " doesn't contain table:" + table);
+			}
+		}
+		StringUtils.deleteLastChar(fineTables);
+		System.out.println(fineTables);
+		System.out.println("..done");
+	}
+}
+
 //Created on 11.02.2004 at 13:19:36
--- a/src/de/memtext/db/DBServletException.java
+++ b/src/de/memtext/db/DBServletException.java
@ -1,19 +1,20 @@
				@@ -1,19 +1,20 @@
 package de.memtext.db;
-
 /**
 * Eine spezielle Exception im Servlet.
 * Wird zwar im Applet eigentlich nicht gebraucht, aber trotzdem 
 * in diesem Package, damit Klassen wie Sicht einheitliche throws-Deklarationen haben.
 *
 * @author Marlies Winterstein 
- * @version 2.0, 18.2.2002
-*/
-public class DBServletException extends Exception {
-    public DBServletException() {
-        super();
-    }
-
-    public DBServletException(String msg) {
-        super(msg);
-    }
-}
+ * @version 2.0, 18.2.2002
+*/
+public class DBServletException extends Exception
+{
+    public DBServletException()
+    {
+        super();
+    }   
+    public DBServletException(String msg)
+    {
+        super(msg);
+    } 
+}
--- a/src/de/memtext/db/DBTimer.java
+++ b/src/de/memtext/db/DBTimer.java
@ -1,63 +1,96 @@
				@@ -1,63 +1,96 @@
-package de.memtext.db;
-
-import java.sql.Connection;
-import java.sql.Statement;
-
-import de.memtext.util.TimeUtils;
-
-public class DBTimer {
-    private static int runCount = 200;
-
-    private static boolean logEachRun = false;
-
-    //private static String driver="org.hsqldb.jdbcDriver";
-    private static String driver = "com.informix.jdbc.IfxDriver";
-
-    //private static String url="jdbc:hsqldb:hsql://localhost:9001";
-    private static String url = "jdbc:informix-sqli://jupiter:50000:informixserver=superx_host;database=superx";
-
-    private static String user = "superx";
-
-    private static String passwd = "anfang12";
-
-    private static String sql = "execute procedure sp_cob_keychild('1',0);";
-
-    //wenn ein zweiter Sql folgen soll - drop table tmp_xx muss z.B. in eigenem Aufruf sein. 
-    private static String sql2 = null;//"select sum(betrag) from cob_busa,tmp_children T where fikrkey=T.key";
-    //"select sum(betrag) from cob_busa where fikrkey in (select key from tmp_children)";
-
-    private static String sql3 = null;//"drop table tmp_children;";
-
-    public static void main(String[] args) {
-        //sql="select sum(betrag) from cob_busa C, tmp_children T where fikrkey=T.key and T.parent='1'";
-        sql = "select sum(betrag) from cob_busa where fikrkey in ('1', \n" + " '11      ', \n" + " '111     ', \n" + " '1111    ', \n" + " '1112    ', \n" + " '112     ', \n"
-              + " '1121    ', \n" + " '1122    ', \n" + " '113     ', \n" + " '1131    ', \n" + " '1132    ', \n" + " '12      ', \n" + " '121     ', \n" + " '1211    ', \n"
-              + " '1212    ', \n" + " '1213    ', \n" + " '122     ', \n" + " '123     ', \n" + " '124     ', \n" + " '125     ', \n" + " '126     ', \n" + " '13      ', \n"
-              + " '131     ', \n" + " '1311    ', \n" + " '1312    ', \n" + " '1313    ', \n" + " '132     ', \n" + " '1321    ', \n" + " '1322    ', \n" + " '1323    ', \n"
-              + " '133     ', \n" + " '1331    ', \n" + " '1332    ', \n" + " '1333    ', \n" + " '1334    ', \n" + " '134     ', \n" + " '135     ', \n" + " '136     ', \n"
-              + " '137     ', \n" + " '138     ')";
-        try {
-            Class.forName(driver);
-            Connection conn = java.sql.DriverManager.getConnection(url, user, passwd);
-            Statement stmt = conn.createStatement();
-            TimeUtils t = new TimeUtils();
-            System.out.println("start " + sql);
-            for (int i = 1; i <= runCount; i++) {
-                if (logEachRun) System.out.println(i);
-                stmt.execute(sql);
-                if (sql2 != null) stmt.execute(sql2);
-                if (sql3 != null) stmt.execute(sql3);
-            }
-            t.print(runCount + " times");
-            stmt.close();
-            conn.close();
-            System.out.println("done");
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(-1);
-        }
-    }
-}
-
+package de.memtext.db;
+
+import java.sql.Connection;
+import java.sql.Statement;
+
+import de.memtext.util.TimeUtils;
+
+public class DBTimer {
+private static int runCount=200;
+private static boolean logEachRun=false;
+//private static String driver="org.hsqldb.jdbcDriver";
+private static String driver="com.informix.jdbc.IfxDriver";
+//private static String url="jdbc:hsqldb:hsql://localhost:9001";
+private static String url="jdbc:informix-sqli://jupiter:50000:informixserver=superx_host;database=superx";
+private static String user="superx";
+private static String passwd="anfang12";
+private static String sql="execute procedure sp_cob_keychild('1',0);";
+
+//wenn ein zweiter Sql folgen soll - drop table tmp_xx muss z.B. in eigenem Aufruf sein. 
+private static String sql2=null;//"select sum(betrag) from cob_busa,tmp_children T where fikrkey=T.key";
+    //"select sum(betrag) from cob_busa where fikrkey in (select key from tmp_children)";
+private static String sql3=null;//"drop table tmp_children;";
+    public static void main(String[] args) {
+      //sql="select sum(betrag) from cob_busa C, tmp_children T where fikrkey=T.key and T.parent='1'";
+       sql = "select sum(betrag) from cob_busa where fikrkey in ('1', \n" + 
+      " '11      ', \n" + 
+      " '111     ', \n" + 
+      " '1111    ', \n" + 
+      " '1112    ', \n" + 
+      " '112     ', \n" + 
+      " '1121    ', \n" + 
+      " '1122    ', \n" + 
+      " '113     ', \n" + 
+      " '1131    ', \n" + 
+      " '1132    ', \n" + 
+      " '12      ', \n" + 
+      " '121     ', \n" + 
+      " '1211    ', \n" + 
+      " '1212    ', \n" + 
+      " '1213    ', \n" + 
+      " '122     ', \n" + 
+      " '123     ', \n" + 
+      " '124     ', \n" + 
+      " '125     ', \n" + 
+      " '126     ', \n" + 
+      " '13      ', \n" + 
+      " '131     ', \n" + 
+      " '1311    ', \n" + 
+      " '1312    ', \n" + 
+      " '1313    ', \n" + 
+      " '132     ', \n" + 
+      " '1321    ', \n" + 
+      " '1322    ', \n" + 
+      " '1323    ', \n" + 
+      " '133     ', \n" + 
+      " '1331    ', \n" + 
+      " '1332    ', \n" + 
+      " '1333    ', \n" + 
+      " '1334    ', \n" + 
+      " '134     ', \n" + 
+      " '135     ', \n" + 
+      " '136     ', \n" + 
+      " '137     ', \n" + 
+      " '138     ')";
+      try {
+			Class.forName(driver);
+			Connection conn =
+				java.sql.DriverManager.getConnection(
+					url,
+					user,
+					passwd);
+			Statement stmt = conn.createStatement();
+			TimeUtils t=new TimeUtils();
+			System.out.println("start "+sql);
+			for (int i=1;i<=runCount;i++)
+			{
+			if (logEachRun) System.out.println(i);	
+			stmt.execute(sql);
+			if (sql2!=null)
+			stmt.execute(sql2);
+			if (sql3!=null)
+				stmt.execute(sql3);
+			}
+			t.print(runCount+" times");
+			stmt.close();
+			conn.close();
+			System.out.println("done");
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			System.exit(-1);
+		}
+    }
+}
+
 //Created on 09.03.2005 at 10:05:37
--- a/src/de/memtext/db/DataSource.java
+++ b/src/de/memtext/db/DataSource.java
@ -1,109 +1,106 @@
				@@ -1,109 +1,106 @@
-package de.memtext.db;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-import de.memtext.baseobjects.NamedObject;
-
-/**
- * wonder what this is
- */
-public class DataSource extends NamedObject {
-
-    private static final String CRYPT_PREFIX = "^^@@@";
-
-    private String url, username, cryptPassword, driver;
-
-    private transient String password;
-
-    private DB db;
-
-    public DataSource() {
-    }
-
-    public DataSource(String url, String username, String password) {
-        setUrl(url);
-        setUsername(username);
-        setPassword(password);
-    }
-
-    public void setInformixSampleValues() {
-        setUrl("jupiter:50000:informixserver=superx_host;database=superx");
-        setUsername("informix");
-        setPassword("");
-        this.db = DB.INFORMIX;
-    }
-
-    public void setAccessSampleValues() {
-        setUrl("jdbc:odbc:jdbcodbc:");
-        setUsername("informix");
-        setPassword("");
-        this.db = DB.ACCESS;
-    }
-
-    public String getDriver() {
-        return driver;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setDriver(String string) {
-        driver = string;
-    }
-
-    public void setPassword(String string) {
-        password = string;
-        this.setCryptPassword(string);
-    }
-
-    public void setUrl(String string) {
-        url = string;
-    }
-
-    public void setUsername(String string) {
-        username = string;
-    }
-
-    public DB getDb() {
-        return db;
-    }
-
-    public void setDb(DB db) {
-        this.db = db;
-    }
-
-    public void testConnection() throws SQLException, ClassNotFoundException {
-        Class.forName("sun.jdbc.odbc.JdbcOdbcDriver");
-        Connection con = DriverManager.getConnection(url, username, password);
-        con.close();
-
-
-    }
-
-    public String getCryptPassword() {
-        return cryptPassword;
-    }
-
-    public void setCryptPassword(String aPwd) {
-        if (!isEncrypted(aPwd)) {
-            //cryptPassword =CRYPT_PREFIX + CryptUtils.encryptStringDES(aPwd); 
-        }
-    }
-
-    public boolean isEncrypted(String aPwd) {
-        return aPwd.startsWith(CRYPT_PREFIX);
-    }
-}
-
+package de.memtext.db;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import de.memtext.baseobjects.NamedObject;
+import de.memtext.util.CryptUtils;
+/**
+ * wonder what this is
+ */
+public class DataSource extends NamedObject {
+	
+	private static final String CRYPT_PREFIX = "^^@@@";
+	private String url, username, cryptPassword, driver;
+	private transient String password;
+	private DB db;
+	public DataSource() {
+	}
+
+	public DataSource(String url, String username, String password) {
+		setUrl(url);
+		setUsername(username);
+		setPassword(password);
+	}
+
+	public void setInformixSampleValues() {
+		setUrl("jupiter:50000:informixserver=superx_host;database=superx");
+		setUsername("informix");
+		setPassword("");
+		this.db=DB.INFORMIX;
+	}
+	public void setAccessSampleValues() {
+		setUrl("jdbc:odbc:jdbcodbc:");
+		setUsername("informix");
+		setPassword("");
+		this.db=DB.ACCESS;
+	}
+
+	public String getDriver() {
+		return driver;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setDriver(String string) {
+		driver = string;
+	}
+
+	public void setPassword(String string) {
+		password = string;
+		this.setCryptPassword(string);
+	}
+
+	public void setUrl(String string) {
+		url = string;
+	}
+
+	public void setUsername(String string) {
+		username = string;
+	}
+
+	public DB getDb() {
+		return db;
+	}
+
+	public void setDb(DB db) {
+		this.db = db;
+	}
+
+	public void testConnection() throws SQLException, ClassNotFoundException {
+	Class.forName("sun.jdbc.odbc.JdbcOdbcDriver");
+	Connection con=DriverManager.getConnection(url,username,password);
+	con.close();
+		
+		
+	}
+
+	public String getCryptPassword() {
+		return cryptPassword;
+	}
+
+	public void setCryptPassword(String aPwd) {
+		if (!isEncrypted(aPwd))
+		{
+			//cryptPassword =CRYPT_PREFIX + CryptUtils.encryptStringDES(aPwd); 
+				}
+	}
+
+public boolean isEncrypted(String aPwd)
+{
+	return aPwd.startsWith(CRYPT_PREFIX);
+}
+}
+
 //Created on 17.04.2004 at 16:28:15
--- a/src/de/memtext/db/DataSourceEditPanel.java
+++ b/src/de/memtext/db/DataSourceEditPanel.java
@ -1,121 +1,116 @@
				@@ -1,121 +1,116 @@
-package de.memtext.db;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.sql.SQLException;
-
-import javax.swing.JButton;
-import javax.swing.JPanel;
-
-import de.memtext.observ.DocumentListenerObserver;
-import de.memtext.widgets.InfoMessage;
-import de.memtext.widgets.LabeledPasswordField;
-import de.memtext.widgets.LabeledTextField;
-import de.memtext.widgets.MultilineEditPanel;
-import de.memtext.widgets.WarningMessage;
-
-public class DataSourceEditPanel extends MultilineEditPanel {
-    private DataSource ds;
-
-    private LabeledTextField hostField = new LabeledTextField("Host", 10);
-
-    private LabeledTextField serverField = new LabeledTextField("Server", 10);
-
-    private LabeledTextField serviceField = new LabeledTextField("Service", 10);
-
-    private LabeledTextField odbcSourceField = new LabeledTextField("Odbc-DSN", 10);
-
-    private LabeledTextField usernameField = new LabeledTextField("Kennung", 10);
-
-    private LabeledTextField passwordField = new LabeledPasswordField("Password", 10);
-
-    private JPanel pButtons = new JPanel();
-
-    public DataSourceEditPanel() {
-        this.setBackground(null);
-        odbcSourceField.setValue("sospos");
-        odbcSourceField.setBackground(null);
-        usernameField.setValue("admin");
-        this.add(hostField);
-        this.add(serverField);
-        this.add(serviceField);
-        this.add(odbcSourceField);
-
-        this.add(usernameField);
-
-        this.add(passwordField);
-        //this.addGlue();
-        JButton btnTesten = new JButton("testen");
-        btnTesten.setBackground(null);
-        pButtons.setBackground(null);
-        btnTesten.addActionListener(new ActionListener() {
-            
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                test();
-            }
-        });
-        pButtons.add(btnTesten);
-        //this.addGlue();
-        this.add(pButtons);
-    }
-
-    public void setDataSource(DataSource ds) {
-        this.ds = ds;
-        setMode(ds.getDb());
-    }
-
-    public void addButton(JButton btn) {
-        pButtons.add(btn);
-    }
-
-    private void setMode(DB db) {
-        if (db.equals(DB.ACCESS)) {
-            odbcSourceField.setVisible(true);
-            hostField.setVisible(false);
-            serverField.setVisible(false);
-            serviceField.setVisible(false);
-        }
-        if (db.equals(DB.INFORMIX)) {
-            odbcSourceField.setVisible(false);
-            hostField.setVisible(true);
-            serverField.setVisible(true);
-            serviceField.setVisible(true);
-        }
-    }
-
-    protected void test() {
-        updateDataSource();
-        try {
-            ds.testConnection();
-            InfoMessage.show(this, "Verbindung erfolgreich aufgebaut", "Erfolg");
-        } catch (SQLException e) {
-            if (ds.getDb().equals(DB.ACCESS)) {
-                WarningMessage.show(this, "Verbindung zur ODBC-Quelle " + odbcSourceField.getValue() + " konnte nicht aufgebaut werden.\n" + e, "Achtung");
-            }
-        } catch (ClassNotFoundException e) {
-            WarningMessage.show(this, "Benötigte Treiber-Klase nicht gefunden ", "Achtung");
-        }
-    }
-
-    public void updateDataSource() {
-        if (ds.getDb() == DB.ACCESS) {
-            ds.setUrl("jdbc:odbc:" + odbcSourceField.getValue());
-        }
-        ds.setUsername(usernameField.getValue().toString());
-        ds.setPassword("");
-    }
-
-    public void addDocumentListener(DocumentListenerObserver listener) {
-        hostField.addDocumentListener(listener);
-        serverField.addDocumentListener(listener);
-        serviceField.addDocumentListener(listener);
-        odbcSourceField.addDocumentListener(listener);
-
-        usernameField.addDocumentListener(listener);
-
-        passwordField.addDocumentListener(listener);
-    }
-}
-
+package de.memtext.db;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.sql.SQLException;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+
+import de.memtext.observ.DocumentListenerObserver;
+import de.memtext.widgets.InfoMessage;
+import de.memtext.widgets.LabeledPasswordField;
+import de.memtext.widgets.LabeledTextField;
+import de.memtext.widgets.MultilineEditPanel;
+import de.memtext.widgets.WarningMessage;
+
+public class DataSourceEditPanel extends MultilineEditPanel {
+	private DataSource ds;
+	private LabeledTextField hostField = new LabeledTextField("Host", 10);
+	private LabeledTextField serverField = new LabeledTextField("Server", 10);
+	private LabeledTextField serviceField = new LabeledTextField("Service", 10);
+	private LabeledTextField odbcSourceField =
+		new LabeledTextField("Odbc-DSN", 10);
+	private LabeledTextField usernameField =
+		new LabeledTextField("Kennung", 10);
+	private LabeledTextField passwordField =
+		new LabeledPasswordField("Password", 10);
+	private JPanel pButtons = new JPanel();
+
+	public DataSourceEditPanel() {
+		this.setBackground(null);
+		odbcSourceField.setValue("sospos");
+		odbcSourceField.setBackground(null);
+		usernameField.setValue("admin");
+		this.add(hostField);
+		this.add(serverField);
+		this.add(serviceField);
+		this.add(odbcSourceField);
+
+		this.add(usernameField);
+
+		this.add(passwordField);
+		//this.addGlue();
+		JButton btnTesten = new JButton("testen");
+		btnTesten.setBackground(null);
+		pButtons.setBackground(null);
+		btnTesten.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent ae) {
+				test();
+			}
+		});
+		pButtons.add(btnTesten);
+		//this.addGlue();
+		this.add(pButtons);
+	}
+	public void setDataSource(DataSource ds) {
+		this.ds = ds;
+		setMode(ds.getDb());
+	}
+	public void addButton(JButton btn) {
+		pButtons.add(btn);
+	}
+	private void setMode(DB db) {
+		if (db.equals(DB.ACCESS)) {
+			odbcSourceField.setVisible(true);
+			hostField.setVisible(false);
+			serverField.setVisible(false);
+			serviceField.setVisible(false);
+		}
+		if (db.equals(DB.INFORMIX)) {
+			odbcSourceField.setVisible(false);
+			hostField.setVisible(true);
+			serverField.setVisible(true);
+			serviceField.setVisible(true);
+		}
+	}
+	protected void test() {
+		updateDataSource();
+		try {
+			ds.testConnection();
+			InfoMessage.show(this, "Verbindung erfolgreich aufgebaut", "Erfolg");
+		} catch (SQLException e) {
+			if (ds.getDb().equals( DB.ACCESS)) {
+				WarningMessage.show(this,
+					"Verbindung zur ODBC-Quelle "
+						+ odbcSourceField.getValue()
+						+ " konnte nicht aufgebaut werden.\n"
+						+ e,
+					"Achtung");
+			}
+		} catch (ClassNotFoundException e) {
+			WarningMessage.show(this,
+				"Benötigte Treiber-Klase nicht gefunden ",
+				"Achtung");
+		}
+	}
+	public void updateDataSource() {
+		if (ds.getDb() == DB.ACCESS) {
+			ds.setUrl("jdbc:odbc:" + odbcSourceField.getValue());
+		}
+		ds.setUsername(usernameField.getValue().toString());
+		ds.setPassword("");
+	}
+	public void addDocumentListener(DocumentListenerObserver listener) {
+		hostField.addDocumentListener(listener);
+		serverField.addDocumentListener(listener);
+		serviceField.addDocumentListener(listener);
+		odbcSourceField.addDocumentListener(listener);
+
+		usernameField.addDocumentListener(listener);
+
+		passwordField.addDocumentListener(listener);
+	}
+}
+
 //Created on 17.04.2004 at 16:37:44
--- a/src/de/memtext/db/DbRequest.java
+++ b/src/de/memtext/db/DbRequest.java
@ -1,92 +1,94 @@
				@@ -1,92 +1,94 @@
-/*
- * Created on 21.06.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package de.memtext.db;
-
-/**
- * @author MB
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DbRequest
-
-                implements java.io.Serializable {
-    static final long serialVersionUID = -2L;
-
-
-    private String sql;
-
-    private String name;
-
-    private Object[] params;
-
-    private int type;
-
-    private DbRequestType dbRequestType;
-
-    public DbRequest(String sql) {
-        this(null, sql, null, null);
-    }
-
-    public DbRequest(String name, String sql, Object[] params) {
-        this(name, sql, params, null);
-    }
-
-    /**
-     * Request type used by servlet
-     * @param name
-     * @param sql
-     * @param params
-     * @param dbRequestType
-     */
-    public DbRequest(String name, String sql, Object[] params, DbRequestType dbRequestType) {
-        setName(name);
-        setSql(sql);
-        setParams(params);
-        this.dbRequestType = dbRequestType;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Object[] getParams() {
-        return params;
-    }
-
-    public void setParams(Object[] params) {
-        this.params = params;
-    }
-
-    public String getSql() {
-        return sql;
-    }
-
-    public void setSql(String sql) {
-        this.sql = sql;
-    }
-
-    /**
-     * @return
-     */
-    public DbRequestType getDbRequestType() {
-        return dbRequestType;
-    }
-
-    /**
-     * @param type
-     */
-    public void setDbRequestType(DbRequestType type) {
-        dbRequestType = type;
-    }
-
-}
-
+/*
+ * Created on 21.06.2003
+ *
+ * To change the template for this generated file go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package de.memtext.db;
+
+/**
+ * @author MB
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class DbRequest 
+
+	implements java.io.Serializable {
+	static final long serialVersionUID = -2L;
+	
+
+	private String sql;
+	private String name;
+	private Object[] params;
+	private int type;
+	private DbRequestType dbRequestType;
+	public DbRequest(String sql)
+		{
+			this(null,sql,null,null);
+		}
+	public DbRequest(String name,String sql,Object[] params)
+	{
+		this(name,sql,params,null);
+	}
+	/**
+	 * Request type used by servlet
+	 * @param name
+	 * @param sql
+	 * @param params
+	 * @param dbRequestType
+	 */
+	public DbRequest(String name,String sql,Object[] params,DbRequestType dbRequestType)
+	{
+	setName(name);
+	setSql(sql);
+	setParams(params);
+	this.dbRequestType=dbRequestType;
+	}
+
+	public String getName()
+	{
+	return name;
+	}
+
+	public void setName(String name)
+	{
+	this.name=name;
+	}
+
+	public Object[] getParams()
+	{
+	return params;
+	}
+
+	public void setParams(Object[] params)
+	{
+	this.params=params;
+	}
+
+	public String getSql()
+	{
+	return sql;
+	}
+
+	public void setSql(String sql)
+	{
+	this.sql=sql;
+	}
+
+	/**
+	 * @return
+	 */
+	public DbRequestType getDbRequestType() {
+		return dbRequestType;
+	}
+
+	/**
+	 * @param type
+	 */
+	public void setDbRequestType(DbRequestType type) {
+		dbRequestType = type;
+	}
+
+	}
+
--- a/src/de/memtext/db/DbRequestType.java
+++ b/src/de/memtext/db/DbRequestType.java
@ -1,31 +1,27 @@
				@@ -1,31 +1,27 @@
-/*
- * Created on 21.06.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package de.memtext.db;
-
-/**
- * @author MB
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DbRequestType {
-
-    private final String name;
-
-    public static final DbRequestType QUERY = new DbRequestType("QUERY");
-
-    public static final DbRequestType UPDATE = new DbRequestType("UPDATE");
-
-    private DbRequestType(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-}
+/*
+ * Created on 21.06.2003
+ *
+ * To change the template for this generated file go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package de.memtext.db;
+
+/**
+ * @author MB
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class DbRequestType {
+
+	private final String name;
+
+public static final DbRequestType QUERY=new DbRequestType("QUERY");
+public static final DbRequestType UPDATE=new DbRequestType("UPDATE");
+private DbRequestType(String name) 
+{
+	this.name=name;
+}
+public String toString() {return name;
+}	
+}
--- a/src/de/memtext/db/DbResponse.java
+++ b/src/de/memtext/db/DbResponse.java
@ -1,69 +1,58 @@
				@@ -1,69 +1,58 @@
-/*
- * Created on 21.06.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package de.memtext.db;
-
-import java.util.Collection;
-
-/**
- * @author MB
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DbResponse implements java.io.Serializable {
-    static final long serialVersionUID = -3L;
-
-    private Collection result;
-
-    private boolean OK;
-
-    private Exception exception;
-
-    private int updatedRowsCount;
-
-    /**
-    * MyServletResponse constructor comment.
-    */
-    public DbResponse(Collection result, boolean OK, Exception exception) {
-        this.result = result;
-        this.OK = OK;
-        this.exception = exception;
-    }
-
-    public Exception getException() {
-        return exception;
-    }
-
-    public Collection getResult() {
-        return result;
-    }
-
-    public boolean isOK() {
-        return OK;
-    }
-
-    public void setException(Exception exception) {
-        this.exception = exception;
-    }
-
-    public void setOK(boolean OK) {
-        this.OK = OK;
-    }
-
-    public void setResult(Collection result) {
-        this.result = result;
-    }
-
-    public int getUpdatedRowsCount() {
-        return updatedRowsCount;
-    }
-
-    public void setUpdatedRowsCount(int updatedRowsCount) {
-        this.updatedRowsCount = updatedRowsCount;
-    }
-
-}
+/*
+ * Created on 21.06.2003
+ *
+ * To change the template for this generated file go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package de.memtext.db;
+
+import java.util.Collection;
+
+/**
+ * @author MB
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class DbResponse implements java.io.Serializable {
+static final long serialVersionUID = -3L;
+private Collection result;
+private boolean OK;
+private Exception exception;
+private int updatedRowsCount;
+
+/**
+* MyServletResponse constructor comment.
+*/
+public DbResponse(Collection result, boolean OK, Exception exception) {
+	this.result = result;
+	this.OK = OK;
+	this.exception = exception;
+}
+public Exception getException() {
+	return exception;
+}
+public Collection getResult() {
+	return result;
+}
+public boolean isOK() {
+	return OK;
+}
+public void setException(Exception exception) {
+	this.exception = exception;
+}
+public void setOK(boolean OK) {
+	this.OK = OK;
+}
+public void setResult(Collection result) {
+	this.result = result;
+}
+public int getUpdatedRowsCount() {
+	return updatedRowsCount;
+}
+
+public void setUpdatedRowsCount(int updatedRowsCount) {
+	this.updatedRowsCount = updatedRowsCount;
+}
+
+}
--- a/src/de/memtext/db/DbRmiClient.java
+++ b/src/de/memtext/db/DbRmiClient.java
@ -1,105 +1,110 @@
				@@ -1,105 +1,110 @@
-/*
- * Created on 21.06.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package de.memtext.db;
-
-import java.net.MalformedURLException;
-import java.rmi.Naming;
-import java.rmi.NotBoundException;
-import java.rmi.RMISecurityManager;
-import java.rmi.RemoteException;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author MB
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DbRmiClient {
-    private DbServerI dbServerI = null;
-
-    String name = "DbServer"; //"//localhost/DbServer"
-
-    public DbRmiClient() {
-        if (System.getSecurityManager() == null) {
-            System.setSecurityManager(new RMISecurityManager());
-        }
-        try {
-            dbServerI = (DbServerI) Naming.lookup(name);
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        } catch (RemoteException e) {
-            e.printStackTrace();
-        } catch (NotBoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void test() {
-        testUpdate();
-        testQuery();
-    }
-
-    private void testUpdate() {
-        try {
-
-            DbRequest dbRequest = new DbRequest("update dummy set col2=99");
-            DbResponse dbResponse = dbServerI.execute(dbRequest);
-            if (dbResponse.isOK()) {
-                System.out.println("OK - updated rows :" + dbResponse.getUpdatedRowsCount());
-            } else {
-                System.out.println("failed :" + dbResponse.getException());
-            }
-
-
-        } catch (Exception e) {
-            System.out.println(" exception: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    private void testQuery() {
-        try {
-
-            DbRequest dbRequest = new DbRequest("select * from dummy");
-            DbResponse dbResponse = dbServerI.executeQuery("select * from dummy");
-            if (dbResponse.isOK()) {
-                System.out.println("OK");
-                List result = (List) dbResponse.getResult();
-                System.out.println("rows:" + result.size());
-                int i = 0;
-                for (Iterator it = result.iterator(); it.hasNext();) {
-                    List row = (List) it.next();
-                    i++;
-                    System.out.print("row " + i + " ");
-                    for (Iterator it2 = row.iterator(); it2.hasNext();) {
-                        Object o = it2.next();
-                        System.out.print(" - " + o);
-                    }
-                    System.out.println("");
-                }
-
-            } else {
-                System.out.println("failed :" + dbResponse.getException());
-            }
-
-
-        } catch (Exception e) {
-            System.out.println(" exception: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    public static void main(String a[]) {
-        DbRmiClient c = new DbRmiClient();
-        c.test();
-
-
-    }
-
-}
+/*
+ * Created on 21.06.2003
+ *
+ * To change the template for this generated file go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package de.memtext.db;
+
+import java.net.MalformedURLException;
+import java.rmi.Naming;
+import java.rmi.NotBoundException;
+import java.rmi.RMISecurityManager;
+import java.rmi.RemoteException;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @author MB
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class DbRmiClient {
+	private DbServerI dbServerI= null;
+	String name="DbServer"; //"//localhost/DbServer"
+public DbRmiClient()
+{
+	if (System.getSecurityManager() == null) {
+					System.setSecurityManager(new RMISecurityManager());
+				}
+	try {
+		dbServerI = (DbServerI)Naming.lookup(name);
+	} catch (MalformedURLException e) {
+		e.printStackTrace();
+	} catch (RemoteException e) {
+		e.printStackTrace();
+	} catch (NotBoundException e) {
+		e.printStackTrace();
+	}
+}
+public void test()
+{
+			testUpdate();
+	testQuery();
+}
+private void testUpdate() {
+	try {
+			
+		DbRequest dbRequest=new DbRequest("update dummy set col2=99");
+		DbResponse dbResponse=dbServerI.execute(dbRequest);
+		if (dbResponse.isOK())
+		{
+			System.out.println("OK - updated rows :" + dbResponse.getUpdatedRowsCount());
+		}
+		else
+		{
+			System.out.println("failed :"+dbResponse.getException());
+							}
+							
+							
+	} catch (Exception e) {
+		System.out.println(" exception: " + e.getMessage());
+		e.printStackTrace();
+	}
+}
+
+private void testQuery() {
+	try {
+			
+		DbRequest dbRequest=new DbRequest("select * from dummy");
+		DbResponse dbResponse=dbServerI.executeQuery("select * from dummy");
+		if (dbResponse.isOK())
+		{
+			System.out.println("OK");
+			List result=(List)dbResponse.getResult();
+			System.out.println("rows:"+result.size());
+			int i=0;
+			for (Iterator it=result.iterator();it.hasNext();)
+			{
+				 List row=(List)it.next();
+				 i++;
+				 System.out.print("row "+i+" ");
+				for (Iterator it2=row.iterator();it2.hasNext();)
+							{
+								 Object o=it2.next();
+								System.out.print(" - "+o);		
+							}	 
+				System.out.println("");	
+			}
+			
+		}
+		else
+		{
+			System.out.println("failed :"+dbResponse.getException());
+							}
+							
+							
+	} catch (Exception e) {
+		System.out.println(" exception: " + e.getMessage());
+		e.printStackTrace();
+	}
+}
+		public static void main(String a[]) {
+			DbRmiClient c=new DbRmiClient();
+			c.test();
+			
+		
+		}
+
+	}
--- a/src/de/memtext/db/DbServerI.java
+++ b/src/de/memtext/db/DbServerI.java
@ -1,26 +1,23 @@
				@@ -1,26 +1,23 @@
-/*
- * Created on 21.06.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package de.memtext.db;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * @author MB
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface DbServerI extends Remote {
-    public DbResponse execute(String sql) throws RemoteException;
-
-    public DbResponse executeQuery(String sql) throws RemoteException;
-
-    public DbResponse execute(DbRequest dbRequest) throws RemoteException;
-
-    public DbResponse executeQuery(DbRequest dbRequest) throws RemoteException;
-}
+/*
+ * Created on 21.06.2003
+ *
+ * To change the template for this generated file go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package de.memtext.db;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * @author MB
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public interface DbServerI extends Remote {
+	public DbResponse execute(String sql) throws RemoteException;
+	public DbResponse executeQuery(String sql) throws RemoteException;
+public DbResponse execute(DbRequest dbRequest) throws RemoteException;
+public DbResponse executeQuery(DbRequest dbRequest) throws RemoteException;
+}
--- a/src/de/memtext/db/DbServerImpl.java
+++ b/src/de/memtext/db/DbServerImpl.java
@ -1,126 +1,117 @@
				@@ -1,126 +1,117 @@
-/*
- * Created on 21.06.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package de.memtext.db;
-
-import java.rmi.Naming;
-import java.rmi.RMISecurityManager;
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.List;
-
-/**
- * @author MB
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DbServerImpl extends UnicastRemoteObject implements de.memtext.db.DbServerI {
-    private String dbDriver = "org.hsqldb.jdbcDriver";
-
-    private String dbURL = "jdbc:hsqldb:hsql://localhost:9000";
-
-    private String userid = "SA";
-
-    private String passwd = "";
-
-    private int updateRowCount;
-
-    private Connection con;
-
-    private Statement stmt;
-
-    public DbServerImpl() throws RemoteException {
-        super();
-        ConnectionCreator.loadClass(dbDriver);
-        try {
-            con = ConnectionCreator.getConnection(dbURL, userid, passwd);
-            stmt = con.createStatement();
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RemoteException("Couldn't connect to DB" + e.toString());
-        }
-    }
-
-    @Override
-    public DbResponse execute(String sql) throws RemoteException {
-        DbResponse result = new DbResponse(null, true, null);
-        try {
-            updateRowCount = stmt.executeUpdate(sql);
-            result.setUpdatedRowsCount(updateRowCount);
-            result.setOK(true);
-        } catch (SQLException e) {
-            e.printStackTrace();
-            result.setOK(false);
-            result.setException(e);
-        }
-        return result;
-    }
-
-    /* (non-Javadoc)
-     * @see de.mbisping.db.DbServerI#execute(de.mbisping.db.DbRequest)
-     */
-    @Override
-    public DbResponse execute(DbRequest dbRequest) throws RemoteException {
-        DbResponse result = new DbResponse(null, true, null);
-        if (dbRequest.getSql() != null) result = execute(dbRequest.getSql());
-
-        return result;
-    }
-
-    @Override
-    public DbResponse executeQuery(String sql) throws RemoteException {
-        DbResponse result = new DbResponse(null, true, null);
-        try {
-            ResultSet rs = stmt.executeQuery(sql);
-            List list = DbUtils.toResultList(rs);
-            result.setResult(list);
-            result.setOK(true);
-        } catch (SQLException e) {
-            e.printStackTrace();
-            result.setOK(false);
-            result.setException(e);
-        }
-        return result;
-    }
-
-    /* (non-Javadoc)
-     * @see de.mbisping.db.DbServerI#executeQuery(de.mbisping.db.DbRequest)
-     */
-    @Override
-    public DbResponse executeQuery(DbRequest dbRequest) throws RemoteException {
-        DbResponse result = new DbResponse(null, true, null);
-        result.setUpdatedRowsCount(20);
-        return result;
-    }
-
-    public static void main(String args[]) {
-
-        // Create and install a security manager
-        if (System.getSecurityManager() == null) {
-            System.setSecurityManager(new RMISecurityManager());
-        }
-
-        try {
-
-            DbServerImpl obj = new DbServerImpl();
-            //String name="//localhost/DbServer";
-            String name = "DbServer";
-            // Bind this object instance to the name "HelloServer"
-            Naming.rebind(name, obj);
-
-            System.out.println(name + " bound in registry");
-        } catch (Exception e) {
-            System.out.println("DbServerImpl err: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-}
+/*
+ * Created on 21.06.2003
+ *
+ * To change the template for this generated file go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package de.memtext.db;
+
+import java.rmi.Naming;
+import java.rmi.RMISecurityManager;
+import java.rmi.RemoteException;
+import java.rmi.server.UnicastRemoteObject;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.List;
+
+/**
+ * @author MB
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class DbServerImpl
+	extends UnicastRemoteObject
+	implements de.memtext.db.DbServerI {
+	private String dbDriver = "org.hsqldb.jdbcDriver";
+	private String dbURL = "jdbc:hsqldb:hsql://localhost:9000";
+	private String userid = "SA";
+	private String passwd = "";
+	private int updateRowCount;
+	private Connection con;
+	private Statement stmt;
+	public DbServerImpl() throws RemoteException {
+		super();
+		ConnectionCreator.loadClass(dbDriver);
+		try {
+			con = ConnectionCreator.getConnection(dbURL, userid, passwd);
+			stmt = con.createStatement();
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RemoteException("Couldn't connect to DB" + e.toString());
+		}
+	}
+	public DbResponse execute(String sql) throws RemoteException {
+		DbResponse result = new DbResponse(null, true, null);
+		try {
+			updateRowCount = stmt.executeUpdate(sql);
+			result.setUpdatedRowsCount(updateRowCount);
+			result.setOK(true);
+		} catch (SQLException e) {
+			e.printStackTrace();
+			result.setOK(false);
+			result.setException(e);
+		}
+		return result;
+	}
+	
+	/* (non-Javadoc)
+	 * @see de.mbisping.db.DbServerI#execute(de.mbisping.db.DbRequest)
+	 */
+	public DbResponse execute(DbRequest dbRequest) throws RemoteException {
+		DbResponse result = new DbResponse(null, true, null);
+		if (dbRequest.getSql() != null)
+			result = execute(dbRequest.getSql());
+
+		return result;
+	}
+
+	public DbResponse executeQuery(String sql) throws RemoteException {
+		DbResponse result = new DbResponse(null, true, null);
+		try {
+			ResultSet rs=stmt.executeQuery(sql);
+			List list=DbUtils.toResultList(rs);
+			result.setResult(list);
+			result.setOK(true);
+		} catch (SQLException e) {
+			e.printStackTrace();
+			result.setOK(false);
+			result.setException(e);
+		}
+		return result;
+		}
+	/* (non-Javadoc)
+	 * @see de.mbisping.db.DbServerI#executeQuery(de.mbisping.db.DbRequest)
+	 */
+	public DbResponse executeQuery(DbRequest dbRequest)
+		throws RemoteException {
+		DbResponse result = new DbResponse(null, true, null);
+		result.setUpdatedRowsCount(20);
+		return result;
+	}
+
+	public static void main(String args[]) {
+
+		// Create and install a security manager
+		if (System.getSecurityManager() == null) {
+			System.setSecurityManager(new RMISecurityManager());
+		}
+
+		try {
+
+			DbServerImpl obj = new DbServerImpl();
+			//String name="//localhost/DbServer";
+			String name = "DbServer";
+			// Bind this object instance to the name "HelloServer"
+			Naming.rebind(name, obj);
+
+			System.out.println(name + " bound in registry");
+		} catch (Exception e) {
+			System.out.println("DbServerImpl err: " + e.getMessage());
+			e.printStackTrace();
+		}
+	}
+
+}
--- a/src/de/memtext/db/DbUtils.java
+++ b/src/de/memtext/db/DbUtils.java
@ -1,99 +1,177 @@
				@@ -1,99 +1,177 @@
-package de.memtext.db;
-
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author MB
- */
-public class DbUtils {
-
-    /**
-     * 
-     */
-    private DbUtils() {
-    }
-
-    /*	private Vector toResultVector(ResultSet rs) throws SQLException
-    	{
-    			Vector help = new Vector();
-    		ResultSetMetaData rsmd = rs.getMetaData();
-    		int numberOfColumns = rsmd.getColumnCount();
-    
-    		Vector row = null;
-    		while (rs.next()) {
-    			row = new Vector();
-    			for (int i = 1; i <= numberOfColumns; i++) {
-    				row.add(rs.getObject(i));
-    			}
-    			help.add(row);
-    		}
-    		rs.close();
-    		return help;
-    
-    	}*/
-    public static List toResultList(ResultSet rs) throws SQLException {
-        List help = new LinkedList();
-        ResultSetMetaData rsmd = rs.getMetaData();
-        int numberOfColumns = rsmd.getColumnCount();
-
-        List row = null;
-        while (rs.next()) {
-            row = new LinkedList();
-            for (int i = 1; i <= numberOfColumns; i++) {
-                row.add(rs.getObject(i));
-            }
-            help.add(row);
-        }
-        rs.close();
-        return help;
-    }
-
-    public static void grantRightToAllTables() throws SQLException {
-        String url = "jdbc:hsqldb:hsql://localhost:9999";
-        String user = "";
-        String right = "select";
-        try {
-            Class.forName("org.hsqldb.jdbcDriver");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            DBAccess.addConnection("dbConn", DriverManager.getConnection(url, "admin", "hatschi3000"));
-        } catch (SQLException e1) {
-            e1.printStackTrace();
-        } catch (Exception e1) {
-            e1.printStackTrace();
-        }
-        List tablist = DBAccess.get("dbConn").getTableList();
-        StringBuffer buf = new StringBuffer();
-        for (Iterator it = tablist.iterator(); it.hasNext();) {
-            String tabname = (String) it.next();
-            buf.append("grant " + right + " on " + tabname + " to " + user + ";");
-
-        }
-        DBAccess.get("dbConn").execute(buf.toString());
-
-
-
-        DBAccess.closeConnection("dbConn");
-
-    }
-
-    /**
-     * Places Object in inverted single commas if it isn't null
-     * @param val
-     * @return either "null" if val is null or "'val'"
-     */
-    public static String placeInInvertedCommas(Object val) {
-        if (val == null) return "null";
-        return "'" + val + "'";
-    }
-}
+package de.memtext.db;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @author MB
+ */
+public class DbUtils {
+
+	/**
+	 * 
+	 */
+	private DbUtils() {
+	}
+
+	/*
+	 * private Vector toResultVector(ResultSet rs) throws SQLException { Vector help
+	 * = new Vector(); ResultSetMetaData rsmd = rs.getMetaData(); int
+	 * numberOfColumns = rsmd.getColumnCount();
+	 * 
+	 * Vector row = null; while (rs.next()) { row = new Vector(); for (int i = 1; i
+	 * <= numberOfColumns; i++) { row.add(rs.getObject(i)); } help.add(row); }
+	 * rs.close(); return help;
+	 * 
+	 * }
+	 */
+	public static List toResultList(ResultSet rs) throws SQLException {
+		List help = new LinkedList();
+		ResultSetMetaData rsmd = rs.getMetaData();
+		int numberOfColumns = rsmd.getColumnCount();
+
+		List row = null;
+		while (rs.next()) {
+			row = new LinkedList();
+			for (int i = 1; i <= numberOfColumns; i++) {
+				row.add(rs.getObject(i));
+			}
+			help.add(row);
+		}
+		rs.close();
+		return help;
+	}
+
+	public static void grantRightToAllTables() {
+		String url = "jdbc:hsqldb:hsql://localhost:9999";
+		String user = "";
+		String right = "select";
+		try {
+			Class.forName("org.hsqldb.jdbcDriver");
+		} catch (ClassNotFoundException e) {
+			e.printStackTrace();
+		}
+
+		try {
+			DBAccess.addConnection("dbConn", DriverManager.getConnection(url, "admin", "hatschi3000"));
+		} catch (SQLException e1) {
+			e1.printStackTrace();
+		} catch (Exception e1) {
+			e1.printStackTrace();
+		}
+		List tablist = DBAccess.get("dbConn").getTableList();
+		StringBuffer buf = new StringBuffer();
+		for (Iterator it = tablist.iterator(); it.hasNext();) {
+			String tabname = (String) it.next();
+			buf.append("grant " + right + " on " + tabname + " to " + user + ";");
+
+		}
+		DBAccess.get("dbConn").execute(buf.toString());
+
+		DBAccess.closeConnection("dbConn");
+
+	}
+
+	/**
+	 * Places Object in inverted single commas if it isn't null
+	 * 
+	 * @param val
+	 * @return either "null" if val is null or "'val'"
+	 */
+	public static String placeInInvertedCommas(Object val) {
+		if (val == null)
+			return "null";
+		return "'" + val + "'";
+	}
+
+	
+	public static int getInt(Statement stm, String query) throws SQLException {
+		int result = -1;
+		ResultSet rs = stm.executeQuery(query); 
+		while (rs.next()) {
+			result = rs.getInt(1);
+		}
+		rs.close();
+
+		return result;
+	}
+	
+	public static String getString(Statement stm, String query) throws SQLException {
+		String result = null;
+		ResultSet rs = stm.executeQuery(query); 
+		while (rs.next()) {
+			result = rs.getString(1);
+		}
+		rs.close();
+
+		return result;
+	}
+	/**
+	 * 
+		 * @param query
+	 * @return -1 wenn nichts gefunden
+	 * @throws SQLException
+	 */
+	public static int getInt(Connection con, String query,int param) throws SQLException {
+		int result = -1;
+		PreparedStatement pst=con.prepareStatement(query);
+		pst.setInt(1, param);
+		ResultSet rs = pst.executeQuery(); 
+		while (rs.next()) {
+			result = rs.getInt(1);
+		}
+		rs.close();
+		pst.close();
+		return result;
+	}
+	
+	/**
+	 * 
+		 * @param query
+	 * @return -1 wenn nichts gefunden
+	 * @throws SQLException
+	 */
+	public static int getInt(Connection con, String query,String param) throws SQLException {
+		int result = -1;
+		PreparedStatement pst=con.prepareStatement(query);
+		pst.setString(1, param);
+		ResultSet rs = pst.executeQuery(); 
+		while (rs.next()) {
+			result = rs.getInt(1);
+		}
+		rs.close();
+		pst.close();
+		return result;
+	}
+	/**
+	 * 
+	 * @param con
+	 * @param query
+	 * @param param
+	 * @return null if nothing found
+	 * @throws SQLException 
+	 */
+	public static String getString(Connection con,String query,String param) throws SQLException
+	{
+		String result=null;
+		PreparedStatement pst=con.prepareStatement(query);
+		pst.setString(1, param);
+		ResultSet rs = pst.executeQuery(); 
+		while (rs.next()) {
+			result = rs.getString(1);
+		}
+		rs.close();
+		pst.close();
+		return result;
+		
+	}
+}
 //Created on 21.06.2003
--- a/src/de/memtext/db/HsqlProcedures.java
+++ b/src/de/memtext/db/HsqlProcedures.java
@ -1,69 +1,123 @@
				@@ -1,69 +1,123 @@
-package de.memtext.db;
-
-import java.sql.Statement;
-
-/**
- * @author MB
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class HsqlProcedures {
-
-    /**
-     * Constructor for HsqlProcedures.
-     */
-    private HsqlProcedures() {
-        super();
-    }
-
-    public static Integer get1() {
-        return Integer.valueOf(1);
-
-    }
-
-    public static void alterTableColumnIntegerToVarchar(java.sql.Connection con, String tablename, String columnname) {
-        try {
-            Statement stmt = con.createStatement();
-            // add new tmp varchar col
-            stmt.execute("alter table " + tablename + " add column tmp" + columnname + " varchar");
-            //update value of tmp
-            stmt.execute("update " + tablename + " set tmp" + columnname + "= " + columnname);
-            //drop original
-            stmt.execute("alter table " + tablename + " drop column " + columnname);
-            //add col with original name and of varchar type
-            stmt.execute("alter table " + tablename + " add column " + columnname + " varchar");
-            //update values
-            stmt.execute("update " + tablename + " set " + columnname + "= tmp" + columnname);
-            //drop tmp
-            stmt.execute("alter table " + tablename + " drop column tmp" + columnname);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public static void alterTableColumnVarcharToInteger(java.sql.Connection con, String tablename, String columnname) {
-        try {
-            Statement stmt = con.createStatement();
-            // add new tmp varchar col
-            stmt.execute("alter table " + tablename + " add column tmp" + columnname + " integer");
-            //update value of tmp
-            stmt.execute("update " + tablename + " set tmp" + columnname + "= " + columnname);
-            //drop original
-            stmt.execute("alter table " + tablename + " drop column " + columnname);
-            //add col with original name and of varchar type
-            stmt.execute("alter table " + tablename + " add column " + columnname + " integer");
-            //update values
-            stmt.execute("update " + tablename + " set " + columnname + "= tmp" + columnname);
-            //drop tmp
-            stmt.execute("alter table " + tablename + " drop column tmp" + columnname);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-}
+package de.memtext.db;
+
+import java.sql.Statement;
+
+/**
+ * @author MB
+ *
+ * To change this generated comment edit the template variable "typecomment":
+ * Window>Preferences>Java>Templates.
+ * To enable and disable the creation of type comments go to
+ * Window>Preferences>Java>Code Generation.
+ */
+public class HsqlProcedures {
+
+	/**
+	 * Constructor for HsqlProcedures.
+	 */
+	private HsqlProcedures() {
+		super();
+	}
+		
+	public static Integer get1()
+	{
+		return new Integer(1);
+	
+	}
+	public static void alterTableColumnIntegerToVarchar(
+		java.sql.Connection con,
+		String tablename,
+		String columnname) {
+		try {
+			Statement stmt = con.createStatement();
+			// add new tmp varchar col
+			stmt.execute(
+				"alter table "
+					+ tablename
+					+ " add column tmp"
+					+ columnname
+					+ " varchar");
+		//update value of tmp
+			stmt.execute(
+				"update "
+					+ tablename
+					+ " set tmp"
+					+ columnname
+					+ "= "
+					+ columnname);
+			//drop original
+			stmt.execute(
+				"alter table " + tablename + " drop column " + columnname);
+			//add col with original name and of varchar type
+			stmt.execute(
+				"alter table "
+					+ tablename
+					+ " add column "
+					+ columnname
+					+ " varchar");
+		//update values
+		stmt.execute(
+				"update "
+					+ tablename
+					+ " set "
+					+ columnname
+					+ "= tmp"
+					+ columnname);
+					//drop tmp
+			stmt.execute(
+				"alter table " + tablename + " drop column tmp" + columnname);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
+	
+	public static void alterTableColumnVarcharToInteger(
+		java.sql.Connection con,
+		String tablename,
+		String columnname) {
+		try {
+			Statement stmt = con.createStatement();
+			// add new tmp varchar col
+			stmt.execute(
+				"alter table "
+					+ tablename
+					+ " add column tmp"
+					+ columnname
+					+ " integer");
+		//update value of tmp
+			stmt.execute(
+				"update "
+					+ tablename
+					+ " set tmp"
+					+ columnname
+					+ "= "
+					+ columnname);
+			//drop original
+			stmt.execute(
+				"alter table " + tablename + " drop column " + columnname);
+			//add col with original name and of varchar type
+			stmt.execute(
+				"alter table "
+					+ tablename
+					+ " add column "
+					+ columnname
+					+ " integer");
+		//update values
+		stmt.execute(
+				"update "
+					+ tablename
+					+ " set "
+					+ columnname
+					+ "= tmp"
+					+ columnname);
+					//drop tmp
+			stmt.execute(
+				"alter table " + tablename + " drop column tmp" + columnname);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
+
+}
--- a/src/de/memtext/db/HsqlStandaloneMgr.java
+++ b/src/de/memtext/db/HsqlStandaloneMgr.java
@ -1,381 +1,422 @@
				@@ -1,381 +1,422 @@
-/*
- * Copyright (c) 2001-2004, The HSQL Development Group All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * 
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 
- * Neither the name of the HSQL Development Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package de.memtext.db;
-
-import java.awt.Component;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-import javax.swing.JOptionPane;
-
-/**
- * A class which helps managing multiple connections to a stand-alone database
- * (e.g. on a network path). After one user has opened the database other users
- * can get the option to open a temporary copy of the database. The temporary
- * copy may be read-only, but doesn't has to be. If it's not read-only all, all
- * changes will be discarded when the connection is closed. (May be useful if
- * the application only does some dispensible logging or so). see
- * SampleApplication
- */
-public class HsqlStandaloneMgr {
-    private static AbstractHsqlStandaloneMgrResources resources;
-
-    private HsqlStandaloneMgr() {
-    }
-
-    private static void initResources() {
-        String mypackage = "";
-        //if you place the Resources classes in some package, define it like this
-        mypackage = "de.memtext.db.";
-        resources = (AbstractHsqlStandaloneMgrResources) ResourceBundle.getBundle(mypackage + "HsqlStandaloneMgrResources");
-    }
-
-
-
-    /**
-     * Checks if a database is already opened (by checking if a .lck file
-     * exists) Use from HSQLDB 1.7.2 or higher
-     * 
-     * @param String
-     *            path - null,"" or "." for current directory
-     * @param String
-     *            databasename
-     * @return true if database is already opened
-     */
-    public static boolean isDatabaseOpen(String path, String databasename) {
-        File lckFile = new File(getAdaptedPath(path) + databasename + ".lck");
-        return lckFile.exists();
-    }
-
-    /**
-     * Deletes any temporary files which the HsqlStandaloneMgr may have created
-     * for the given url
-     * 
-     * @param String
-     *            url
-     * @param String
-     *            path - null,"" or "." for current dir
-     * @param String
-     *            databasename - of the original database, no _TMP_COPY appendix
-     */
-    public static void deleteTmpFiles(String url, String path, String databasename) {
-        if (databasename.indexOf("_TMP_COPY") > -1) throw new IllegalArgumentException("Please specifiy the name of the original database without _TMP_COPY");
-        path = getAdaptedPath(path);
-
-        int tmpPos = url.indexOf("_TMP_COPY");
-        if (tmpPos == -1) {
-            //if the main connection is closed delete info about the user
-            File f = new File(path + databasename + "_user.properties");
-            if (f.exists()) f.delete();
-        } else {
-            //delete files for temp. connection
-            String tmp = url.substring(tmpPos);
-            if (path == null || path.equals("")) path = ".";
-            File fpath = new File(path);
-            File tmpFiles[] = fpath.listFiles(new TmpFileFilter(databasename + tmp));
-            for (int i = 0; i < tmpFiles.length; i++) {
-                tmpFiles[i].delete();
-            }
-        }
-
-    }
-
-    /**
-     * Asks the user if he/she wants to open a temporary copy of the database or
-     * not. A boolean indicates if the questions concerns read-only mode or not.
-     * 
-     * @param Component
-     *            parentComponent - usually the application Frame, but may be
-     *            null
-     * @param String
-     *            databasename - name of original database
-     * @param boolean
-     *            isReadOnlyCopyWanted - should the temp. copy be read-only
-     * @return int from JOptionPane.showConfirmDialog
-     */
-    public static int askUser(Component parentComponent, String path,
-
-                              String databasename, boolean isReadOnlyCopyWanted) {
-        if (resources == null) initResources();
-
-        String username = null;
-        File f = new File(getAdaptedPath(path) + databasename + "_user.properties");
-        if (f.exists()) {
-            Properties p = new Properties();
-            FileInputStream fis;
-            try {
-                fis = new FileInputStream(f);
-                p.load(fis);
-                username = p.getProperty("user");
-                fis.close();
-            } catch (Exception e) {
-                System.err.println(resources.getString("Couldn't read user name"));
-                e.printStackTrace();
-            }
-
-        }
-        StringBuffer msg = new StringBuffer(resources.getDbInUseBy(databasename, username));
-
-        if (isReadOnlyCopyWanted)
-            msg.append(resources.getString("Would you like to open a temporary copy in read-only mode?"));
-        else
-            msg.append(resources.getString("Would you like to open a temporary copy?\nAttention - any changes to the database will be lost after closing the program!"));
-        return JOptionPane.showConfirmDialog(parentComponent, msg, "HSQLDB", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
-
-    }
-
-    /**
-     * Returns a connection to a temporary copy of a database either in
-     * read-only mode or not.
-     * 
-     * @param Component
-     *            parentComponent - usually the application Frame, but may be
-     *            null
-     * @param String
-     *            path - null,"" or "." for current dir
-     * @param String
-     *            databasename
-     * @param String
-     *            username
-     * @param String
-     *            password
-     * @param boolean
-     *            isReadOnlyCopyWanted - should the temporary copy of the
-     *            database be in read-only mode
-     * @return Connection to the temporary copy of the database
-     * @throws ClassNotFoundException
-     * @throws SQLException
-     * @throws IOException
-     */
-    public static Connection getTmpConnection(Component parentComponent, String path, String databasename, String username, String password, boolean isReadOnlyCopyWanted)
-                    throws ClassNotFoundException, SQLException, IOException {
-        if (resources == null) initResources();
-        Class.forName("org.hsqldb.jdbcDriver");
-        path = getAdaptedPath(path);
-
-        int tmpInstanceNumber = checkNumber(path, databasename);
-
-        try {
-            copyDatabaseFiles(path, databasename, tmpInstanceNumber);
-        } catch (IOException e) {
-            JOptionPane.showMessageDialog(parentComponent, resources.getString("Could not create temporary copy of database.)") + "\n" + e, "HSQLDB", JOptionPane.WARNING_MESSAGE);
-            throw e;
-        }
-
-        if (isReadOnlyCopyWanted) {
-            try {
-                setReadonly(path + databasename + "_TMP_COPY" + tmpInstanceNumber + ".properties");
-            } catch (IOException e) {
-                JOptionPane.showMessageDialog(parentComponent, resources.getString("Could not set temporary copy of database to readonly mode.") + "\n" + e, "HSQLDB",
-                                              JOptionPane.WARNING_MESSAGE);
-                throw e;
-            }
-        }
-        String url = "jdbc:hsqldb:file:" + path + databasename + "_TMP_COPY" + tmpInstanceNumber;
-
-        Connection con = java.sql.DriverManager.getConnection(url, username, password);
-
-        if (!isReadOnlyCopyWanted) {
-            Statement stmt = con.createStatement();
-            ResultSet rs = stmt.executeQuery("select count(*) from system_tables where hsqldb_type='TEXT'");
-            rs.next();
-            if (rs.getInt(1) > 0) {
-                stmt.execute("shutdown");
-                stmt.close();
-                con.close();
-                deleteTmpFiles(url, path, databasename);
-                throw new SQLException(resources.getString("Handling non read-only temporary database with text tables is not supported"));
-            }
-            rs.close();
-            stmt.close();
-        }
-        return con;
-    }
-
-    private static int checkNumber(String path, String databasename) {
-        int result = 1;
-        while (new File(path + databasename + "_TMP_COPY" + result + ".script").exists())
-            result++;
-        return result;
-    }
-
-    /**
-     * Returns a regular connection to a database and creates a file
-     * database_user.properties with the name of the user that opens the
-     * database
-     * 
-     * @param String
-     *            path - null,"" or "." for current dir
-     * @param String
-     *            databasename
-     * @param String
-     *            username
-     * @param String
-     *            password
-     * @return Connection to the database
-     * @throws ClassNotFoundException
-     * @throws SQLException
-     * @throws IOException
-     */
-    public static Connection getConnection(String path, String databasename, String username, String password) throws ClassNotFoundException, SQLException, IOException {
-        Class.forName("org.hsqldb.jdbcDriver");
-        String url = null;
-        if (path == null)
-            url = "jdbc:hsqldb:" + databasename;
-        else
-            url = "jdbc:hsqldb:file:" + getAdaptedPath(path) + databasename;
-
-        Connection con = java.sql.DriverManager.getConnection(url, username, password);
-
-        Properties p = new Properties();
-        p.put("user", System.getProperty("user.name"));
-        String filename = (path != null ? path + "/" + databasename + "_user.properties" : databasename + "_user.properties");
-        FileOutputStream fos = new FileOutputStream(filename);
-        p.store(fos, "User which uses the HSQL database");
-        fos.close();
-
-        return con;
-    }
-
-    /**
-     * String and makes sure separator char is at the end
-     * 
-     * @param String
-     *            path
-     * @return adapted path String
-     */
-    private static String getAdaptedPath(String path) {
-        if (path == null) path = "";
-        if ((path.equals(".") || path.length() > 1) && !(path.endsWith("/") || path.endsWith("\\"))) path += File.separator;
-
-        return path;
-    }
-
-    /**
-     * Changes the property readonly to true in a database properties file
-     * 
-     * @param String
-     *            propertiesFile including path if necessary
-     * @throws IOException
-     */
-    private static void setReadonly(String propertiesFile) throws IOException {
-        Properties p = new Properties();
-        p.load(new FileInputStream(propertiesFile));
-        p.put("readonly", "true");
-        p.store(new FileOutputStream(propertiesFile), "HSQL database");
-
-    }
-
-    /**
-     * Makes a temporary copy of all existing database files with the appendix
-     * _TMP_COPY
-     * 
-     * @param String
-     *            path - may be null for current dir, no / or \ at the end
-     * @param String
-     *            databasename
-     * @throws IOException
-     */
-    private static void copyDatabaseFiles(String path, String databasename, int number) throws IOException {
-
-        String s = path + databasename;
-        copyFile(s + ".script", s + "_TMP_COPY" + number + ".script");
-        copyFile(s + ".properties", s + "_TMP_COPY" + number + ".properties");
-        if (new File(s + ".log").exists()) copyFile(s + ".log", s + "_TMP_COPY" + number + ".log");
-        if (new File(s + ".data").exists()) copyFile(s + ".data", s + "_TMP_COPY" + number + ".data");
-        if (new File(s + ".backup").exists()) copyFile(s + ".backup", s + "_TMP_COPY" + number + ".backup");
-        if (new File(s + ".nio").exists()) copyFile(s + ".nio", s + "_TMP_COPY" + number + ".nio");
-    }
-
-    /**
-     * Creates a copy of a file
-     * 
-     * @param String
-     *            source - source file name (incl. path if necessary)
-     * @param String
-     *            target - target file name (incl. path if necessary)
-     * @throws IOException
-     */
-    static public void copyFile(String source, String target) throws IOException {
-
-        try {
-            FileInputStream is = new FileInputStream(source);
-            FileOutputStream os = new FileOutputStream(target);
-
-            BufferedInputStream in = new BufferedInputStream(is);
-            BufferedOutputStream out = new BufferedOutputStream(os);
-
-            int buffer_size = 32768;
-            byte[] buffer = new byte[buffer_size];
-
-            int len = in.read(buffer, 0, buffer_size);
-            while (len != -1) {
-                out.write(buffer, 0, len);
-                len = in.read(buffer, 0, buffer_size);
-            }
-            in.close();
-            is.close();
-            out.close();
-            os.close();
-
-        } catch (IOException e) {
-            throw new IOException("Couldn't copy file " + source + ": " + e.toString());
-        }
-    }
-
-    private static class TmpFileFilter implements FilenameFilter {
-        private String tmpName;
-
-        TmpFileFilter(String tmpName) {
-            this.tmpName = tmpName;
-        }
-
-        @Override
-        public boolean accept(File dir, String name) {
-            return name.indexOf(tmpName) > -1;
-        }
-
-    }
-
-}
-
-//Created on 21.10.2004 at 20:35:55
+/*
+ * Copyright (c) 2001-2004, The HSQL Development Group All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the HSQL Development Group nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package de.memtext.db;
+
+import java.awt.Component;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+import javax.swing.JOptionPane;
+
+/**
+ * A class which helps managing multiple connections to a stand-alone database
+ * (e.g. on a network path). After one user has opened the database other users
+ * can get the option to open a temporary copy of the database. The temporary
+ * copy may be read-only, but doesn't has to be. If it's not read-only all, all
+ * changes will be discarded when the connection is closed. (May be useful if
+ * the application only does some dispensible logging or so). see
+ * SampleApplication
+ */
+public class HsqlStandaloneMgr {
+    private static AbstractHsqlStandaloneMgrResources resources;
+
+    private HsqlStandaloneMgr() {
+    }
+
+    private static void initResources() {
+        String mypackage = "";
+        //if you place the Resources classes in some package, define it like this
+         mypackage="de.memtext.db.";
+        resources = (AbstractHsqlStandaloneMgrResources) ResourceBundle
+                .getBundle(mypackage + "HsqlStandaloneMgrResources");
+    }
+
+   
+
+    /**
+     * Checks if a database is already opened (by checking if a .lck file
+     * exists) Use from HSQLDB 1.7.2 or higher
+     * 
+     * @param String
+     *            path - null,"" or "." for current directory
+     * @param String
+     *            databasename
+     * @return true if database is already opened
+     */
+    public static boolean isDatabaseOpen(String path, String databasename) {
+        File lckFile = new File(getAdaptedPath(path)+databasename+".lck");
+        return lckFile.exists();
+    }
+
+    /**
+     * Deletes any temporary files which the HsqlStandaloneMgr may have created
+     * for the given url
+     * 
+     * @param String
+     *            url
+     * @param String
+     *            path - null,"" or "." for current dir
+     * @param String
+     *            databasename - of the original database, no _TMP_COPY appendix
+     */
+    public static void deleteTmpFiles(String url, String path,
+            String databasename) {
+        if (databasename.indexOf("_TMP_COPY") > -1)
+            throw new IllegalArgumentException(
+                    "Please specifiy the name of the original database without _TMP_COPY");
+        path=getAdaptedPath(path);
+
+        int tmpPos = url.indexOf("_TMP_COPY");
+        if (tmpPos == -1) {
+            //if the main connection is closed delete info about the user
+            File f = new File(path + databasename + "_user.properties");
+            if (f.exists())
+                f.delete();
+        } else {
+            //delete files for temp. connection
+            String tmp = url.substring(tmpPos);
+          if (path==null||path.equals("")) path=".";
+            File fpath = new File(path);
+            File tmpFiles[] = fpath.listFiles(new TmpFileFilter(databasename
+                    + tmp));
+            for (int i = 0; i < tmpFiles.length; i++) {
+                tmpFiles[i].delete();
+            }
+        }
+
+    }
+
+    /**
+     * Asks the user if he/she wants to open a temporary copy of the database or
+     * not. A boolean indicates if the questions concerns read-only mode or not.
+     * 
+     * @param Component
+     *            parentComponent - usually the application Frame, but may be
+     *            null
+     * @param String
+     *            databasename - name of original database
+     * @param boolean
+     *            isReadOnlyCopyWanted - should the temp. copy be read-only
+     * @return int from JOptionPane.showConfirmDialog
+     */
+    public static int askUser(Component parentComponent, String path,
+
+    String databasename, boolean isReadOnlyCopyWanted) {
+        if (resources == null)
+            initResources();
+        
+        String username = null;
+        File f = new File(getAdaptedPath(path) +  databasename + "_user.properties");
+        if (f.exists()) {
+            Properties p = new Properties();
+            FileInputStream fis;
+            try {
+                fis = new FileInputStream(f);
+                p.load(fis);
+                username = p.getProperty("user");
+                fis.close();
+            } catch (Exception e) {
+                System.err.println(resources
+                        .getString("Couldn't read user name"));
+                e.printStackTrace();
+            }
+
+        }
+        StringBuffer msg = new StringBuffer(resources.getDbInUseBy(
+                databasename, username));
+
+        if (isReadOnlyCopyWanted)
+            msg
+                    .append(resources
+                            .getString("Would you like to open a temporary copy in read-only mode?"));
+        else
+            msg
+                    .append(resources
+                            .getString("Would you like to open a temporary copy?\nAttention - any changes to the database will be lost after closing the program!"));
+        return JOptionPane.showConfirmDialog(parentComponent, msg, "HSQLDB",
+                JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+
+    }
+
+    /**
+     * Returns a connection to a temporary copy of a database either in
+     * read-only mode or not.
+     * 
+     * @param Component
+     *            parentComponent - usually the application Frame, but may be
+     *            null
+     * @param String
+     *            path - null,"" or "." for current dir
+     * @param String
+     *            databasename
+     * @param String
+     *            username
+     * @param String
+     *            password
+     * @param boolean
+     *            isReadOnlyCopyWanted - should the temporary copy of the
+     *            database be in read-only mode
+     * @return Connection to the temporary copy of the database
+     * @throws ClassNotFoundException
+     * @throws SQLException
+     * @throws IOException
+     */
+    public static Connection getTmpConnection(Component parentComponent,
+            String path, String databasename, String username, String password,
+            boolean isReadOnlyCopyWanted) throws ClassNotFoundException,
+            SQLException, IOException {
+        if (resources == null)
+            initResources();
+        Class.forName("org.hsqldb.jdbcDriver");
+        path = getAdaptedPath(path);
+
+        int tmpInstanceNumber = checkNumber(path, databasename);
+
+        try {
+            copyDatabaseFiles(path, databasename, tmpInstanceNumber);
+        } catch (IOException e) {
+            JOptionPane.showMessageDialog(parentComponent, resources
+                    .getString("Could not create temporary copy of database.)")
+                    + "\n" + e, "HSQLDB", JOptionPane.WARNING_MESSAGE);
+            throw e;
+        }
+
+        if (isReadOnlyCopyWanted) {
+            try {
+                setReadonly(path +  databasename + "_TMP_COPY"
+                        + tmpInstanceNumber + ".properties");
+            } catch (IOException e) {
+                JOptionPane
+                        .showMessageDialog(
+                                parentComponent,
+                                resources
+                                        .getString("Could not set temporary copy of database to readonly mode.")
+                                        + "\n" + e, "HSQLDB",
+                                JOptionPane.WARNING_MESSAGE);
+                throw e;
+            }
+        }
+        String url = "jdbc:hsqldb:file:" + path + databasename
+                + "_TMP_COPY" + tmpInstanceNumber;
+
+        Connection con = java.sql.DriverManager.getConnection(url, username,
+                password);
+
+        if (!isReadOnlyCopyWanted) {
+            Statement stmt = con.createStatement();
+            ResultSet rs = stmt
+                    .executeQuery("select count(*) from system_tables where hsqldb_type='TEXT'");
+            rs.next();
+            if (rs.getInt(1) > 0) {
+                stmt.execute("shutdown");
+                stmt.close();
+                con.close();
+                deleteTmpFiles(url, path, databasename);
+                throw new SQLException(
+                        resources
+                                .getString("Handling non read-only temporary database with text tables is not supported"));
+            }
+            rs.close();
+            stmt.close();
+        }
+        return con;
+    }
+
+    private static int checkNumber(String path, String databasename) {
+        int result = 1;
+        while (new File(path + databasename + "_TMP_COPY" + result
+                + ".script").exists())
+            result++;
+        return result;
+    }
+
+    /**
+     * Returns a regular connection to a database and creates a file
+     * database_user.properties with the name of the user that opens the
+     * database
+     * 
+     * @param String
+     *            path - null,"" or "." for current dir
+     * @param String
+     *            databasename
+     * @param String
+     *            username
+     * @param String
+     *            password
+     * @return Connection to the database
+     * @throws ClassNotFoundException
+     * @throws SQLException
+     * @throws IOException
+     */
+    public static Connection getConnection(String path, String databasename,
+            String username, String password) throws ClassNotFoundException,
+            SQLException, IOException {
+        Class.forName("org.hsqldb.jdbcDriver");
+        String url=null;
+        if (path==null)
+            url="jdbc:hsqldb:"+databasename;
+        else
+             url = "jdbc:hsqldb:file:" + getAdaptedPath(path) + databasename;
+        
+        Connection con = java.sql.DriverManager.getConnection(url, username,
+                password);
+
+        Properties p = new Properties();
+        p.put("user", System.getProperty("user.name"));
+        String filename=(path!=null?path+"/"+databasename+"_user.properties":databasename+"_user.properties");
+        FileOutputStream fos = new FileOutputStream(filename);
+        p.store(fos, "User which uses the HSQL database");
+        fos.close();
+
+        return con;
+    }
+
+    /**
+     * String and makes sure separator char is at the end
+     * 
+     * @param String
+     *            path
+     * @return adapted path String
+     */
+    private static String getAdaptedPath(String path) {
+        if (path == null)  path = "";
+        if ((path.equals(".")||path.length()>1)&&!(path.endsWith("/")||path.endsWith("\\")))
+            path+=File.separator;
+       
+        return path;
+    }
+
+    /**
+     * Changes the property readonly to true in a database properties file
+     * 
+     * @param String
+     *            propertiesFile including path if necessary
+     * @throws IOException
+     */
+    private static void setReadonly(String propertiesFile) throws IOException {
+        Properties p = new Properties();
+        p.load(new FileInputStream(propertiesFile));
+        p.put("readonly", "true");
+        p.store(new FileOutputStream(propertiesFile), "HSQL database");
+
+    }
+
+    /**
+     * Makes a temporary copy of all existing database files with the appendix
+     * _TMP_COPY
+     * 
+     * @param String
+     *            path - may be null for current dir, no / or \ at the end
+     * @param String
+     *            databasename
+     * @throws IOException
+     */
+    private static void copyDatabaseFiles(String path, String databasename,
+            int number) throws IOException {
+       
+        String s = path + databasename;
+        copyFile(s + ".script", s + "_TMP_COPY" + number + ".script");
+        copyFile(s + ".properties", s + "_TMP_COPY" + number + ".properties");
+        if (new File(s + ".log").exists())
+            copyFile(s + ".log", s + "_TMP_COPY" + number + ".log");
+        if (new File(s + ".data").exists())
+            copyFile(s + ".data", s + "_TMP_COPY" + number + ".data");
+        if (new File(s + ".backup").exists())
+            copyFile(s + ".backup", s + "_TMP_COPY" + number + ".backup");
+        if (new File(s + ".nio").exists())
+            copyFile(s + ".nio", s + "_TMP_COPY" + number + ".nio");
+    }
+
+    /**
+     * Creates a copy of a file
+     * 
+     * @param String
+     *            source - source file name (incl. path if necessary)
+     * @param String
+     *            target - target file name (incl. path if necessary)
+     * @throws IOException
+     */
+    static public void copyFile(String source, String target)
+            throws IOException {
+
+        try {
+            FileInputStream is = new FileInputStream(source);
+            FileOutputStream os = new FileOutputStream(target);
+
+            BufferedInputStream in = new BufferedInputStream(is);
+            BufferedOutputStream out = new BufferedOutputStream(os);
+
+            int buffer_size = 32768;
+            byte[] buffer = new byte[buffer_size];
+
+            int len = in.read(buffer, 0, buffer_size);
+            while (len != -1) {
+                out.write(buffer, 0, len);
+                len = in.read(buffer, 0, buffer_size);
+            }
+            in.close();
+            is.close();
+            out.close();
+            os.close();
+
+        } catch (IOException e) {
+            throw new IOException("Couldn't copy file " + source + ": "
+                    + e.toString());
+        }
+    }
+
+    private static class TmpFileFilter implements FilenameFilter {
+        private String tmpName;
+
+        TmpFileFilter(String tmpName) {
+            this.tmpName = tmpName;
+        }
+
+        public boolean accept(File dir, String name) {
+            return name.indexOf(tmpName) > -1;
+        }
+
+    }
+
+}
+
+//Created on 21.10.2004 at 20:35:55
--- a/src/de/memtext/db/HsqlStandaloneMgrResources.java
+++ b/src/de/memtext/db/HsqlStandaloneMgrResources.java
@ -1,66 +1,70 @@
				@@ -1,66 +1,70 @@
-/*
- * Copyright (c) 2001-2004, The HSQL Development Group All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * 
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 
- * Neither the name of the HSQL Development Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package de.memtext.db;
-
-/**
- * Resources for HsqlStandaloneMgr.
- * For other locales extend AbstractHsqlStandloneMgrResources, i.e.
- * by copying HsqlStandaloneMgrResources_de to your locale
- */
-
-public class HsqlStandaloneMgrResources extends AbstractHsqlStandaloneMgrResources {
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-
-    static final Object[][] contents = {
-
-                                         { "Couldn't read user name", "Couldn't read user name" },
-                                         { "Would you like to open a temporary copy in read-only mode?", "Would you like to open a temporary copy in read-only mode?" },
-                                         { "Would you like to open a temporary copy?\nAttention - any changes to the database will be lost after closing the program!",
-                                           "Would you like to open a temporary copy?\nAttention - any changes to the database will be lost after closing the program!" },
-                                         { "Could not create temporary copy of database.", "Could not create temporary copy of database." },
-                                         { "Could not set temporary copy of database to readonly mode.", "Could not set temporary copy of database to readonly mode." },
-                                         { "Handling non read-only temporary database with text tables is not supported",
-                                           "Handling non read-only temporary database with text tables is not supported" }
-
-    };
-
-    @Override
-    public String getDbInUseBy(String dbname, String user) {
-        String result = "The database " + dbname + " is already in use";
-        if (user != null) result += " by user " + user;
-        result += ".\n";
-        return result;
-    }
-}
-
+/*
+ * Copyright (c) 2001-2004, The HSQL Development Group All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the HSQL Development Group nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package de.memtext.db;
+/**
+ * Resources for HsqlStandaloneMgr.
+ * For other locales extend AbstractHsqlStandloneMgrResources, i.e.
+ * by copying HsqlStandaloneMgrResources_de to your locale
+ */
+
+public class HsqlStandaloneMgrResources extends
+        AbstractHsqlStandaloneMgrResources {
+    public Object[][] getContents() {
+        return contents;
+    }
+
+    static final Object[][] contents = {
+
+            { "Couldn't read user name", "Couldn't read user name" },
+            { "Would you like to open a temporary copy in read-only mode?",
+                    "Would you like to open a temporary copy in read-only mode?" },
+            {
+                    "Would you like to open a temporary copy?\nAttention - any changes to the database will be lost after closing the program!",
+                    "Would you like to open a temporary copy?\nAttention - any changes to the database will be lost after closing the program!" },
+            { "Could not create temporary copy of database.",
+                    "Could not create temporary copy of database." },
+            { "Could not set temporary copy of database to readonly mode.",
+                    "Could not set temporary copy of database to readonly mode." },
+            {
+                    "Handling non read-only temporary database with text tables is not supported",
+                    "Handling non read-only temporary database with text tables is not supported" }
+
+    };
+
+    public String getDbInUseBy(String dbname, String user) {
+        String result = "The database " + dbname + " is already in use";
+        if (user != null)
+            result += " by user " + user;
+        result += ".\n";
+        return result;
+    }
+}
+
--- a/src/de/memtext/db/HsqlStandaloneMgrResources_de.java
+++ b/src/de/memtext/db/HsqlStandaloneMgrResources_de.java
@ -1,63 +1,68 @@
				@@ -1,63 +1,68 @@
-/*
- * Copyright (c) 2001-2004, The HSQL Development Group All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * 
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 
- * Neither the name of the HSQL Development Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package de.memtext.db;
-
-/**
- * Resources for HsqlStandaloneMgr.
- * For other locales extend AbstractHsqlStandloneMgrResources, i.e.
- * by copying this class to your locale
- */
-public class HsqlStandaloneMgrResources_de extends AbstractHsqlStandaloneMgrResources {
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-
-    static final Object[][] contents = { { "Couldn't read user name", "Konnte Usernamen nicht lesen" },
-                                         { "Would you like to open a temporary copy in read-only mode?", "Möchten Sie eine schreibgeschützte Kopie öffnen?" },
-                                         { "Would you like to open a temporary copy?\nAttention - any changes to the database will be lost after closing the program!",
-                                           "Möchten Sie eine temporäre Kopie öffnen?\nAchtung, wenn Sie das Programm beenden, gehen alle Änderungen, die Sie vorgenommen haben, verloren!" },
-                                         { "Could not create temporary copy of database.", "Konnte keine temporäre Kopie der Datenbank anlegen." },
-                                         { "Could not set temporary copy of database to readonly mode.", "Konnte die temp. Kopie nicht auf schreibgeschützt setzen" },
-                                         { "Handling non read-only temporary database with text tables is not supported",
-                                           "Nicht schreibgeschützte Datenbanken mit Text-Tables werden nicht unterstützt" }
-
-    };
-
-    @Override
-    public String getDbInUseBy(String dbname, String user) {
-        String result = "Die Datenbank " + dbname + " wird schon benutzt ";
-        if (user != null) result += " vom User " + user;
-        result += ".\n";
-        return result;
-    }
-}
-
+/*
+ * Copyright (c) 2001-2004, The HSQL Development Group All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the HSQL Development Group nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package de.memtext.db;
+/**
+ * Resources for HsqlStandaloneMgr.
+ * For other locales extend AbstractHsqlStandloneMgrResources, i.e.
+ * by copying this class to your locale
+ */
+public class HsqlStandaloneMgrResources_de extends
+        AbstractHsqlStandaloneMgrResources {
+    public Object[][] getContents() {
+        return contents;
+    }
+
+    static final Object[][] contents = {
+            { "Couldn't read user name", "Konnte Usernamen nicht lesen" },
+            { "Would you like to open a temporary copy in read-only mode?",
+                    "Möchten Sie eine schreibgeschützte Kopie öffnen?" },
+            {
+                    "Would you like to open a temporary copy?\nAttention - any changes to the database will be lost after closing the program!",
+                    "Möchten Sie eine temporäre Kopie öffnen?\nAchtung, wenn Sie das Programm beenden, gehen alle Änderungen, die Sie vorgenommen haben, verloren!" },
+            { "Could not create temporary copy of database.",
+                    "Konnte keine temporäre Kopie der Datenbank anlegen." },
+            { "Could not set temporary copy of database to readonly mode.",
+                    "Konnte die temp. Kopie nicht auf schreibgeschützt setzen" },
+            {
+                    "Handling non read-only temporary database with text tables is not supported",
+                    "Nicht schreibgeschützte Datenbanken mit Text-Tables werden nicht unterstützt" }
+
+    };
+
+    public String getDbInUseBy(String dbname, String user) {
+        String result = "Die Datenbank " + dbname + " wird schon benutzt ";
+        if (user != null)
+            result += " vom User " + user;
+        result += ".\n";
+        return result;
+    }
+}
+
--- a/src/de/memtext/db/Library2.java
+++ b/src/de/memtext/db/Library2.java
@ -1,83 +1,91 @@
				@@ -1,83 +1,91 @@
-package de.memtext.db;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * Additional procedures for HSQLDB 
- *  make sure that this class in the classpath.
- * To constantly add it to hsql, go to the directory where your hsqldb.jar is located
- * Call jar -xf hsqlAddOn.jar
- *      jar -uf hsqldb.jar org/hsqldb/Library2.class
- * Delete the directory org.
- * 
- * Open your Database in Database Manager and execute
- * the following commands once:  
- *  GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC and
- * CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"
- */
-public class Library2 {
-    private Library2() {
-        super();
-    }
-
-    /**
-     * Fills regular tables with values from a CSV-file.
-     * Similar to Postgres COPY FROM command.
-     * 
-     * If you want to fill your table TEST with data from test.csv
-     * make sure that this class in the classpath and that
-     * GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC and
-     * CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"
-     * has been called in your database at some point.
-    
-     *  * Then execute   
-     * COPYFROM("TEST","test.csv",null)
-     * 
-     * if your not using , but | as a field separator
-      COPYFROM("TEST","test.csv","fs=|")
-    
-     * 
-     * @param con - Connection is automatically handed over by HSQL
-     * @param table - the name of the table that is to be filled
-     * 				  if your table isn't found capital letters may be required
-     * @param file - the filename of the CSV-file
-     * @param options - you can specify options separated by ; 
-     * which are described in the text table documentation e.g.
-     * fs=| to use pipe instead of default comma as field separator or
-     * or 
-     * fs=|;vs=.;lvs=~" varchar separator, longvarchar separator
-     * ignore_first=true; ignore first line
-     * all_quoted=true or
-     * encoding=UTF-8 if you don't have ASCII
-     * @throws SQLException
-     */
-    public static void copyFrom(Connection con, String table, String file, String options) throws SQLException {
-        StringBuffer buf = new StringBuffer("create text table TMP_SOURCE_" + table + " (");
-
-        ResultSet rs = con.getMetaData().getColumns(null, null, table, null);
-        String colname, coltype;
-        boolean tableFound = false;
-        while (rs.next()) {
-            tableFound = true;
-            colname = rs.getObject(4).toString();
-            coltype = rs.getObject(6).toString();
-            buf.append(colname + " " + coltype + ",");
-        }
-        rs.close();
-        if (!tableFound) throw new IllegalArgumentException("Copy from failed - table " + table + " not found");
-        buf.deleteCharAt(buf.lastIndexOf(","));
-        buf.append("); SET TABLE TMP_SOURCE_" + table + " SOURCE \"" + file);
-        if (options != null) buf.append(";" + options);
-        buf.append("\";");
-        buf.append("insert into " + table + " select * from TMP_SOURCE_" + table);
-        Statement stmt = con.createStatement();
-        try {
-            stmt.execute(buf.toString());
-        } finally {
-            stmt.execute("drop table TMP_SOURCE_" + table + " IF EXISTS");
-        }
-    }
-}
+package de.memtext.db;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+/**
+ * Additional procedures for HSQLDB 
+ *  make sure that this class in the classpath.
+ * To constantly add it to hsql, go to the directory where your hsqldb.jar is located
+ * Call jar -xf hsqlAddOn.jar
+ *      jar -uf hsqldb.jar org/hsqldb/Library2.class
+ * Delete the directory org.
+ * 
+ * Open your Database in Database Manager and execute
+ * the following commands once:  
+ *  GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC and
+ * CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"
+ */
+public class Library2 {
+	private Library2() {
+		super();
+	}
+	/**
+	 * Fills regular tables with values from a CSV-file.
+	 * Similar to Postgres COPY FROM command.
+	 * 
+	 * If you want to fill your table TEST with data from test.csv
+	 * make sure that this class in the classpath and that
+	 * GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC and
+	 * CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"
+	 * has been called in your database at some point.
+	
+	 *  * Then execute   
+	 * COPYFROM("TEST","test.csv",null)
+	 * 
+	 * if your not using , but | as a field separator
+	  COPYFROM("TEST","test.csv","fs=|")
+	
+	 * 
+	 * @param con - Connection is automatically handed over by HSQL
+	 * @param table - the name of the table that is to be filled
+	 * 				  if your table isn't found capital letters may be required
+	 * @param file - the filename of the CSV-file
+	 * @param options - you can specify options separated by ; 
+	 * which are described in the text table documentation e.g.
+	 * fs=| to use pipe instead of default comma as field separator or
+	 * or 
+	 * fs=|;vs=.;lvs=~" varchar separator, longvarchar separator
+	 * ignore_first=true; ignore first line
+	 * all_quoted=true or
+	 * encoding=UTF-8 if you don't have ASCII
+	 * @throws SQLException
+	 */
+	public static void copyFrom(
+		Connection con,
+		String table,
+		String file,
+		String options)
+		throws SQLException {
+		StringBuffer buf =
+			new StringBuffer("create text table TMP_SOURCE_" + table + " (");
+
+		ResultSet rs = con.getMetaData().getColumns(null, null, table, null);
+		String colname, coltype;
+		boolean tableFound = false;
+		while (rs.next()) {
+			tableFound = true;
+			colname = rs.getObject(4).toString();
+			coltype = rs.getObject(6).toString();
+			buf.append(colname + " " + coltype + ",");
+		}
+		rs.close();
+		if (!tableFound)
+			throw new IllegalArgumentException(
+				"Copy from failed - table " + table + " not found");
+		buf.deleteCharAt(buf.lastIndexOf(","));
+		buf.append("); SET TABLE TMP_SOURCE_" + table + " SOURCE \"" + file);
+		if (options != null)
+			buf.append(";" + options);
+		buf.append("\";");
+		buf.append(
+			"insert into " + table + " select * from TMP_SOURCE_" + table);
+		Statement stmt = con.createStatement();
+		try {
+			stmt.execute(buf.toString());
+		} finally {
+			stmt.execute("drop table TMP_SOURCE_" + table + " IF EXISTS");
+		}
+	}
+}
--- a/src/de/memtext/db/MemtextPool.java
+++ b/src/de/memtext/db/MemtextPool.java
@ -0,0 +1,262 @@
				@@ -0,0 +1,262 @@
+package de.memtext.db;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+import java.security.spec.InvalidKeySpecException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+import javax.xml.transform.TransformerConfigurationException;
+
+import org.apache.commons.dbcp.ConnectionFactory;
+import org.apache.commons.dbcp.DriverManagerConnectionFactory;
+import org.apache.commons.dbcp.PoolableConnectionFactory;
+import org.apache.commons.dbcp.PoolingDriver;
+import org.apache.commons.pool.impl.GenericObjectPool;
+
+import de.memtext.baseobjects.NamedObjectI;
+import de.memtext.tree.KeyParentEqualException;
+import de.memtext.util.DSAHandler;
+
+/**
+ * A new Connection pool making use of Jakarta Commons dbcp.
+ */
+public class MemtextPool extends GenericObjectPool implements NamedObjectI {
+
+    private String name, subpath;
+    private String nameNoAppendix;
+
+    private Properties props = new Properties();
+    private String privateKeyEncoded = null;
+    private String publicKeyEncoded = null;
+    private DSAHandler dsaHandler;
+
+    public MemtextPool(String name, String nameAppendix, String subpath)
+            throws SQLException, IOException, DBServletException {
+        this.subpath = subpath;
+        nameNoAppendix = name;
+        this.setName(name + nameAppendix);
+        try {
+            readPropertiesAndUrl();
+            System.out
+                    .print(" (" + props.getProperty("connectionURL") + ") ..");
+        } catch (Exception e) {
+            System.out
+                    .println("Konnte properties / Passwort nicht lesen. " + e);
+            e.printStackTrace();
+            throw new DBServletException(
+                    "Konnte properties / Passwort nicht lesen. " + e);
+        }
+        try {
+
+            Class.forName(props.getProperty("driverName"));
+        } catch (ClassNotFoundException e1) {
+            throw new DBServletException("Treiber "
+                    + props.getProperty("driverName")
+                    + " nicht gefunden. Ggfs. nach tomcat/common/lib kopieren.");
+        }
+
+        initLogging();
+        this.setTestOnBorrow(true);
+
+        int minIdle = 5;
+        if (props.getProperty("minIdle") != null
+                && !props.getProperty("minIdle").trim().equals("")) {
+            minIdle = Integer.parseInt(props.getProperty("minIdle"));
+        }
+        this.setMinIdle(minIdle);
+        int maxIdle = -1;
+        if (props.getProperty("maxIdle") != null
+                && !props.getProperty("maxIdle").trim().equals("")) {
+            maxIdle = Integer.parseInt(props.getProperty("maxIdle"));
+        }
+        if (maxIdle != -1)
+            setMaxIdle(maxIdle);
+
+        int maxActive = -1;
+        if (props.getProperty("maxActive") != null
+                && !props.getProperty("maxActive").trim().equals("")) {
+            maxActive = Integer.parseInt(props.getProperty("maxActive"));
+        }
+        if (maxActive != -1)
+            setMaxActive(maxActive);
+
+        ConnectionFactory connectionFactory = new DriverManagerConnectionFactory(
+                props.getProperty("connectionURL"), props);
+        PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory(
+                connectionFactory, this, null, "select count(*) from xdummy;" //validationQuery
+                , false, true);
+        int i = 1;
+        try {
+            //        PoolingDriver driver = new PoolingDriver();
+            Class.forName("org.apache.commons.dbcp.PoolingDriver");
+        } catch (ClassNotFoundException e2) {
+            throw new DBServletException(
+                    "ConnectionPool Klasse org.apache.commons.dbcp.PoolingDriver nicht gefunden.\ncommons-dbcp nach tomcat/common/lib stellen.");
+        }
+        PoolingDriver driver = (PoolingDriver) DriverManager
+                .getDriver("jdbc:apache:commons:dbcp:");
+
+        driver.registerPool(this.getName(), this);
+
+        Object x = driver.getConnectionPool(this.getName());
+        try {
+            Connection con = this.getConnection();
+            Statement st = con.createStatement();
+            ResultSet rs = st
+                    .executeQuery("select value from properties where name='privatekey'");
+            while (rs.next()) {
+                privateKeyEncoded = rs.getString(1);
+            }
+            rs.close();
+            rs = st
+                    .executeQuery("select value from properties where name='publickey'");
+            while (rs.next()) {
+                publicKeyEncoded = rs.getString(1);
+            }
+            rs.close();
+            st.close();
+            con.close();
+           
+        } catch (SQLException e) {
+            String msg = "Fehler beim Aufbau des ConnectionPools ";
+            if (!getName().startsWith("default"))
+                msg += " für Mandant: " + getName();
+            msg += "\nKonnte keine Connection aus dem Pool holen.\n" + e;
+
+            throw new SQLException(msg);
+        }
+        if (privateKeyEncoded != null)
+            initDSAHandler();
+    }
+
+    protected void initLogging() throws IOException {
+        /*
+         * LogUtils.initRawFile("superx_" + getName(), getLogDir() + "/superx_" +
+         * name + ".log", 2000, 1, false, true); LogUtils.initRawFile("superx_" +
+         * getName() + "_xml", getLogDir() + "/superx_" + name + "_xml.log",
+         * 2000, 1, false, true);
+         * 
+         * Level lev = Level.SEVERE;
+         * 
+         * try { if (props.getProperty("logLevelSQL") != null) lev =
+         * Level.parse(props.getProperty("logLevelSQL")); } catch
+         * (IllegalArgumentException e) { String msg = "Ungültiger Level für
+         * sqlLogger "; if (!this.getName().equals("default")) msg += "(Mandant :" +
+         * getName() + ") "; msg += " :" + props.getProperty("logLevelSQL");
+         * System.out.println(msg); } Logger.getLogger("superx_" +
+         * getName()).setLevel(lev); lev = Level.SEVERE;
+         * 
+         * try { if (props.getProperty("logLevelXML") != null) lev =
+         * Level.parse(props.getProperty("logLevelXML")); } catch
+         * (IllegalArgumentException e) { String msg = "Ungültiger Level für
+         * XMLLogger "; if (!this.getName().equals("default")) msg += "(Mandant :" +
+         * getName() + ") "; msg += " :" + props.getProperty("logLevelXML");
+         * System.out.println(msg); } Logger.getLogger("superx_" + getName() +
+         * "_xml").setLevel(lev);
+         */
+    }
+
+    public static String getLogDir() {
+        String tomcat_home = System.getProperty("catalina.home"); //tomcat 4
+        // and 5
+        if (tomcat_home == null)
+            tomcat_home = System.getProperty("tomcat.home"); //tomcat 3.x
+        if (tomcat_home == null)
+            tomcat_home = "/home/superx/webserver/tomcat";
+
+        return tomcat_home + "/logs";
+
+    }
+
+    public Properties getProperties() {
+        return props;
+    }
+
+    private void readPropertiesAndUrl() throws Exception {
+        String propname = "db_" + nameNoAppendix + ".properties";
+        if (nameNoAppendix.equals("default"))
+            propname = "db.properties";
+
+        java.net.URL url = MemtextPool.class.getProtectionDomain()
+                .getCodeSource().getLocation();
+        File myJar = new File(url.getFile());
+        File myPath = new File(myJar.getParent());
+        String pfad = myPath.getParent() + System.getProperty("file.separator");
+        if (subpath != null)
+            pfad += subpath + System.getProperty("file.separator");
+        props = PropsReader.prepareProps(new File(pfad + propname));
+        int i = 1;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void close() throws SQLException {
+        PoolingDriver driver = (PoolingDriver) DriverManager
+                .getDriver("jdbc:apache:commons:dbcp:");
+        driver.closePool(this.getName());
+
+    }
+
+    public Connection getConnection() throws SQLException {
+        return DriverManager.getConnection("jdbc:apache:commons:dbcp:"
+                + this.getName());
+
+    }
+
+    public void init() throws TransformerConfigurationException,
+            KeyParentEqualException, SQLException, DBServletException {
+    }
+
+    public void clearLogFiles() throws IOException {
+    }
+
+    private void initDSAHandler() throws DBServletException {
+        //privateKey wird ggfs. im Konstruktur bei Connection-Test, public key
+        // aus properties eingelesen
+        if (privateKeyEncoded == null)
+            throw new IllegalStateException(
+                    "privatekey war null - properties-table auf Eintrag überprüfen");
+        if (publicKeyEncoded == null)
+            throw new IllegalStateException(
+                    "publickey war null - properties-table prüfen");
+        try {
+            dsaHandler = new DSAHandler(privateKeyEncoded, publicKeyEncoded);
+        } catch (Exception e) {
+            throw new DBServletException(e.toString());
+        }
+    }
+
+    public boolean hasDSAHandler() {
+        return dsaHandler != null;
+    }
+
+    public boolean verifiy(String data, String signature)
+            throws InvalidKeyException, NoSuchAlgorithmException,
+            InvalidKeySpecException, SignatureException {
+        if (dsaHandler == null)
+            throw new IllegalStateException(
+                    "DSAHandler ist null, public und private key definition prüfen");
+        return dsaHandler.verify(data, signature);
+
+    }
+
+    public String getPrivateKey() {
+        return privateKeyEncoded;
+    }
+}
+
+//Created on 04.11.2004 at 20:18:11 as SxPool
--- a/src/de/memtext/db/MemtextPools.java
+++ b/src/de/memtext/db/MemtextPools.java
@ -0,0 +1,197 @@
				@@ -0,0 +1,197 @@
+package de.memtext.db;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Iterator;
+
+import javax.xml.transform.TransformerConfigurationException;
+
+import org.apache.commons.dbcp.PoolingDriver;
+
+import de.memtext.baseobjects.coll.NamedObjectSet;
+import de.memtext.tree.KeyParentEqualException;
+
+
+public class MemtextPools extends NamedObjectSet {
+
+    private  NamedObjectSet pools = new NamedObjectSet();
+
+    public MemtextPools() {
+        super();
+    }
+
+    public  synchronized Connection getConnection(String poolname)
+            throws SQLException {
+        if (pools.size() == 0)
+            throw new IllegalStateException("Kein ConnectionPool gefunden.");
+        if (!pools.containsItemWithName(poolname))
+            throw new SQLException("Kein ConnectionPool für Mandant:"
+                    + poolname + " gefunden");
+        String pooldrv = "jdbc:apache:commons:dbcp:" + poolname;
+        if (DriverManager.getDriver(pooldrv) == null) {
+            String msg = "Kein ConnectionPool gefunden ";
+            if (!poolname.equals("default"))
+                msg += " für Mandant " + poolname;
+            throw new SQLException(msg);
+        }
+        return DriverManager.getConnection(pooldrv);
+    }
+
+    public  MemtextPool get(String poolname) {
+        if (!pools.containsItemWithName(poolname))
+            throw new IllegalStateException("Kein ConnectionPool (" + poolname
+                    + ") vorhanden");
+        return (MemtextPool) pools.getByName(poolname);
+    }
+
+ /*    void initDefaultOnly() throws SQLException, IOException,
+            DBServletException {
+        pools.add(new MemtextPool("default"));
+    }
+*/
+    /**
+     * wenn mehrfach benutzt wird (ConnectionPools für SuperX und Joolap)
+     * mind ein sollte namensappendix haben, damit unterscheidbar -
+     * sonst wird z.B. Pool für joolap "default" von später erzeugten Pool für superx "default"
+     * überschrieben!
+     */
+    public  void init(String subpath,Class poolclass, String nameAppendix) throws SQLException, IOException,
+            DBServletException {
+        if (nameAppendix==null) nameAppendix="";
+        Class[] params = new Class[2];
+        params[0] = String.class;
+        params[1] = String.class;
+        Constructor constructor;
+        try {
+            constructor = poolclass.getConstructor(params);
+
+            String db_extfile = "mandanten.cfg";
+            if (db_extfile.indexOf(File.separator) == -1) {
+                java.net.URL url = MemtextPools.class.getProtectionDomain()
+                        .getCodeSource().getLocation();
+                File myJar = new File(url.getFile());
+                File myPath = new File(myJar.getParent());
+                String pfad = myPath.getParent();
+                if (subpath!=null) pfad+=File.separator+subpath;
+                db_extfile = pfad + File.separator+db_extfile; ;
+               
+                    
+            }
+            File f = new File(db_extfile);
+            if (!f.exists()) {
+                //einfach nur normale db.properties (default)
+                System.out.print("Aufbau Datenbank-ConnectionPool");
+                Object[] args = new Object[2];
+                args[0] = "default";//Appendix hängt JoolapPool an
+                args[1] = subpath;
+                MemtextPool connectionPool = (MemtextPool) constructor.newInstance(args);
+                System.out.println(" OK");
+                System.out.println("           public/private key "+(connectionPool.hasDSAHandler()?" aktiv ":" nicht aktiv"));
+                
+                pools.add(connectionPool);
+            } else { //mehrereMandanten
+                FileReader fr = new FileReader(f);
+                BufferedReader bfr = new BufferedReader(fr);
+                String line;
+                while ((line = bfr.readLine()) != null) {
+                    System.out.print("Aufbau Datenbank-ConnectionPool für "
+                            + line);
+                    Object[] args = new Object[2];
+                    args[0] = line;//Appendix hängt JoolapPool an
+                    args[1] = subpath;
+                    MemtextPool connectionPool = (MemtextPool) constructor.newInstance(args);
+                    System.out.println("OK");
+                    System.out.println("           public/private key"+(connectionPool.hasDSAHandler()?" aktiv ":" nicht aktiv"));
+                    
+                    pools.add(connectionPool);
+                }
+                bfr.close();
+                fr.close();
+            }
+        } catch (SecurityException e) {
+            e.printStackTrace();
+            throw new DBServletException(e.toString());
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+            throw new DBServletException(e.toString());
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+            throw new DBServletException(e.toString());
+        } catch (InstantiationException e) {
+            e.printStackTrace();
+            throw new DBServletException(e.toString());
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+            throw new DBServletException(e.toString());
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+            throw new DBServletException(e.toString());
+        }
+    }
+
+    /**
+     * Destroys all ConnectionPools
+     * 
+     * @throws Exception
+     */
+    public  void closeAll() throws Exception {
+        for (Iterator it = pools.iterator(); it.hasNext();) {
+            MemtextPool pool = (MemtextPool) it.next();
+            pool.close();
+        }
+
+    }
+
+    public  void main(String args[]) {
+        try {
+            init("xx",MemtextPool.class, null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        int i = 1;
+    }
+
+    public  void invalidate(String poolname, Connection con)
+            throws DBServletException {
+        if (!pools.containsItemWithName(poolname))
+            throw new DBServletException(
+                    "Kann Connection nicht invalidieren - kein ConnectionPool "
+                            + poolname + " gefunden.");
+        try {
+            PoolingDriver driver = (PoolingDriver) DriverManager
+                    .getDriver("jdbc:apache:commons:dbcp:");
+
+            //driver.invalidateConnection(con);
+            driver.getConnectionPool(poolname).invalidateObject(con);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new DBServletException("Invalidating connection failed -" + e);
+        }
+
+    }
+
+    public  void resetAllPools()
+            throws TransformerConfigurationException, KeyParentEqualException,
+            SQLException, DBServletException {
+        for (Iterator it = pools.iterator(); it.hasNext();) {
+            MemtextPool aPool = (MemtextPool) it.next();
+            aPool.init();
+        }
+    }
+
+    public  void clearLogFiles() throws IOException {
+        for (Iterator it = pools.iterator(); it.hasNext();) {
+            MemtextPool aPool = (MemtextPool) it.next();
+            aPool.clearLogFiles();
+        }
+    }
+}
+
+//Created on 04.11.2004 at 20:18:11 als SxPools
--- a/src/de/memtext/db/NichtAngemeldetException.java
+++ b/src/de/memtext/db/NichtAngemeldetException.java
@ -1,23 +1,22 @@
				@@ -1,23 +1,22 @@
-package de.memtext.db;
-
-public class NichtAngemeldetException extends Exception {
-
-    public NichtAngemeldetException() {
-        super();
-    }
-
-    public NichtAngemeldetException(String message) {
-        super(message);
-    }
-
-    public NichtAngemeldetException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public NichtAngemeldetException(Throwable cause) {
-        super(cause);
-    }
-
-}
-
+package de.memtext.db;
+public class NichtAngemeldetException extends Exception {
+
+    public NichtAngemeldetException() {
+        super();
+    }
+
+    public NichtAngemeldetException(String message) {
+        super(message);
+    }
+
+    public NichtAngemeldetException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public NichtAngemeldetException(Throwable cause) {
+        super(cause);
+    }
+
+}
+
 //Created on 05.10.2004 at 13:12:23
--- a/src/de/memtext/db/ProcedureSql.java
+++ b/src/de/memtext/db/ProcedureSql.java
@ -1,100 +1,101 @@
				@@ -1,100 +1,101 @@
-package de.memtext.db;
-
-import de.memtext.util.StringUtils;
-
-/**
- * Hilfsklasse zum Erstellen von Prozeduraufrüfen für verschd. 
- * Datenbanken.
- * Wird mit DB Object erstellt, z.B. ProcedureSql(DB.INFORMIX)
- * dann setName()
- * dann beliebig oft addParam(),oder addDateParam()
- * Falls nach Aufruf der Prozedur ein select notwendig ist, 
- * reinsetzen mit setFinalSelect()
- * zum Schluss. getFinishedCall für fertigen Datenbankspezifischen
- * Prozeduraufruf 
- */
-public class ProcedureSql {
-
-    private DB dbsystem;
-
-    private boolean isAddPossible = true, isNameSet, isFinished;
-
-    private String finalSelect = "";
-
-    private StringBuffer result = new StringBuffer();
-
-    public ProcedureSql(DB db) {
-        this.dbsystem = db;
-        if (dbsystem.equals(DB.INFORMIX)) result.append("execute procedure ");
-        if (dbsystem.equals(DB.POSTGRES)) result.append("select ");
-
-    }
-
-    public ProcedureSql(DB dbsystem, String procname) {
-        this(dbsystem);
-        result.append(procname + ("("));
-        isNameSet = true;
-    }
-
-    public void setName(String procName) {
-        if (isNameSet) throw new IllegalStateException("Name wurde schon gesetzt");
-        result.append(procName + ("("));
-        isNameSet = true;
-    }
-
-    public void addParam(String param) {
-        if (!isAddPossible) throw new IllegalStateException("kann keine Parameter hinzufügen, vielleicht wurde getFinishedCall schon aufgerufen");
-        result.append(param + ",");
-    }
-
-    public void addDateParam(String param) {
-        if (!isAddPossible) throw new IllegalStateException("kann keine Parameter hinzufügen, vielleicht wurde getFinishedCall schon aufgerufen");
-
-        if (dbsystem.equals(DB.INFORMIX)) result.append("date");
-        if (dbsystem.equals(DB.POSTGRES)) result.append("date_val");
-        result.append("('" + param + "'),");
-    }
-
-    public void setFinalSelect(String sel) {
-        finalSelect = sel;
-    }
-
-    public String getFinishedCall() {
-        if (!isFinished) finish();
-        return result.toString();
-    }
-
-    private void finish() {
-        addClosingBracket();
-        result.append(finalSelect);
-        isAddPossible = false;
-        isFinished = true;
-    }
-
-    private void addClosingBracket() {
-        char lc = result.charAt(result.length() - 1);// StringUtils.getLastChar(result);
-        if (lc == ',') StringUtils.deleteLastChar(result);
-        result.append(");");
-    }
-
-    public void addParam(Integer integer) {
-        addParam(integer.toString());
-    }
-
-    public void addParam(int in) {
-        addParam(Integer.valueOf(in).toString());
-    }
-
-    public void addParam(Object param) {
-        addParam(param.toString());
-    }
-
-    public static void main(String args[]) {
-        ProcedureSql p = new ProcedureSql(DB.POSTGRES, "test");
-        p.addParam(23);
-        System.out.println(p.getFinishedCall());
-    }
-}
-
-
+package de.memtext.db;
+
+import de.memtext.util.StringUtils;
+/**
+ * Hilfsklasse zum Erstellen von Prozeduraufrüfen für verschd. 
+ * Datenbanken.
+ * Wird mit DB Object erstellt, z.B. ProcedureSql(DB.INFORMIX)
+ * dann setName()
+ * dann beliebig oft addParam(),oder addDateParam()
+ * Falls nach Aufruf der Prozedur ein select notwendig ist, 
+ * reinsetzen mit setFinalSelect()
+ * zum Schluss. getFinishedCall für fertigen Datenbankspezifischen
+ * Prozeduraufruf 
+ */
+public class ProcedureSql {
+
+	private DB dbsystem;
+	private boolean isAddPossible = true,isNameSet, isFinished;
+	private String finalSelect = "";
+
+	private StringBuffer result = new StringBuffer();
+
+	public ProcedureSql(DB db) {
+		this.dbsystem = db;
+		if (dbsystem.equals(DB.INFORMIX))
+			result.append("execute procedure ");
+		if (dbsystem.equals(DB.POSTGRES))
+			result.append("select ");
+
+	}
+
+	public ProcedureSql(DB dbsystem, String procname) {
+		this(dbsystem);
+		result.append(procname + ("("));
+		isNameSet=true;
+	}
+	public void setName(String procName) {
+		if (isNameSet)throw new IllegalStateException("Name wurde schon gesetzt");
+		result.append(procName+("("));
+		isNameSet=true;
+	}
+	public void addParam(String param) {
+		if (!isAddPossible)
+			throw new IllegalStateException("kann keine Parameter hinzufügen, vielleicht wurde getFinishedCall schon aufgerufen");
+		result.append(param + ",");
+	}
+	public void addDateParam(String param) {
+		if (!isAddPossible)
+			throw new IllegalStateException("kann keine Parameter hinzufügen, vielleicht wurde getFinishedCall schon aufgerufen");
+
+		if (dbsystem.equals(DB.INFORMIX))
+			result.append("date");
+		if (dbsystem.equals(DB.POSTGRES))
+			result.append("date_val");
+		result.append("('" + param + "'),");
+	}
+	public void setFinalSelect(String sel) {
+		finalSelect = sel;
+	}
+
+	public String getFinishedCall() {
+		if (!isFinished)
+			finish();
+		return result.toString();
+	}
+
+	private void finish() {
+		addClosingBracket();
+		result.append(finalSelect);
+		isAddPossible = false;
+		isFinished = true;
+	}
+
+	private void addClosingBracket() {
+		char lc=result.charAt(result.length()-1);// StringUtils.getLastChar(result);
+		if (lc==',')
+			StringUtils.deleteLastChar(result);
+		result.append(");");
+	}
+
+	public void addParam(Integer integer) {
+		addParam(integer.toString());
+	}
+
+	public void addParam(int in) {
+		addParam(new Integer(in).toString());
+	}
+
+	public void addParam(Object param) {
+		addParam(param.toString());
+	}
+
+	public static void main(String args[]) {
+		ProcedureSql p=new ProcedureSql(DB.POSTGRES,"test");
+		p.addParam(23);
+		System.out.println(p.getFinishedCall());
+	}
+}
+
+
 //Created on 03.12.2003 at 15:56:43
--- a/src/de/memtext/db/PropDescriptor.java
+++ b/src/de/memtext/db/PropDescriptor.java
@ -1,78 +1,72 @@
				@@ -1,78 +1,72 @@
-package de.memtext.db;
-
-import de.memtext.baseobjects.NamedIdObject;
-
-/**
- * Beschreibt eine (zusätzliche) in der Datenbank hinterlegt Eigenschaft.
- * (z.B. Accident meister)
- */
-public class PropDescriptor extends NamedIdObject {
-    //wie heißt die Spalte in der DB
-    private String colname;
-
-    //bei Combobox sql für quelle select key,name from xx
-    private String quelle;
-
-    //soll auf dem Bildschirm sichtbar sein
-    private boolean isVisible;
-
-    private String defaultkey;
-
-    private int sortnr;
-
-
-    public PropDescriptor() {
-
-    }
-
-    public PropDescriptor(Object id, String name) {
-        super(id, name);
-    }
-
-    public String getColname() {
-        return colname;
-    }
-
-    public void setColname(String colname) {
-        this.colname = colname;
-    }
-
-    public String getDefaultkey() {
-        return defaultkey;
-    }
-
-    public void setDefaultkey(String defaultkey) {
-        this.defaultkey = defaultkey;
-    }
-
-    public boolean isVisible() {
-        return isVisible;
-    }
-
-    public void setVisible(boolean isVisible) {
-        this.isVisible = isVisible;
-    }
-
-    public String getQuelle() {
-        return quelle;
-    }
-
-    public void setQuelle(String quelle) {
-        this.quelle = quelle;
-    }
-
-    public int getSortnr() {
-        return sortnr;
-    }
-
-    public void setSortnr(int sortnr) {
-        this.sortnr = sortnr;
-    }
-
-    @Override
-    public String toString() {
-        return getName();
-    }
-}
-
-//Created on 17.05.2005 at 10:17:03
+package de.memtext.db;
+
+import de.memtext.baseobjects.NamedIdObject;
+/**
+ * Beschreibt eine (zusätzliche) in der Datenbank hinterlegt Eigenschaft.
+ * (z.B. Accident meister)
+ */
+public class PropDescriptor extends NamedIdObject {
+//wie heißt die Spalte in der DB
+    private String colname;
+    //bei Combobox sql für quelle select key,name from xx
+    private String quelle;
+    //soll auf dem Bildschirm sichtbar sein
+    private boolean isVisible;
+    
+    private String defaultkey;
+    private int sortnr;
+   
+
+    public PropDescriptor() {
+
+    }
+
+    public PropDescriptor(Object id, String name) {
+        super(id,name);
+    }
+
+    public String getColname() {
+        return colname;
+    }
+
+    public void setColname(String colname) {
+        this.colname = colname;
+    }
+
+    public String getDefaultkey() {
+        return defaultkey;
+    }
+
+    public void setDefaultkey(String defaultkey) {
+        this.defaultkey = defaultkey;
+    }
+
+    public boolean isVisible() {
+        return isVisible;
+    }
+
+    public void setVisible(boolean isVisible) {
+        this.isVisible = isVisible;
+    }
+
+    public String getQuelle() {
+        return quelle;
+    }
+
+    public void setQuelle(String quelle) {
+        this.quelle = quelle;
+    }
+   
+    public int getSortnr() {
+        return sortnr;
+    }
+    public void setSortnr(int sortnr) {
+        this.sortnr = sortnr;
+    }
+    public String toString()
+    {
+        return getName();
+    }
+}
+
+//Created on 17.05.2005 at 10:17:03
--- a/src/de/memtext/db/PropsReader.java
+++ b/src/de/memtext/db/PropsReader.java
@ -1,58 +1,88 @@
				@@ -1,58 +1,88 @@
-package de.memtext.db;
-
-import static de.superx.servlet.SxSQL_Server.DEFAULT_MANDANTEN_ID;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import de.memtext.util.CryptUtils;
-
-public class PropsReader {
-    private static byte key[] = { (byte) 255, (byte) 221, (byte) 127, (byte) 109, (byte) 129 };
-
-    /*
-     * 
-     * 28.10.08 EInfache Verschlüsselungsmethode wird nicht mehr unterstützt
-     */
-    public static String check(String mandantenID, String d) throws Exception {
-        String result = "";
-        if (d.startsWith("sx_des")) {
-            result = CryptUtils.decryptStringDES(d.substring(6));
-        } else {
-            result = d;
-        }
-        return result;
-    }
-
-    public static Properties prepareProps(File propfile) throws IOException, FileNotFoundException, Exception {
-        Properties props = new Properties();
-        if (!propfile.exists()) {
-            throw new IOException("Datei nicht gefunden: " + propfile);
-        }
-        InputStream is = new FileInputStream(propfile);
-        props.load(is);
-        is.close();
-        String mandantenID = props.getProperty("MandantenID");
-        if (mandantenID == null) mandantenID = DEFAULT_MANDANTEN_ID;
-        props.put("user", props.getProperty("connectionName"));
-        props.put("password", check(mandantenID, props.getProperty("connectionPassword")));
-
-        if (props.getProperty("driverName").indexOf("postgres") > -1) {
-            props.put("charSet", "Latin-1");
-            props.put("DateStyle", "German, DMY");
-        }
-        if (props.getProperty("driverName").indexOf("informix") > -1)
-
-        {
-            props.put("GL_DATETIME", "%d.%m.%Y %T");
-            props.put("CLIENT_LOCALE", "de_de.8859-1");
-        }
-        return props;
-    }
-}
-
-//Created on 27.04.2005 at 09:07:18
+package de.memtext.db;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import de.memtext.util.CryptUtils;
+
+public class PropsReader {
+    private static byte key[] = { (byte) 255, (byte) 221, (byte) 127,
+            (byte) 109, (byte) 129 };
+    private static int keyLength = key.length;
+/*
+ * 
+ * 28.10.08 EInfache Verschlüsselungsmethode wird nicht mehr unterstützt
+ */
+    public static String check(String mandantenID, String d) throws Exception {
+        String result = "";
+       // Logger.getLogger("superx_" + mandantenID).log(Level.FINEST,
+         //       "Verschlüsseltes Passwort " + d);
+        if (d.startsWith("sx_des")) {
+            result = CryptUtils.decryptStringDES(d.substring(6));
+        } 
+        else {
+        	result=d;
+          /*  try {
+                byte[] tmp;
+                tmp = d.getBytes();
+
+                int size = (byte) (tmp[0] ^ key[0 % keyLength]);
+                int index = (byte) (tmp[1] ^ key[1 % keyLength]);
+                byte de[] = new byte[size];
+
+                for (int i = index; i < (size + index); i++) {
+                    de[i - index] = (byte) (tmp[i] ^ key[i % keyLength]);
+                }
+                result = new String(de);
+            } catch (Exception e) {
+                throw new DBServletException(
+                        "Konnte Passwort nicht entschlüsseln (altes Verfahren). Bitte mit propadmin.x prüfen.\n"
+                                + e);
+            }*/
+        }
+        return result;
+    }
+
+    public static Properties prepareProps(File propfile) throws IOException,
+            FileNotFoundException, Exception {
+        Properties props = new Properties();
+        if (!propfile.exists()) {
+            throw new IOException("Datei nicht gefunden: " + propfile);
+        }
+        InputStream is = new FileInputStream(propfile);
+
+        if (is != null) {
+            props.load(is);
+            is.close();
+        } else {
+            throw new IOException("cannot open " + propfile);
+        }
+        String mandantenID = props.getProperty("MandantenID");
+        if (mandantenID == null)
+            mandantenID = "default";
+        props.put("user", props.getProperty("connectionName"));
+        props.put("password", check(mandantenID, props
+                .getProperty("connectionPassword")));
+
+        if (props.getProperty("driverName").indexOf("postgres") > -1) {
+            props.put("charSet", "Latin-1");
+            props.put("DateStyle", "German, DMY");
+            // props.put("DateStyle", "ISO, DMY");
+        }
+        if (props.getProperty("driverName").indexOf("informix") > -1)
+
+        {
+            props.put("GL_DATETIME", "%d.%m.%Y %T");
+            props.put("CLIENT_LOCALE", "de_de.8859-1");
+        }
+        return props;
+    }
+}
+
+//Created on 27.04.2005 at 09:07:18
--- a/src/de/memtext/db/RestrictionCollector.java
+++ b/src/de/memtext/db/RestrictionCollector.java
@ -1,97 +1,90 @@
				@@ -1,97 +1,90 @@
-package de.memtext.db;
-
-/**
- * collects restrictions for sql-clauses, manages where and 
- * and what to delete
- * take care of inital where yourself
- */
-public class RestrictionCollector {
-    private StringBuffer restrict = new StringBuffer();
-
-    private int count = 0;
-
-    public RestrictionCollector() {
-    }
-
-    public RestrictionCollector(String restriction) {
-        restrict.append(restriction);
-        count = 1;
-
-    }
-
-    public boolean isSomethingAdded() {
-        return count > 0;
-    }
-
-    public void addAndRestriction(StringBuffer restriction) {
-        addAndRestriction(restriction.toString());
-    }
-
-    public void addAndRestriction(String restriction) {
-        if (restriction == null || restriction.length() < 3) throw new IllegalArgumentException("Not OK:" + restriction);
-        boolean isNewlineAtStart = restriction.startsWith("\n");
-        restriction = restriction.trim();
-        if (isNewlineAtStart) restriction = "\n" + restriction;
-        if (restriction.substring(0, 3).equalsIgnoreCase("and")) restriction = restriction.substring(3);
-        if (count > 0)
-            restrict.append(" and " + restriction + " ");
-        else
-            restrict.append(restriction + " ");
-        count++;
-    }
-
-    public void addOrRestriction(StringBuffer restriction) {
-        addOrRestriction(restriction.toString());
-    }
-
-    public void addOrRestriction(String restriction) {
-        if (restriction == null || restriction.length() < 3) throw new IllegalArgumentException("Not OK:" + restriction);
-
-        restriction = restriction.trim();
-        if (restriction.substring(0, 3).equalsIgnoreCase("or ")) restriction = restriction.substring(3);
-
-        if (count > 0)
-            restrict.append(" or " + restriction + " ");
-        else
-            restrict.append(restriction + " ");
-        count++;
-    }
-
-    public void addOrRestriction(RestrictionCollector collector) {
-        addOrRestriction(collector.toString());
-    }
-
-    @Override
-    public String toString() {
-        if (count > 0)
-            return restrict.toString();
-        else
-            return "";
-    }
-
-    public String toStringInclusiveWhere() {
-        if (count > 0)
-            return " where " + restrict;
-        else
-            return "";
-    }
-
-    public int getArgumentCount() {
-        return count;
-    }
-
-    public void addAndRestriction(RestrictionCollector collector) {
-        if (collector.getArgumentCount() > 1)
-            addAndRestriction(collector.toString());
-        else
-            addAndRestriction(collector.toString());
-    }
-
-    public static void main(String[] args) {
-        RestrictionCollector r = new RestrictionCollector();
-        r.addAndRestriction("   AND 1=1");
-        r.addAndRestriction("2=2");
-        System.out.println(r);
-    }
-}
+package de.memtext.db;
+/**
+ * collects restrictions for sql-clauses, manages where and 
+ * and what to delete
+ * take care of inital where yourself
+ */
+public class RestrictionCollector {
+	private StringBuffer restrict = new StringBuffer();
+	
+	private int count=0;
+	public RestrictionCollector() {
+	}
+	public RestrictionCollector(String restriction) {
+		restrict.append(restriction);
+		count = 1;
+
+	}
+	public boolean isSomethingAdded()
+	{
+		return count>0;
+	}
+	public void addAndRestriction(StringBuffer restriction) {
+		addAndRestriction(restriction.toString());
+	}
+	public void addAndRestriction(String restriction) {
+		if (restriction==null||restriction.length()<3)
+		throw new IllegalArgumentException("Not OK:"+restriction);
+		boolean isNewlineAtStart=restriction.startsWith("\n");
+		restriction = restriction.trim();
+		if (isNewlineAtStart) restriction="\n"+restriction;
+		if (restriction.substring(0, 3).equalsIgnoreCase("and"))
+			restriction = restriction.substring(3);
+		if (count>0)
+			restrict.append(" and " + restriction + " ");
+		else
+			restrict.append(restriction + " ");
+		count++;
+	}
+
+	public void addOrRestriction(StringBuffer restriction) {
+		addOrRestriction(restriction.toString());
+	}
+	public void addOrRestriction(String restriction) {
+		if (restriction==null||restriction.length()<3)
+			throw new IllegalArgumentException("Not OK:"+restriction);
+	
+		restriction = restriction.trim();
+		if (restriction.substring(0, 3).equalsIgnoreCase("or "))
+			restriction = restriction.substring(3);
+		
+		if (count>0)
+			restrict.append(" or " + restriction + " ");
+		else
+			restrict.append(restriction + " ");
+		count++;
+	}
+	public void addOrRestriction(RestrictionCollector collector) {
+		addOrRestriction(collector.toString());
+	}
+	public String toString() {
+		if (count>0)
+			return restrict.toString();
+		else
+			return "";
+	}
+	public String toStringInclusiveWhere()
+	{
+		if (count>0)
+		return " where "+restrict;
+		else
+		return "";
+	}
+	public int getArgumentCount()
+	{
+		return count;
+	}
+	public void addAndRestriction(RestrictionCollector collector) {
+		if (collector.getArgumentCount()>1)
+		addAndRestriction( collector.toString());
+		else
+		addAndRestriction( collector.toString() );
+	}
+	public static void main(String[] args) {
+		RestrictionCollector r = new RestrictionCollector();
+		r.addAndRestriction("   AND 1=1");
+		r.addAndRestriction("2=2");
+		System.out.println(r);
+	}
+}
 // Created on 23.07.2003
--- a/src/de/memtext/db/SampleApp.java
+++ b/src/de/memtext/db/SampleApp.java
@ -1,121 +1,124 @@
				@@ -1,121 +1,124 @@
-/*
- * Copyright (c) 2001-2004, The HSQL Development Group All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * 
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 
- * Neither the name of the HSQL Development Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package de.memtext.db;
-
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-
-public class SampleApp extends JFrame {
-    private Connection con = null;
-
-    private String path = ""; // null , "" or "." for current directory
-
-    private String dbname = "testing";
-
-    public SampleApp() throws ClassNotFoundException, SQLException, IOException {
-        super("SampleApp");
-        initDb();
-
-        JLabel lbl = new JLabel("got a connection to " + con.getMetaData().getURL());
-        this.getContentPane().add(lbl);
-        this.setSize(600, 400);
-
-        addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent we) {
-                try {
-                    String url = con.getMetaData().getURL();
-                    Statement stmt = con.createStatement();
-                    stmt.execute("shutdown");
-                    stmt.close();
-                    con.close();
-                    //delete all temporary files that may exists
-                    HsqlStandaloneMgr.deleteTmpFiles(url, path, dbname);
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                System.exit(0);
-            }
-        });
-
-    }
-
-    private void initDb() throws ClassNotFoundException, SQLException, IOException {
-
-        if (!HsqlStandaloneMgr.isDatabaseOpen(path, dbname)) {
-            //if the database isn't open yet, we just open a regular connection
-            //the system username is written to a special properties file
-            con = HsqlStandaloneMgr.getConnection(path, dbname, "sa", "");
-            Statement stmt = con.createStatement();
-            stmt.execute("drop table test if exists;create table test( col1 integer);insert into test values(1);checkpoint;");
-            stmt.close();
-        } else
-        // the database is already open
-        {
-            //you can decide if the temporary copy should be read-only mode
-            //if not, all changes to the database will be lost after closing
-            // the connection
-            boolean isReadOnlyModeWanted = true;
-            int result = HsqlStandaloneMgr.askUser(this, path, dbname, isReadOnlyModeWanted);
-            if (result == JOptionPane.YES_OPTION) {
-                con = HsqlStandaloneMgr.getTmpConnection(this, path, dbname, "sa", "", isReadOnlyModeWanted);
-            } else {
-                //              opening of temp. copy not wanted
-                System.exit(0);
-            }
-        }
-    }
-
-    public static void main(String args[]) {
-
-        try {
-            SampleApp app = new SampleApp();
-            app.show();
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-    }
-}
-
-//Created on 23.10.2004 at 12:10:38
+/*
+ * Copyright (c) 2001-2004, The HSQL Development Group All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the HSQL Development Group nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package de.memtext.db;
+
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+
+public class SampleApp extends JFrame {
+    private Connection con = null;
+    private String path = ""; // null , "" or "." for current directory
+    private String dbname = "testing";
+
+    public SampleApp() throws ClassNotFoundException, SQLException, IOException {
+        super("SampleApp");
+        initDb();
+
+        JLabel lbl = new JLabel("got a connection to "
+                + con.getMetaData().getURL());
+        this.getContentPane().add(lbl);
+        this.setSize(600, 400);
+        
+        addWindowListener(new WindowAdapter() {
+            public void windowClosing(WindowEvent we) {
+                try {
+                    String url=con.getMetaData().getURL();
+                   Statement stmt= con.createStatement();
+                    stmt.execute("shutdown");
+                    stmt.close();
+                    con.close();
+                    //delete all temporary files that may exists
+                    HsqlStandaloneMgr.deleteTmpFiles( url,path, dbname);
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+                System.exit(0);
+            }
+        });
+
+    }
+
+    private void initDb() throws ClassNotFoundException, SQLException,
+            IOException {
+      
+        if (!HsqlStandaloneMgr.isDatabaseOpen(path, dbname)) {
+            //if the database isn't open yet, we just open a regular connection
+            //the system username is written to a special properties file
+            con = HsqlStandaloneMgr.getConnection(path, dbname, "sa", "");
+            Statement stmt = con.createStatement();
+            stmt
+                    .execute("drop table test if exists;create table test( col1 integer);insert into test values(1);checkpoint;");
+            stmt.close();
+        } else
+        // the database is already open
+        {
+            //you can decide if the temporary copy should be read-only mode
+            //if not, all changes to the database will be lost after closing
+            // the connection
+            boolean isReadOnlyModeWanted = true;
+            int result = HsqlStandaloneMgr.askUser(this, path, dbname,
+                    isReadOnlyModeWanted);
+            if (result == JOptionPane.YES_OPTION) {
+                con = HsqlStandaloneMgr.getTmpConnection(this, path, dbname,
+                        "sa", "", isReadOnlyModeWanted);
+            } else 
+            {
+//              opening of temp. copy not wanted
+                System.exit(0);
+            }
+        }
+    }
+
+    public static void main(String args[]) {
+
+        try {
+            SampleApp app = new SampleApp();
+            app.show();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+}
+
+//Created on 23.10.2004 at 12:10:38
--- a/src/de/memtext/db/SchemaReader.java
+++ b/src/de/memtext/db/SchemaReader.java
@ -1,47 +1,48 @@
				@@ -1,47 +1,48 @@
-package de.memtext.db;
-
-import java.io.File;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.apache.commons.io.FileUtils;
-
-public class SchemaReader {
-
-    public static void main(String[] args) {
-        if (args.length != 1) {
-            System.out.println("SchemaReader db.properties");
-            System.exit(1);
-        }
-        try {
-            Connection con = ConnectionCreator.getConnectionCryptPassword(args[0], "driverName", "connectionURL", "connectionName", "connectionPassword");
-            DatabaseMetaData md = con.getMetaData();
-            ResultSet myTables = md.getTables(null, null, null, null);
-            StringBuffer result = new StringBuffer();
-            if (myTables != null) {
-                while (myTables.next()) {
-                    String tabname = myTables.getString(3);
-                    result.append("TABLE " + tabname + "\n");
-                    ResultSet cols = md.getColumns(null, null, tabname, null);
-                    while (cols.next()) {
-                        result.append(cols.getString(4) + ":" + cols.getObject(5) + "\n");
-                    }
-                    result.append("----\n");
-                }
-            }
-            FileUtils.writeStringToFile(new File("schema.txt"), result.toString());
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-}
-
-//Created on 21.02.2006 at 10:38:08
+package de.memtext.db;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import de.memtext.util.StringUtils;
+
+public class SchemaReader {
+
+    public static void main(String[] args) {
+        if (args.length != 1) {
+            System.out.println("SchemaReader db.properties");
+            System.exit(1);
+        }
+        try {
+            Connection con = ConnectionCreator.getConnectionCryptPassword(args[0],"driverName","connectionURL","connectionName","connectionPassword");
+            DatabaseMetaData md = con.getMetaData();
+            ResultSet myTables = md.getTables(null, null, null, null);
+            StringBuffer result = new StringBuffer();
+            if (myTables != null) {
+                while (myTables.next()) {
+                    String tabname = myTables.getString(3);
+                    result.append("TABLE " + tabname + "\n");
+                    ResultSet cols = md.getColumns(null, null, tabname, null);
+                    while (cols.next()) {
+                        result.append(cols.getString(4) + ":"
+                                + cols.getObject(5) + "\n");
+                    }
+                    result.append("----\n");
+                }
+            }
+            StringUtils.write(new File("schema.txt"),result.toString());
+            
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+}
+
+//Created on 21.02.2006 at 10:38:08
--- a/src/de/memtext/db/ValueRandomizer.java
+++ b/src/de/memtext/db/ValueRandomizer.java
@ -1,217 +1,266 @@
				@@ -1,217 +1,266 @@
-package de.memtext.db;
-
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Enumeration;
-import java.util.Random;
-import java.util.Vector;
-
-/**
- * Randomizes values in a database.
- * Reads all values of a given table column (select distinct x from..) and
- * multiplies all occurences of a single value (e.g. 150) with a factor between
- * minFactor and maxFactor (e.g. 150*1.1 -> all entries with 150 become 165)
- *
- * if boolean printOutOnly is true the update sql statements are only logged
- * to console, not performed
- * */
-public class ValueRandomizer {
-    //private static String driver = "org.hsqldb.jdbcDriver";
-    private static String driver = "org.postgresql.Driver";
-
-    //private static String dbUrl = "jdbc:hsqldb:hsql://localhost:9999";
-    private static String dbUrl = "jdbc:postgresql://localhost:5432/superx";
-
-    private static String username = "superx"; //"joolap";
-
-    private static String password = ""; //"loopja3000";
-
-    private static String tablename = "cob_busa";
-
-    private static String colname = "betrag"; //"value";
-
-    private static String datenart = "DOUBLE"; //or "INTEGER";
-
-    private static double minFactor = 0.6;
-
-    private static double maxFactor = 1.8;
-
-    private static boolean printOutOnly = false;
-
-    private static Statement stat;
-
-    private static Random r = new Random();
-
-    public static void main(String args[]) {
-
-        try {
-            Class.forName(driver);
-            Connection conn;
-            System.out.println("establishing connection to " + dbUrl);
-            conn = DriverManager.getConnection(dbUrl, username, password);
-            stat = conn.createStatement();
-            System.out.println("done.");
-            out();
-            stat.close();
-            conn.close();
-            System.exit(-1);
-
-
-            //alle werte einlesen
-            Vector werte = readDistinctValues();
-            if (datenart.toUpperCase().equalsIgnoreCase("DOUBLE")) {
-                //massiveRandomizeDouble(werte);
-                randomize(werte);
-            } else //integer
-            {
-                massiveRandomizeInteger(werte);
-            }
-
-            System.out.println("Randomizierung erfolgreich beendet");
-        } catch (Exception e) {
-            System.out.println(e.toString());
-            System.exit(0);
-        }
-
-    }
-
-    /**
-     * randomizes in categories of values 
-     * only for double
-     * @param werte
-     */
-    private static void randomize(Vector werte) {
-        int categories = 15;
-        int valuesPerCategory = (int) werte.size() / categories;
-        StringBuffer updates = new StringBuffer();
-        float limit = 0, limit2;
-        for (int i = 1; i < categories; i++) {
-            limit = (float) ((Double) werte.get(i * valuesPerCategory)).doubleValue();
-            updates.append("update " + tablename + " set " + colname + "=" + colname + "*" + getRndFactor() + " where " + colname + ">" + limit);
-            if (i > 1) {
-                limit2 = (float) ((Double) werte.get((i - 1) * valuesPerCategory)).doubleValue();
-                updates.append(" and " + colname + "<" + limit2);
-            }
-            updates.append(";\n");
-        }
-        limit = (float) ((Double) werte.get((categories - 1) * valuesPerCategory)).doubleValue();
-        updates.append("update " + tablename + " set " + colname + "=" + colname + "*" + getRndFactor() + " where " + colname + "<" + limit + ";");
-
-        System.out.println(updates);
-    }
-
-    /**
-     *  * multiplies all occurences of a single value (e.g. 150) with a factor between
-    * minFactor and maxFactor (e.g. 150*1.1 -> all entries with 150 become 165)
-    
-     * @param werte
-     * @throws SQLException
-     */
-    private static void massiveRandomizeInteger(Vector werte) throws SQLException {
-        Integer einWert;
-        String upd = null;
-        for (Enumeration en = werte.elements(); en.hasMoreElements();) {
-            einWert = (Integer) en.nextElement();
-            int neuerwert = (int) (einWert.intValue() * getRndFactor());
-            upd = "update " + tablename + " set " + colname + "=" + neuerwert + " where " + colname + "=" + einWert.toString() + ";";
-
-            if (printOutOnly)
-                System.out.println(upd);
-            else
-                stat.executeUpdate(upd);
-        }
-
-    }
-
-    /**
-     *  * multiplies all occurences of a single value (e.g. 150) with a factor between
-     * minFactor and maxFactor (e.g. 150*1.1 -> all entries with 150 become 165)
-    
-     * @param werte
-     * @throws SQLException
-     */
-    private static void massiveRandomizeDouble(Vector werte) throws SQLException {
-        Double einWert;
-        double zufallswert;
-        String upd;
-        int i = 0;
-        int count = werte.size();
-        for (Enumeration en = werte.elements(); en.hasMoreElements();) {
-            einWert = (Double) en.nextElement();
-            i++;
-            zufallswert = einWert.doubleValue() * getRndFactor();
-            upd = "update " + tablename + " set " + colname + "=" + zufallswert + " where " + colname + "=" + einWert + ";";
-            if (printOutOnly)
-                System.out.println(upd);
-            else {
-                stat.executeUpdate(upd);
-                if (i % 20 == 0) System.out.println("Done " + i + " updates of " + count);
-            }
-
-        }
-    }
-
-    private static float getRndFactor() {
-        double rnd = Math.abs(r.nextDouble());
-        while (rnd < minFactor)
-            rnd += minFactor;
-        while (rnd > maxFactor)
-            rnd -= 0.05;
-        return (float) rnd;
-    }
-
-    private static Vector readDistinctValues() throws SQLException {
-        Vector werte = new Vector();
-        ResultSet rs = null;
-        Object item;
-        System.out.println("Alle werte einlesen:" + "select distinct " + colname + " from " + tablename + " order by 1 DESC");
-
-        rs = stat.executeQuery("select distinct " + colname + " from " + tablename + " order by " + colname + " DESC");
-        while (rs.next()) {
-            item = rs.getObject(1);
-            werte.add(item);
-        }
-        rs.close();
-        return werte;
-    }
-
-    private static void out() {
-        try {
-            FileWriter fw = new FileWriter("c:\\cygwin\\home\\superx\\cob_busa.unl");
-            BufferedWriter bw = new BufferedWriter(fw);
-            StringBuffer buf = new StringBuffer();
-
-            ResultSet rs = stat.executeQuery("select * from cob_busa");
-
-            int cols = 20;
-            String s;
-            Object o;
-            while (rs.next()) {
-                for (int i = 1; i <= cols; i++) {
-                    o = rs.getObject(i);
-                    if (o == null)
-                        s = "";
-                    else
-                        s = o.toString();
-
-                    buf.append(s.trim() + "^");
-                }
-                buf.append("^\n");
-
-            }
-            rs.close();
-
-            bw.write(buf.toString());
-            bw.close();
-            fw.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        System.out.println("done");
-    }
-}
+package de.memtext.db;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Enumeration;
+import java.util.Random;
+import java.util.Vector;
+/**
+ * Randomizes values in a database.
+ * Reads all values of a given table column (select distinct x from..) and
+ * multiplies all occurences of a single value (e.g. 150) with a factor between
+ * minFactor and maxFactor (e.g. 150*1.1 -> all entries with 150 become 165)
+ *
+ * if boolean printOutOnly is true the update sql statements are only logged
+ * to console, not performed
+ * */
+public class ValueRandomizer {
+	//private static String driver = "org.hsqldb.jdbcDriver";
+	private static String driver = "org.postgresql.Driver";
+	//private static String dbUrl = "jdbc:hsqldb:hsql://localhost:9999";
+	private static String dbUrl = "jdbc:postgresql://localhost:5432/superx";
+	private static String username = "superx"; //"joolap";
+	private static String password = ""; //"loopja3000";
+	private static String tablename = "cob_busa";
+	private static String colname = "betrag"; //"value";
+	private static String datenart = "DOUBLE"; //or "INTEGER";
+
+	private static double minFactor = 0.6;
+	private static double maxFactor = 1.8;
+
+	private static boolean printOutOnly = false;
+	private static Statement stat;
+	private static Random r = new Random();
+	public static void main(String args[]) {
+	
+		try {
+			Class.forName(driver);
+			Connection conn;
+			System.out.println("establishing connection to " + dbUrl);
+			conn = DriverManager.getConnection(dbUrl, username, password);
+			stat = conn.createStatement();
+			System.out.println("done.");
+			out();
+			stat.close();
+						conn.close();
+				System.exit(-1);
+				
+				
+			//alle werte einlesen
+			Vector werte = readDistinctValues();
+			if (datenart.toUpperCase().equalsIgnoreCase("DOUBLE")) {
+				//massiveRandomizeDouble(werte);
+				randomize(werte);
+			} else //integer
+				{
+				massiveRandomizeInteger(werte);
+			}
+			
+			System.out.println("Randomizierung erfolgreich beendet");
+		} catch (Exception e) {
+			System.out.println(e.toString());
+			System.exit(0);
+		}
+
+	}
+	/**
+	 * randomizes in categories of values 
+	 * only for double
+	 * @param werte
+	 */
+	private static void randomize(Vector werte) {
+		int categories = 15;
+		int valuesPerCategory = (int) werte.size() / categories;
+		StringBuffer updates = new StringBuffer();
+		float limit = 0, limit2;
+		for (int i = 1; i < categories; i++) {
+			limit =
+				(float) ((Double) werte.get(i * valuesPerCategory))
+					.doubleValue();
+			updates.append(
+				"update "
+					+ tablename
+					+ " set "
+					+ colname
+					+ "="
+					+ colname
+					+ "*"
+					+ getRndFactor()
+					+ " where "
+					+ colname
+					+ ">"
+					+ limit);
+			if (i > 1) {
+				limit2 =
+					(float) ((Double) werte.get((i - 1) * valuesPerCategory))
+						.doubleValue();
+				updates.append(" and " + colname + "<" + limit2);
+			}
+			updates.append(";\n");
+		}
+		limit =
+			(float) ((Double) werte.get((categories - 1) * valuesPerCategory))
+				.doubleValue();
+		updates.append(
+			"update "
+				+ tablename
+				+ " set "
+				+ colname
+				+ "="
+				+ colname
+				+ "*"
+				+ getRndFactor()
+				+ " where "
+				+ colname
+				+ "<"
+				+ limit
+				+ ";");
+
+		System.out.println(updates);
+	}
+	/**
+	 *  * multiplies all occurences of a single value (e.g. 150) with a factor between
+	* minFactor and maxFactor (e.g. 150*1.1 -> all entries with 150 become 165)
+	
+	 * @param werte
+	 * @throws SQLException
+	 */
+	private static void massiveRandomizeInteger(Vector werte)
+		throws SQLException {
+		Integer einWert;
+		String upd = null;
+		for (Enumeration en = werte.elements(); en.hasMoreElements();) {
+			einWert = (Integer) en.nextElement();
+			int neuerwert = (int) (einWert.intValue() * getRndFactor());
+			upd =
+				"update "
+					+ tablename
+					+ " set "
+					+ colname
+					+ "="
+					+ neuerwert
+					+ " where "
+					+ colname
+					+ "="
+					+ einWert.toString()
+					+ ";";
+
+			if (printOutOnly)
+				System.out.println(upd);
+			else
+				stat.executeUpdate(upd);
+		}
+
+	}
+	/**
+	 *  * multiplies all occurences of a single value (e.g. 150) with a factor between
+	 * minFactor and maxFactor (e.g. 150*1.1 -> all entries with 150 become 165)
+	
+	 * @param werte
+	 * @throws SQLException
+	 */
+	private static void massiveRandomizeDouble(Vector werte)
+		throws SQLException {
+		Double einWert;
+		double zufallswert;
+		String upd;
+		int i = 0;
+		int count = werte.size();
+		for (Enumeration en = werte.elements(); en.hasMoreElements();) {
+			einWert = (Double) en.nextElement();
+			i++;
+			zufallswert = einWert.doubleValue() * getRndFactor();
+			upd =
+				"update "
+					+ tablename
+					+ " set "
+					+ colname
+					+ "="
+					+ zufallswert
+					+ " where "
+					+ colname
+					+ "="
+					+ einWert
+					+ ";";
+			if (printOutOnly)
+				System.out.println(upd);
+			else {
+				stat.executeUpdate(upd);
+				if (i % 20 == 0)
+					System.out.println("Done " + i + " updates of " + count);
+			}
+
+		}
+	}
+	private static float getRndFactor() {
+		double rnd = Math.abs(r.nextDouble());
+		while (rnd < minFactor)
+			rnd += minFactor;
+		while (rnd > maxFactor)
+			rnd -= 0.05;
+		return (float) rnd;
+	}
+	private static Vector readDistinctValues() throws SQLException {
+		Vector werte = new Vector();
+		ResultSet rs = null;
+		Object item;
+		System.out.println(
+			"Alle werte einlesen:"
+				+ "select distinct "
+				+ colname
+				+ " from "
+				+ tablename
+				+ " order by 1 DESC");
+
+		rs =
+			stat.executeQuery(
+				"select distinct "
+					+ colname
+					+ " from "
+					+ tablename
+					+ " order by "
+					+ colname
+					+ " DESC");
+		while (rs.next()) {
+			item = rs.getObject(1);
+			werte.add(item);
+		}
+		rs.close();
+		return werte;
+	}
+
+	private static void out() {
+				try {
+					FileWriter fw =
+								new FileWriter("c:\\cygwin\\home\\superx\\cob_busa.unl");
+							BufferedWriter bw = new BufferedWriter(fw);
+							StringBuffer buf = new StringBuffer();
+
+			ResultSet rs = stat.executeQuery("select * from cob_busa");
+
+			int cols = 20;String s;Object o;
+			while (rs.next()) {
+				for (int i = 1; i <= cols; i++)
+					{o=rs.getObject(i);
+					if (o==null) s="";
+					else s=o.toString();
+					
+						buf.append(s.trim() + "^");} 
+				buf.append("^\n");
+
+			}
+			rs.close();
+
+			bw.write(buf.toString());
+			bw.close();
+			fw.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		System.out.println("done");
+	}
+}
--- a/src/de/memtext/db/dataexchange/MyRequest.java
+++ b/src/de/memtext/db/dataexchange/MyRequest.java
@ -1,67 +1,69 @@
				@@ -1,67 +1,69 @@
-package de.memtext.db.dataexchange;
-
-/**
- * Insert the type's description here.
- * Creation date: (29.11.2002 16:53:06)
- * @author: 
- */
-public class MyRequest implements java.io.Serializable {
-    static final long serialVersionUID = -2L;
-
-    static final int NORMAL = 1;
-
-    static final int EXPECT_ONE_UPDATE = 2;
-
-    private String sql;
-
-    private String name;
-
-    private Object[] params;
-
-    private int type;
-
-    public MyRequest(String name, String sql, Object[] params) {
-        this(name, sql, params, NORMAL);
-    }
-
-    public MyRequest(String name, String sql, Object[] params, int type) {
-        setName(name);
-        setSql(sql);
-        setParams(params);
-        setType(type);
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Object[] getParams() {
-        return params;
-    }
-
-    public void setParams(Object[] params) {
-        this.params = params;
-    }
-
-    public String getSql() {
-        return sql;
-    }
-
-    public void setSql(String sql) {
-        this.sql = sql;
-    }
-
-}
-
+package de.memtext.db.dataexchange;
+
+/**
+ * Insert the type's description here.
+ * Creation date: (29.11.2002 16:53:06)
+ * @author: 
+ */
+public class MyRequest implements java.io.Serializable {
+static final long serialVersionUID = -2L;
+static final int NORMAL=1;
+static final int EXPECT_ONE_UPDATE=2;
+
+private String sql;
+private String name;
+private Object[] params;
+private int type;
+public MyRequest(String name,String sql,Object[] params)
+{
+	this(name,sql,params,NORMAL);
+}
+public MyRequest(String name,String sql,Object[] params,int type)
+{
+setName(name);
+setSql(sql);
+setParams(params);
+setType(type);
+}
+
+public int getType()
+{
+return type;
+}
+
+public void setType(int type)
+{
+this.type=type;
+}
+public String getName()
+{
+return name;
+}
+
+public void setName(String name)
+{
+this.name=name;
+}
+
+public Object[] getParams()
+{
+return params;
+}
+
+public void setParams(Object[] params)
+{
+this.params=params;
+}
+
+public String getSql()
+{
+return sql;
+}
+
+public void setSql(String sql)
+{
+this.sql=sql;
+}
+
+}
+
--- a/src/de/memtext/db/dataexchange/MyServletResponse.java
+++ b/src/de/memtext/db/dataexchange/MyServletResponse.java
@ -1,61 +1,49 @@
				@@ -1,61 +1,49 @@
-package de.memtext.db.dataexchange;
-
-import java.util.Vector;
-
-/**
- * Insert the type's description here.
- * Creation date: (28.11.2002 19:25:34)
- * @author: 
- */
-public class MyServletResponse implements java.io.Serializable {
-    static final long serialVersionUID = -3L;
-
-    private Vector result;
-
-    private boolean OK;
-
-    private Exception exception;
-
-    private int updatedRowsCount;
-
-    /**
-    * MyServletResponse constructor comment.
-    */
-    public MyServletResponse(Vector result, boolean OK, Exception exception) {
-        this.result = result;
-        this.OK = OK;
-        this.exception = exception;
-    }
-
-    public Exception getException() {
-        return exception;
-    }
-
-    public Vector getResult() {
-        return result;
-    }
-
-    public boolean isOK() {
-        return OK;
-    }
-
-    public void setException(Exception exception) {
-        this.exception = exception;
-    }
-
-    public void setOK(boolean OK) {
-        this.OK = OK;
-    }
-
-    public void setResult(Vector result) {
-        this.result = result;
-    }
-
-    public int getUpdatedRowsCount() {
-        return updatedRowsCount;
-    }
-
-    public void setUpdatedRowsCount(int updatedRowsCount) {
-        this.updatedRowsCount = updatedRowsCount;
-    }
+package de.memtext.db.dataexchange;
+
+import java.util.Vector;
+/**
+ * Insert the type's description here.
+ * Creation date: (28.11.2002 19:25:34)
+ * @author: 
+ */
+public class MyServletResponse implements java.io.Serializable {
+    static final long serialVersionUID = -3L;
+    private Vector result;
+    private boolean OK;
+    private Exception exception;
+    private int updatedRowsCount;
+
+    /**
+    * MyServletResponse constructor comment.
+    */
+    public MyServletResponse(Vector result, boolean OK, Exception exception) {
+        this.result = result;
+        this.OK = OK;
+        this.exception = exception;
+    }
+    public Exception getException() {
+        return exception;
+    }
+    public Vector getResult() {
+        return result;
+    }
+    public boolean isOK() {
+        return OK;
+    }
+    public void setException(Exception exception) {
+        this.exception = exception;
+    }
+    public void setOK(boolean OK) {
+        this.OK = OK;
+    }
+    public void setResult(Vector result) {
+        this.result = result;
+    }
+    public int getUpdatedRowsCount() {
+        return updatedRowsCount;
+    }
+
+    public void setUpdatedRowsCount(int updatedRowsCount) {
+        this.updatedRowsCount = updatedRowsCount;
+    }
 }
--- a/src/de/memtext/dlg/AboutDialog.java
+++ b/src/de/memtext/dlg/AboutDialog.java
@ -1,46 +1,49 @@
				@@ -1,46 +1,49 @@
-package de.memtext.dlg;
-
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.HeadlessException;
-import java.io.IOException;
-
-import javax.swing.JLabel;
-
-import de.memtext.util.BrowserLauncher;
-import de.memtext.util.WindowUtils;
-import de.memtext.widgets.VerticalBox;
-
-public class AboutDialog extends OkDlg {
-    private JLabel infoLbl, homepageLabel;
-
-    public AboutDialog(Frame parent, String title, String infoText, String homePageLink, final String homepageUrl) throws HeadlessException {
-        super(parent, title);
-        infoLbl = new JLabel(infoText);
-        homepageLabel = new JLabel("<html><u>" + homePageLink);
-        homepageLabel.addMouseListener(new java.awt.event.MouseAdapter() {
-
-            @Override
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
-
-                try {
-                    BrowserLauncher.openURL(homepageUrl);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-
-        VerticalBox vbox = new VerticalBox();
-        vbox.addWithCenterAlignment(infoLbl);
-        vbox.addWithCenterAlignment(homepageLabel);
-        setCenter(vbox);
-        pack();
-        Dimension size = this.getSize();
-        setSize(size.width + 30, size.height + 30);
-        WindowUtils.center(this);
-    }
-
-}
-
+package de.memtext.dlg;
+
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.HeadlessException;
+import java.io.IOException;
+
+import javax.swing.JLabel;
+
+import de.memtext.util.BrowserLauncher;
+import de.memtext.util.WindowUtils;
+import de.memtext.widgets.VerticalBox;
+
+public class AboutDialog extends OkDlg {
+	private JLabel infoLbl, homepageLabel;
+	public AboutDialog(
+		Frame parent,
+		String title,
+		String infoText,
+		String homePageLink,
+		final String homepageUrl)
+		throws HeadlessException {
+		super(parent, title);
+		infoLbl = new JLabel(infoText);
+		homepageLabel = new JLabel("<html><u>" + homePageLink);
+		homepageLabel.addMouseListener(new java.awt.event.MouseAdapter() {
+			public void mouseClicked(java.awt.event.MouseEvent evt) {
+
+				try {
+					BrowserLauncher.openURL(homepageUrl);
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		});
+
+		VerticalBox vbox = new VerticalBox();
+		vbox.addWithCenterAlignment(infoLbl);
+		vbox.addWithCenterAlignment(homepageLabel);
+		setCenter(vbox);
+		pack();
+		Dimension size = this.getSize();
+		setSize(size.width + 30, size.height + 30);
+		WindowUtils.center(this);
+	}
+
+}
+
 //Created on 18.06.2004 at 12:20:35
--- a/src/de/memtext/dlg/DialogWithExit.java
+++ b/src/de/memtext/dlg/DialogWithExit.java
@ -1,106 +1,113 @@
				@@ -1,106 +1,113 @@
-package de.memtext.dlg;
-
-import java.awt.BorderLayout;
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.awt.GraphicsConfiguration;
-import java.awt.HeadlessException;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-
-public class DialogWithExit extends JDialog {
-
-    public DialogWithExit() throws HeadlessException {
-        super();
-        initMe();
-    }
-
-    public DialogWithExit(Frame owner) throws HeadlessException {
-        super(owner);
-        initMe();
-    }
-
-    public DialogWithExit(Frame owner, boolean arg1) throws HeadlessException {
-        super(owner, arg1);
-        initMe();
-    }
-
-    public DialogWithExit(Frame owner, String arg1) throws HeadlessException {
-        super(owner, arg1);
-        initMe();
-    }
-
-    public DialogWithExit(Frame owner, String arg1, boolean arg2) throws HeadlessException {
-        super(owner, arg1, arg2);
-        initMe();
-    }
-
-    public DialogWithExit(Frame owner, String arg1, boolean arg2, GraphicsConfiguration arg3) {
-        super(owner, arg1, arg2, arg3);
-        initMe();
-    }
-
-    public DialogWithExit(Dialog owner) throws HeadlessException {
-        super(owner);
-        initMe();
-    }
-
-    public DialogWithExit(Dialog owner, boolean arg1) throws HeadlessException {
-        super(owner, arg1);
-        initMe();
-    }
-
-    public DialogWithExit(Dialog owner, String arg1) throws HeadlessException {
-        super(owner, arg1);
-        initMe();
-    }
-
-    public DialogWithExit(Dialog owner, String arg1, boolean arg2) throws HeadlessException {
-        super(owner, arg1, arg2);
-    }
-
-    public DialogWithExit(Dialog owner, String arg1, boolean arg2, GraphicsConfiguration arg3) throws HeadlessException {
-        super(owner, arg1, arg2, arg3);
-        initMe();
-    }
-
-    private void initMe() {
-        addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent we) {
-                exit();
-            }
-        });
-    }
-
-    /**
-    	 * called if window is closed, does nothing by default,
-    	 * subclasses can override
-    	 *
-    	 */
-    protected void exit() {
-    }
-
-    //man könnte noch abfragen ob auch wirklich Borderlayout benutzt
-    //wird
-    /**
-    	 * installs a component in the center of the dialog
-    	 * @param comp
-    	 */
-    public void setCenter(JComponent comp) {
-        this.getContentPane().add(comp, BorderLayout.CENTER);
-    }
-
-    /**
-    	 * installs a component in the notrh of the dialog
-    	 * @param comp
-    	 */
-    public void setNorth(JComponent comp) {
-        this.getContentPane().add(comp, BorderLayout.NORTH);
-    }
-}
-
+package de.memtext.dlg;
+
+import java.awt.BorderLayout;
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.GraphicsConfiguration;
+import java.awt.HeadlessException;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+
+public class DialogWithExit extends JDialog {
+
+	public DialogWithExit() throws HeadlessException {
+		super();
+		initMe();
+	}
+
+	public DialogWithExit(Frame owner) throws HeadlessException {
+		super(owner);
+		initMe();
+	}
+
+	public DialogWithExit(Frame owner, boolean arg1) throws HeadlessException {
+		super(owner, arg1);
+		initMe();
+	}
+
+	public DialogWithExit(Frame owner, String arg1) throws HeadlessException {
+		super(owner, arg1);
+		initMe();
+	}
+
+	public DialogWithExit(Frame owner, String arg1, boolean arg2)
+		throws HeadlessException {
+		super(owner, arg1, arg2);
+		initMe();
+	}
+
+	public DialogWithExit(
+		Frame owner,
+		String arg1,
+		boolean arg2,
+		GraphicsConfiguration arg3) {
+		super(owner, arg1, arg2, arg3);
+		initMe();
+	}
+
+	public DialogWithExit(Dialog owner) throws HeadlessException {
+		super(owner);
+		initMe();
+	}
+
+	public DialogWithExit(Dialog owner, boolean arg1) throws HeadlessException {
+		super(owner, arg1);
+		initMe();
+	}
+
+	public DialogWithExit(Dialog owner, String arg1) throws HeadlessException {
+		super(owner, arg1);
+		initMe();
+	}
+
+	public DialogWithExit(Dialog owner, String arg1, boolean arg2)
+		throws HeadlessException {
+		super(owner, arg1, arg2);
+	}
+
+	public DialogWithExit(
+		Dialog owner,
+		String arg1,
+		boolean arg2,
+		GraphicsConfiguration arg3)
+		throws HeadlessException {
+		super(owner, arg1, arg2, arg3);
+		initMe();
+	}
+	private void initMe(){
+	addWindowListener(new WindowAdapter() {
+		public void windowClosing(WindowEvent we) {
+			exit();
+		}
+	});
+}
+/**
+	 * called if window is closed, does nothing by default,
+	 * subclasses can override
+	 *
+	 */
+protected void exit() {
+}
+
+//man könnte noch abfragen ob auch wirklich Borderlayout benutzt
+//wird
+/**
+	 * installs a component in the center of the dialog
+	 * @param comp
+	 */
+public void setCenter(JComponent comp) {
+	this.getContentPane().add(comp, BorderLayout.CENTER);
+}
+/**
+	 * installs a component in the notrh of the dialog
+	 * @param comp
+	 */
+public void setNorth(JComponent comp) {
+	this.getContentPane().add(comp, BorderLayout.NORTH);
+}
+}
+
 //Created on 21.11.2003
--- a/src/de/memtext/dlg/EnterDateDlg.java
+++ b/src/de/memtext/dlg/EnterDateDlg.java
@ -1,57 +1,57 @@
				@@ -1,57 +1,57 @@
-package de.memtext.dlg;
-
-import java.awt.Component;
-import java.text.ParseException;
-
-import javax.swing.JOptionPane;
-
-import de.memtext.util.DateUtils;
-import de.memtext.widgets.WarningMessage;
-
-public class EnterDateDlg {
-    private java.util.Date date;
-
-    private Component parentComp;
-
-    private String title, text;
-
-    public EnterDateDlg(Component parentComp, String text, String title) {
-        this.parentComp = parentComp;
-        this.title = title;
-        this.text = text;
-    }
-
-    public boolean wasOkSelected() {
-        return date != null;
-    }
-
-    public void show() {
-        date = null;
-        String in;
-        boolean ok = false;
-        while (!ok) {
-            in = JOptionPane.showInputDialog(parentComp, text, title, JOptionPane.QUESTION_MESSAGE);
-            if (in == null) {
-                date = null;
-                ok = true;
-            } else {
-                try {
-                    date = DateUtils.parse(in);
-                    ok = true;
-                } catch (ParseException e) {
-                    WarningMessage.show(parentComp, "Ungültige Datumseingabe", title);
-                }
-            }
-        }
-    }
-
-    public static void main(String args[]) {
-        new EnterDateDlg(null, "test", "title").show();
-    }
-
-    public java.util.Date getDate() {
-        return date;
-    }
-}
-
-//Created on 18.08.2004 at 12:36:12
+package de.memtext.dlg;
+
+import java.awt.Component;
+import java.text.ParseException;
+
+import javax.swing.JOptionPane;
+
+import de.memtext.util.DateUtils;
+import de.memtext.widgets.WarningMessage;
+
+public class EnterDateDlg {
+    private java.util.Date date;
+    private Component parentComp;
+    private String title, text;
+
+    public EnterDateDlg(Component parentComp, String text, String title) {
+        this.parentComp = parentComp;
+        this.title = title;
+        this.text = text;
+    }
+
+    public boolean wasOkSelected()
+    {
+        return date!=null;
+    }
+    public void show() {
+        date = null;
+        String in;
+        boolean ok = false;
+        while (!ok) {
+            in = JOptionPane.showInputDialog(parentComp, text, title,
+                    JOptionPane.QUESTION_MESSAGE);
+            if (in == null) {
+                date = null;
+                ok = true;
+            } else {
+                try {
+                    date = DateUtils.parse(in);
+                    ok = true;
+                } catch (ParseException e) {
+                    WarningMessage.show(parentComp, "Ungültige Datumseingabe",
+                            title);
+                }
+            }
+        }
+    }
+
+    public static void main(String args[]) {
+        new EnterDateDlg(null, "test", "title").show();
+    }
+
+    public java.util.Date getDate() {
+        return date;
+    }
+}
+
+//Created on 18.08.2004 at 12:36:12
--- a/src/de/memtext/dlg/ImportDlg.java
+++ b/src/de/memtext/dlg/ImportDlg.java
@ -1,62 +1,63 @@
				@@ -1,62 +1,63 @@
-package de.memtext.dlg;
-
-import java.awt.Frame;
-import java.io.File;
-
-import javax.swing.JLabel;
-
-import de.memtext.util.FilenamesFilter;
-import de.memtext.util.WindowUtils;
-import de.memtext.widgets.FileSelectionPanel;
-import de.memtext.widgets.VerticalBox;
-
-public class ImportDlg extends OkCancelDlg {
-    private JLabel lblTop = new JLabel();
-
-    private FileSelectionPanel fsp = new FileSelectionPanel("Datei");
-
-    public ImportDlg(Frame owner, String title, String infoTxt) {
-        super(owner, title, true);
-        VerticalBox vbox = new VerticalBox();
-        lblTop.setText(infoTxt);
-        vbox.add(lblTop);
-        vbox.add(fsp);
-        setCenter(vbox);
-        this.pack();
-        WindowUtils.center(this);
-
-    }
-
-    public void setCurrentDir(File defaultdir) {
-        fsp.setCurrentDir(defaultdir);
-    }
-
-    /**
-    
-     * @param endings
-     */
-    public void setFileFilter(String endings) {
-        fsp.setFileFilter(new FilenamesFilter("CSV oder XML Dateien", endings));
-    }
-
-    @Override
-    protected void performOk() {
-        this.dispose();
-    }
-
-    @Override
-    protected void performCancel() {
-        this.dispose();
-    }
-
-    public File getSelectedFile() {
-        return fsp.getSelectedFile();
-    }
-
-    public static void main(String[] args) {
-        ImportDlg d = new ImportDlg(null, "titl", "Unfälle importieren aus CSV- oder XML-Datei (z.B. Universum Unfallanzeige 3.0)");
-        d.setFileFilter(".xml|.csv");
-        d.show();
-    }
-}
+package de.memtext.dlg;
+
+import java.awt.Frame;
+import java.io.File;
+
+import javax.swing.JLabel;
+
+import de.memtext.util.FilenamesFilter;
+import de.memtext.util.WindowUtils;
+import de.memtext.widgets.FileSelectionPanel;
+import de.memtext.widgets.VerticalBox;
+
+public class ImportDlg extends OkCancelDlg {
+	private JLabel lblTop = new JLabel();
+	private FileSelectionPanel fsp = new FileSelectionPanel("Datei");
+
+	public ImportDlg(Frame owner, String title, String infoTxt) {
+		super(owner, title, true);
+		VerticalBox vbox = new VerticalBox();
+		lblTop.setText(infoTxt);
+		vbox.add(lblTop);
+		vbox.add(fsp);
+		setCenter(vbox);
+		this.pack();
+		WindowUtils.center(this);
+
+	}
+	
+	public void setCurrentDir(File defaultdir)
+	{
+		fsp.setCurrentDir(defaultdir);
+	}
+	/**
+	
+	 * @param endings
+	 */
+	public void setFileFilter(String endings) {
+		fsp.setFileFilter(new FilenamesFilter("CSV oder XML Dateien", endings));
+	}
+
+	protected void performOk() {
+		this.dispose();
+	}
+
+	protected void performCancel() {
+		this.dispose();
+	}
+
+	public File getSelectedFile() {
+		return fsp.getSelectedFile();
+	}
+
+	public static void main(String[] args) {
+		ImportDlg d =
+			new ImportDlg(
+				null,
+				"titl",
+				"Unfälle importieren aus CSV- oder XML-Datei (z.B. Universum Unfallanzeige 3.0)");
+		d.setFileFilter(".xml|.csv");
+		d.show();
+	}
+}
 //Created on 19.02.2004 at 11:56:06
--- a/src/de/memtext/dlg/InputDialog.java
+++ b/src/de/memtext/dlg/InputDialog.java
@ -1,34 +1,40 @@
				@@ -1,34 +1,40 @@
-package de.memtext.dlg;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.swing.JOptionPane;
-
-/**
- Convienience class to create and Input Dialog with JOptionPane.
- I.e. selection item from drop down (combobox)
- */
-public class InputDialog {
-    private String title, txt;
-
-    private ArrayList list;
-
-    public InputDialog(Collection col, String title, String txt) {
-        super();
-        this.title = title;
-        this.txt = txt;
-        list = new ArrayList();
-        if (col == null || col.size() == 0) throw new IllegalArgumentException("Collection mustn't be null or empty");
-        for (Iterator it = col.iterator(); it.hasNext();) {
-            list.add(it.next());
-        }
-    }
-
-    public Object show() {
-        return JOptionPane.showInputDialog(null, txt, title, JOptionPane.QUESTION_MESSAGE, null, list.toArray(), null);
-    }
-}
-
-
+package de.memtext.dlg;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import javax.swing.JOptionPane;
+
+/**
+ Convienience class to create and Input Dialog with JOptionPane.
+ I.e. selection item from drop down (combobox)
+ */
+public class InputDialog {
+	private String title, txt;
+	private ArrayList list;
+	
+	public InputDialog(Collection col, String title, String txt) {
+		super();
+		this.title = title;
+		this.txt = txt;
+		 list = new ArrayList();
+		if (col==null||col.size()==0) throw new IllegalArgumentException("Collection mustn't be null or empty");
+		for (Iterator it = col.iterator(); it.hasNext();) {
+			list.add(it.next());
+		}
+	}
+
+	public Object show() {
+		return JOptionPane.showInputDialog(
+			null,
+			txt,
+			title,
+			JOptionPane.QUESTION_MESSAGE,
+			null,
+			list.toArray(),
+			null);
+	}
+}
+
+
--- a/src/de/memtext/dlg/LoginDlg.java
+++ b/src/de/memtext/dlg/LoginDlg.java
@ -1,74 +1,67 @@
				@@ -1,74 +1,67 @@
-package de.memtext.dlg;
-
-import javax.swing.JFrame;
-
-import de.memtext.widgets.LabeledPasswordField;
-import de.memtext.widgets.LabeledTextField;
-import de.memtext.widgets.MultilineEditPanel;
-
-/**
- A Login Dialog
- */
-public class LoginDlg extends OkCancelDlg {
-    private LabeledTextField lUser = new LabeledTextField("Kennung", 15);
-
-    private LabeledPasswordField lPass = new LabeledPasswordField("Passwort", 15);
-
-    public LoginDlg(JFrame frame, String title) {
-        super(frame, title, true);
-        initdlg();
-    }
-
-    private void initdlg() {
-        MultilineEditPanel vbox = new MultilineEditPanel();
-        vbox.add(lUser);
-        vbox.add(lPass);
-        this.setCenter(vbox);
-        this.pack();
-    }
-
-    @Override
-    protected void performOk() {
-        this.hide();
-    }
-
-    public void setUsername(String username) {
-        lUser.setValue(username);
-    }
-
-    public void setPassword(String password) {
-        lPass.setValue(password);
-    }
-
-    @Override
-    protected void performCancel() {
-        this.hide();
-    }
-
-    public String getUsername() {
-        return lUser.getValue().toString();
-    }
-
-    /**
-     * can be returned only once, cleared for security reasons
-     * afterwards
-     * @return
-     */
-    public String getPassword() {
-        /*	char[] pw = passw.getPassword();
-        	String result = new String(pw);
-        	for (int i = 0; i < pw.length; i++) {
-        		pw[i] = 0;
-        	}
-        	return result;
-        	*/
-        return lPass.getValue().toString();
-    }
-
-    public static void main(String args[]) {
-        LoginDlg d = new LoginDlg(null, "asdf");
-        d.show();
-        System.out.println(d.getPassword());
-
-    }
-}
+package de.memtext.dlg;
+
+import javax.swing.JFrame;
+
+import de.memtext.widgets.LabeledPasswordField;
+import de.memtext.widgets.LabeledTextField;
+import de.memtext.widgets.MultilineEditPanel;
+
+/**
+ A Login Dialog
+ */
+public class LoginDlg extends OkCancelDlg {
+	private LabeledTextField lUser = new LabeledTextField("Kennung", 15);
+	private LabeledPasswordField lPass =
+		new LabeledPasswordField("Passwort", 15);
+	public LoginDlg(JFrame frame, String title) {
+		super(frame, title,true);
+		initdlg();
+	}
+
+	private void initdlg() {
+		MultilineEditPanel vbox = new MultilineEditPanel();
+		vbox.add(lUser);
+		vbox.add(lPass);
+		this.setCenter(vbox);
+		this.pack();
+	}
+
+	protected void performOk() {
+		this.hide();
+	}
+	public void setUsername(String username)
+	{
+	    lUser.setValue(username);
+	}
+	public void setPassword(String password)
+	{
+	    lPass.setValue(password);
+	}
+	protected void performCancel() {
+		this.hide();
+	}
+	public String getUsername() {
+		return lUser.getValue().toString();
+	}
+	/**
+	 * can be returned only once, cleared for security reasons
+	 * afterwards
+	 * @return
+	 */
+	public String getPassword() {
+		/*	char[] pw = passw.getPassword();
+			String result = new String(pw);
+			for (int i = 0; i < pw.length; i++) {
+				pw[i] = 0;
+			}
+			return result;
+			*/
+		return lPass.getValue().toString();
+	}
+	public static void main(String args[]) {
+		LoginDlg d=new LoginDlg(null,"asdf");
+		d.show();
+		System.out.println(d.getPassword());
+		
+	}
+}
--- a/src/de/memtext/dlg/NodeSelectionDlg.java
+++ b/src/de/memtext/dlg/NodeSelectionDlg.java
@ -1,132 +1,113 @@
				@@ -1,132 +1,113 @@
-package de.memtext.dlg;
-
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeCellRenderer;
-import javax.swing.tree.TreeNode;
-
-import de.memtext.util.WindowUtils;
-
-/**
- * A dialog that presents a tree and allows the selection of
- * one node or to clear the selection
- */
-public class NodeSelectionDlg extends OkCancelClearDlg {
-    private JTree tree;
-
-    private Object selectedNode = null;
-
-    private String title;
-
-    public NodeSelectionDlg(Frame owner, String title, JTree tree) {
-        super(owner, title);
-        this.tree = tree;
-        this.title = title;
-        this.setCenter(new JScrollPane(tree));
-        selectedNode = null;
-        if (tree.getLastSelectedPathComponent() != null) selectedNode = (TreeNode) tree.getLastSelectedPathComponent();
-        this.pack();
-        WindowUtils.center(this);
-        addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent we) {
-                exit();
-            }
-        });
-    }
-
-    /**
-    	 * called if window is closed, does nothing by default,
-    	 * subclasses can override
-    	 *
-    	 */
-    @Override
-    protected void exit() {
-    }
-
-    public NodeSelectionDlg(Frame owner, String title, DefaultTreeModel treeModel) {
-        this(owner, title, new JTree(treeModel));
-    }
-
-    public NodeSelectionDlg(Frame owner, String title, TreeNode node) {
-        this(owner, title, new JTree(node));
-    }
-
-    /**
-     * can be overriden by subclasses to perform a check if
-     * the selected node is OK
-     * @return
-     */
-    protected boolean isSelectedNodeOk(TreeNode testme) {
-        return true;
-    }
-
-    @Override
-    protected void performOk() {
-        if (!isSelectedNodeOk((TreeNode) tree.getLastSelectedPathComponent())) return;
-        selectedNode = tree.getLastSelectedPathComponent();
-        this.setVisible(false);
-    }
-
-    @Override
-    protected void performCancel() {
-        this.setVisible(false);
-    }
-
-    public TreeNode getSelectedNode() {
-        return selectedNode == null ? null : (TreeNode) selectedNode;
-    }
-
-    @Override
-    protected void performClear() {
-        selectedNode = null;
-        tree.clearSelection();
-        this.setVisible(false);
-    }
-
-    @Override
-    public void setSize(Dimension dim) {
-        super.setSize(dim);
-        WindowUtils.center(this);
-    }
-
-    @Override
-    public void setSize(int x, int y) {
-        super.setSize(x, y);
-        WindowUtils.center(this);
-    }
-
-    public static void main(String a[]) {
-        NodeSelectionDlg t = new NodeSelectionDlg(null, "adsf", new JTree());
-        t.pack();
-        t.show();
-        System.out.println(t.getSelectedNode());
-        t.show();
-        System.out.println(t.getSelectedNode());
-    }
-
-    public void setNode(TreeNode node) {
-        tree.setModel(new DefaultTreeModel(node));
-        selectedNode = null;
-    }
-
-    public void setCellRenderer(TreeCellRenderer renderer) {
-        tree.setCellRenderer(renderer);
-    }
-
-    @Override
-    public String getTitle() {
-        return title;
-    }
-
-    public String getInfoText() {
-        return title;
-    }
-}
+package de.memtext.dlg;
+
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeCellRenderer;
+import javax.swing.tree.TreeNode;
+
+import de.memtext.util.WindowUtils;
+
+/**
+ * A dialog that presents a tree and allows the selection of
+ * one node or to clear the selection
+ */
+public class NodeSelectionDlg extends OkCancelClearDlg {
+	private JTree tree;
+	private Object selectedNode = null;
+	private String title;
+	public NodeSelectionDlg(Frame owner, String title, JTree tree) {
+		super(owner, title);
+		this.tree = tree;
+		this.title=title;
+		this.setCenter(new JScrollPane(tree));
+		selectedNode = null;
+		if (tree.getLastSelectedPathComponent() != null)
+			selectedNode = (TreeNode) tree.getLastSelectedPathComponent();
+		this.pack();
+		WindowUtils.center(this);
+		addWindowListener(new WindowAdapter() {
+			public void windowClosing(WindowEvent we) {
+				exit();
+			}
+		});
+	}
+	/**
+		 * called if window is closed, does nothing by default,
+		 * subclasses can override
+		 *
+		 */
+	protected void exit() {
+	}
+	
+	public NodeSelectionDlg(
+		Frame owner,
+		String title,
+		DefaultTreeModel treeModel) {
+		this(owner, title, new JTree(treeModel));
+	}
+	public NodeSelectionDlg(Frame owner, String title, TreeNode node) {
+		this(owner, title, new JTree(node));
+	}
+	/**
+	 * can be overriden by subclasses to perform a check if
+	 * the selected node is OK
+	 * @return
+	 */
+	protected boolean isSelectedNodeOk(TreeNode testme)
+	{
+		return true;
+	}
+	protected void performOk() {
+		if (!isSelectedNodeOk((TreeNode)tree.getLastSelectedPathComponent())) return;
+		selectedNode = tree.getLastSelectedPathComponent();
+		this.setVisible(false);
+	}
+
+	protected void performCancel() {
+		this.setVisible(false);
+	}
+	public TreeNode getSelectedNode() {
+		return selectedNode == null ? null : (TreeNode) selectedNode;
+	}
+	protected void performClear() {
+		selectedNode = null;
+		tree.clearSelection();
+		this.setVisible(false);
+	}
+	public void setSize(Dimension dim) {
+		super.setSize(dim);
+		WindowUtils.center(this);
+	}
+	public void setSize(int x, int y) {
+		super.setSize(x, y);
+		WindowUtils.center(this);
+	}
+	public static void main(String a[]) {
+		NodeSelectionDlg t = new NodeSelectionDlg(null, "adsf", new JTree());
+		t.pack();
+		t.show();
+		System.out.println(t.getSelectedNode());
+		t.show();
+		System.out.println(t.getSelectedNode());
+	}
+	public void setNode(TreeNode node) {
+		tree.setModel(new DefaultTreeModel(node));
+		selectedNode=null;
+	}
+	public void setCellRenderer(TreeCellRenderer renderer) {
+		tree.setCellRenderer(renderer);
+	}
+	public String getTitle() {
+		return title;
+	}
+	public String getInfoText() {
+		return title;
+	}
+}
 //Created on 17.11.2003
--- a/src/de/memtext/dlg/ObjectCheckBoxDlg.java
+++ b/src/de/memtext/dlg/ObjectCheckBoxDlg.java
@ -1,56 +1,54 @@
				@@ -1,56 +1,54 @@
-package de.memtext.dlg;
-
-import java.awt.Frame;
-import java.awt.HeadlessException;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.JScrollPane;
-
-import de.memtext.util.WindowUtils;
-import de.memtext.widgets.ObjectCheckBox;
-import de.memtext.widgets.VerticalBox;
-
-public class ObjectCheckBoxDlg extends OkCancelDlg {
-    private List boxList = new LinkedList();
-
-    private List selectedObjectsList;
-
-    public ObjectCheckBoxDlg(Frame frame, String title, List itemList, boolean selected) throws HeadlessException {
-        super(frame, title);
-        VerticalBox vbox = new VerticalBox();
-        for (Iterator it = itemList.iterator(); it.hasNext();) {
-            Object element = (Object) it.next();
-            ObjectCheckBox cb = new ObjectCheckBox(element, selected);
-            boxList.add(cb);
-            vbox.add(cb);
-        }
-        this.setCenter(new JScrollPane(vbox));
-        this.pack();
-        WindowUtils.center(this);
-    }
-
-    @Override
-    protected void performOk() {
-        selectedObjectsList = new LinkedList();
-        for (Iterator it = boxList.iterator(); it.hasNext();) {
-            ObjectCheckBox element = (ObjectCheckBox) it.next();
-            if (element.isSelected()) selectedObjectsList.add(element.getObject());
-        }
-        this.hide();
-    }
-
-    @Override
-    protected void performCancel() {
-        selectedObjectsList = new LinkedList();
-        this.hide();
-    }
-
-    public List getSelectedObjectsList() {
-        return selectedObjectsList;
-    }
-
-}
-
+package de.memtext.dlg;
+
+import java.awt.Frame;
+import java.awt.HeadlessException;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.JScrollPane;
+
+import de.memtext.widgets.ObjectCheckBox;
+import de.memtext.widgets.VerticalBox;
+import de.memtext.util.WindowUtils;
+
+public class ObjectCheckBoxDlg extends OkCancelDlg {
+	private List boxList = new LinkedList();
+	private List selectedObjectsList;
+	public ObjectCheckBoxDlg(Frame frame, String title, List itemList,boolean selected)
+		throws HeadlessException {
+		super(frame, title);
+		VerticalBox vbox = new VerticalBox();
+		for (Iterator it = itemList.iterator(); it.hasNext();) {
+			Object element = (Object) it.next();
+			ObjectCheckBox cb = new ObjectCheckBox(element,selected);
+			boxList.add(cb);
+			vbox.add(cb);
+		}
+		this.setCenter(new JScrollPane(vbox));
+		this.pack();
+		WindowUtils.center(this);
+	}
+
+	protected void performOk() {
+		selectedObjectsList=new LinkedList();
+		for (Iterator it = boxList.iterator(); it.hasNext();) {
+			ObjectCheckBox element = (ObjectCheckBox) it.next();
+			if (element.isSelected())
+			 selectedObjectsList.add(element.getObject());
+		}
+		this.hide();
+	}
+
+	protected void performCancel() {
+		selectedObjectsList=new LinkedList();
+		this.hide();
+	}
+
+	public List getSelectedObjectsList() {
+		return selectedObjectsList;
+	}
+
+}
+
 //Created on 26.11.2003 at 12:47:31
--- a/src/de/memtext/dlg/OkCancelClearDlg.java
+++ b/src/de/memtext/dlg/OkCancelClearDlg.java
@ -1,80 +1,72 @@
				@@ -1,80 +1,72 @@
-package de.memtext.dlg;
-
-import java.awt.Frame;
-import java.awt.HeadlessException;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-
-/**
- * Abstract Dialog in which OK or Cancel can be clicked.
- * Subclasses must implement performCancel and performOk.
- * setCenter for convenience.
- *
- It's important that clients don't call
- getContentPane().setLayout(new BorderLayout()) or something like that,
- because that will cause southPanel to disappear
- */
-public abstract class OkCancelClearDlg extends OkCancelDlg {
-    private boolean wasClearSelected;
-
-    protected JButton btnClear = new JButton("Leeren");
-
-    /**
-     * Constructor for OkCancelClearDlg.
-     * @param arg0
-     * @param arg1
-     * @throws HeadlessException
-     */
-    public OkCancelClearDlg(Frame arg0, String title) throws HeadlessException {
-        super(arg0, title, true);
-        initOkCancelClearDlg();
-    }
-
-    private void initOkCancelClearDlg() {
-
-        btnClear.setActionCommand("Clear");
-        btnClear.addActionListener(new ActionListener() {
-           
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                wasOkSelected = false;
-                wasClearSelected = true;
-                performClear();
-            }
-        });
-        addAfterCancel(btnClear);
-    }
-
-    public boolean wasClearSelected() {
-        return wasClearSelected;
-    }
-
-    protected abstract void performClear();
-
-    public static void main(String[] args) {
-
-        OkCancelClearDlg dlg = new OkCancelClearDlg(new JFrame(), "test") {
-            
-            @Override
-            protected void performOk() {
-            }
-
-            @Override
-            protected void performCancel() {
-            }
-            
-            @Override
-            protected void performClear() {
-            }
-        };
-
-        //		dlg.addAboveOK(new JLabel("bla"));
-        dlg.setCenter(new JLabel("cnter"));
-        dlg.pack();
-        dlg.show();
-    }
-}
+package de.memtext.dlg;
+
+import java.awt.Frame;
+import java.awt.HeadlessException;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+
+/**
+ * Abstract Dialog in which OK or Cancel can be clicked.
+ * Subclasses must implement performCancel and performOk.
+ * setCenter for convenience.
+ *
+ It's important that clients don't call
+ getContentPane().setLayout(new BorderLayout()) or something like that,
+ because that will cause southPanel to disappear
+ */
+public abstract class OkCancelClearDlg
+	extends OkCancelDlg
+	 {
+	private boolean wasClearSelected;
+	protected JButton btnClear = new JButton("Leeren");
+	/**
+	 * Constructor for OkCancelClearDlg.
+	 * @param arg0
+	 * @param arg1
+	 * @throws HeadlessException
+	 */
+	public OkCancelClearDlg(Frame arg0, String title)
+		throws HeadlessException {
+		super(arg0, title, true);
+		initOkCancelClearDlg();
+	}
+
+	private void initOkCancelClearDlg() {
+		
+		btnClear.setActionCommand("Clear");
+		btnClear.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent ae) {
+				wasOkSelected = false;
+				wasClearSelected = true;
+				performClear();
+			}
+		});
+		addAfterCancel(btnClear);
+	}
+	public boolean wasClearSelected() {
+		return wasClearSelected;
+	}
+	protected abstract void performClear();
+	public static void main(String[] args) {
+
+		OkCancelClearDlg dlg = new OkCancelClearDlg(new JFrame(), "test") {
+			protected void performOk() {
+			}
+
+			protected void performCancel() {
+			}
+
+			protected void performClear() {
+			}
+		};
+
+		//		dlg.addAboveOK(new JLabel("bla"));
+		dlg.setCenter(new JLabel("cnter"));
+		dlg.pack();
+		dlg.show();
+	}
+}
--- a/src/de/memtext/dlg/OkCancelDlg.java
+++ b/src/de/memtext/dlg/OkCancelDlg.java
@ -1,205 +1,200 @@
				@@ -1,205 +1,200 @@
-package de.memtext.dlg;
-
-import java.awt.BorderLayout;
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.awt.HeadlessException;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-
-import de.memtext.widgets.HorizontalBox;
-import de.memtext.widgets.VerticalBox;
-
-/**
- * Abstract Dialog in which OK or Cancel can be clicked.
- * Subclasses must implement performCancel and performOk.
- * setCenter for convenience.
- *
- It's important that clients don't call
- getContentPane().setLayout(new BorderLayout()) or something like that,
- because that will cause southPanel to disappear
- */
-public abstract class OkCancelDlg extends DialogWithExit {
-    private OkCancelPanel pOkCancel;
-
-    private HorizontalBox boxAboverOkCancel = new HorizontalBox();
-
-    protected boolean wasOkSelected, wasCancelSelected;
-
-    public OkCancelDlg(Frame owner, String title, boolean isModal) {
-        super(owner, title, isModal);
-        initOkCancelDlg();
-    }
-
-    /**
-     * Constructor for OkCancelDlg.
-     * @param arg0
-     * @param arg1
-     * @param arg2
-     * @throws HeadlessException
-     */
-    public OkCancelDlg(Frame frame, String title) throws HeadlessException {
-        super(frame, title, true);
-        initOkCancelDlg();
-    }
-
-    /**
-     * Constructor for OkCancelDlg.
-     * @param arg0
-     * @throws HeadlessException
-     */
-    public OkCancelDlg(Dialog arg0) throws HeadlessException {
-        super(arg0, true);
-        initOkCancelDlg();
-    }
-
-    /**
-     * Constructor for OkCancelDlg.
-     * @param arg0
-     * @param arg1
-     * @throws HeadlessException
-     */
-    public OkCancelDlg(Dialog arg0, String arg1) throws HeadlessException {
-        super(arg0, arg1, true);
-        initOkCancelDlg();
-    }
-
-    private void initOkCancelDlg() {
-        //this.setContentPane(new OneTimeInitContentPane());
-        VerticalBox pSouth = new VerticalBox();
-        pOkCancel = new OkCancelPanel();
-        pSouth.add(boxAboverOkCancel);
-        pSouth.add(pOkCancel);
-
-        this.getContentPane().add(pSouth, BorderLayout.SOUTH);
-        pOkCancel.addActionListener(new ActionListener() {
-           
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                String cmd = ae.getActionCommand();
-                if (cmd.equals("OK")) {
-                    wasOkSelected = true;
-                    wasCancelSelected = false;
-                    performOk();
-                }
-
-                if (cmd.equals("Cancel")) {
-                    wasOkSelected = false;
-                    wasCancelSelected = true;
-                    performCancel();
-                }
-            }
-        });
-        this.getRootPane().setDefaultButton(pOkCancel.getBtnOk());
-    }
-
-    public void addAboveOK(JComponent comp) {
-        boxAboverOkCancel.add(comp);
-    }
-
-    public boolean wasOkSelected() {
-        return wasOkSelected;
-    }
-
-    public boolean wasCancelSelected() {
-        return wasCancelSelected;
-    }
-
-    /**
-     * subclasses must implement this method and specify commands
-     * to be executed when OK was clicked
-      */
-    protected abstract void performOk();
-
-    /**
-     * subclasses must implement this method and specify commands
-     * to be executed when Cancel was clicked
-     *
-     */
-    protected abstract void performCancel();
-
-    /**
-     * Adds a Component before the OK button
-     * @param comp
-     */
-    public void addBeforeOK(JComponent comp) {
-        int pos = de.memtext.util.ComponentUtils.getPositionOnComponent(pOkCancel.getBtnOk(), pOkCancel);
-        pOkCancel.add(comp, pos);
-    }
-
-    /**
-    		 * Adds a component right of the OK Button
-    		 * @param comp
-    		 */
-    public void addAfterOK(JComponent comp) {
-        int pos = de.memtext.util.ComponentUtils.getPositionOnComponent(pOkCancel.getBtnOk(), pOkCancel);
-        pOkCancel.add(comp, pos + 1);
-    }
-
-    /**
-     * Adds a component right of the Cancel Button
-     * @param comp
-     */
-    public void addAfterCancel(JComponent comp) {
-        int pos = de.memtext.util.ComponentUtils.getPositionOnComponent(pOkCancel.getBtnCancel(), pOkCancel);
-        pOkCancel.add(comp, pos + 1);
-    }
-    /*	class OneTimeInitContentPane extends Container {
-    		private int setLayoutCount=0;
-    		public void setLayout(LayoutManager manager) {
-    			if (!(manager instanceof BorderLayout)) {
-    				throw new IllegalArgumentException("OKCancel Dlg must have BorderLayout");
-    			}
-    			super.setLayout(manager);
-    			setLayoutCount++;
-    			if (setLayoutCount > 0) {
-    				System.out.println(
-    					"changing layout may cause problems in OKCancelDlg");
-    				
-    			}
-    		}
-    	}*/
-
-    public void setOkVisible(boolean b) {
-        pOkCancel.setOkVisible(b);
-    }
-
-    public void setCancelVisible(boolean b) {
-        pOkCancel.setCancelVisible(b);
-    }
-
-    public boolean requestFocusForOK() {
-        return pOkCancel.getBtnOk().requestFocusInWindow();
-    }
-
-    public void setOkBold(boolean b) {
-        pOkCancel.setOkBold(b);
-    }
-
-    public void setOkDefaultButton() {
-        this.getRootPane().setDefaultButton(pOkCancel.getBtnOk());
-    }
-
-    public static void main(String[] args) {
-
-        OkCancelDlg dlg = new OkCancelDlg(new JFrame(), "test") {
-            @Override
-            protected void performOk() {
-            }
-            
-            @Override
-            protected void performCancel() {
-            }
-        };
-
-        //	dlg.addAboveOK(new JLabel("bla"));
-        dlg.setCenter(new JLabel("cnter"));
-        dlg.pack();
-        dlg.show();
-    }
-
-}
+package de.memtext.dlg;
+
+import java.awt.BorderLayout;
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.HeadlessException;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+
+import de.memtext.widgets.HorizontalBox;
+import de.memtext.widgets.VerticalBox;
+
+/**
+ * Abstract Dialog in which OK or Cancel can be clicked.
+ * Subclasses must implement performCancel and performOk.
+ * setCenter for convenience.
+ *
+ It's important that clients don't call
+ getContentPane().setLayout(new BorderLayout()) or something like that,
+ because that will cause southPanel to disappear
+ */
+public abstract class OkCancelDlg
+	extends DialogWithExit
+	 {
+	private OkCancelPanel pOkCancel;
+	private HorizontalBox boxAboverOkCancel = new HorizontalBox();
+	protected boolean wasOkSelected,wasCancelSelected;
+	public OkCancelDlg(Frame owner, String title, boolean isModal) {
+		super(owner, title, isModal);
+		initOkCancelDlg();
+	}
+
+	/**
+	 * Constructor for OkCancelDlg.
+	 * @param arg0
+	 * @param arg1
+	 * @param arg2
+	 * @throws HeadlessException
+	 */
+	public OkCancelDlg(Frame frame, String title) throws HeadlessException {
+		super(frame, title, true);
+		initOkCancelDlg();
+	}
+
+	/**
+	 * Constructor for OkCancelDlg.
+	 * @param arg0
+	 * @throws HeadlessException
+	 */
+	public OkCancelDlg(Dialog arg0) throws HeadlessException {
+		super(arg0, true);
+		initOkCancelDlg();
+	}
+
+	/**
+	 * Constructor for OkCancelDlg.
+	 * @param arg0
+	 * @param arg1
+	 * @throws HeadlessException
+	 */
+	public OkCancelDlg(Dialog arg0, String arg1) throws HeadlessException {
+		super(arg0, arg1, true);
+		initOkCancelDlg();
+	}
+
+	private void initOkCancelDlg() {
+		//this.setContentPane(new OneTimeInitContentPane());
+		VerticalBox pSouth = new VerticalBox();
+		pOkCancel = new OkCancelPanel();
+		pSouth.add(boxAboverOkCancel);
+		pSouth.add(pOkCancel);
+
+		this.getContentPane().add(pSouth, BorderLayout.SOUTH);
+		pOkCancel.addActionListener(new ActionListener(){
+            public void actionPerformed(ActionEvent ae)
+            {
+                String cmd = ae.getActionCommand();
+        		if (cmd.equals("OK")) {
+        			wasOkSelected = true;
+        			wasCancelSelected=false;
+        			performOk();
+        		}
+
+        		if (cmd.equals("Cancel")) {
+        			wasOkSelected = false;
+        			wasCancelSelected=true;
+        			performCancel();
+        		}
+            }
+        });
+		this.getRootPane().setDefaultButton(pOkCancel.getBtnOk());
+	}
+	public void addAboveOK(JComponent comp) {
+		boxAboverOkCancel.add(comp);
+	}
+	
+	public boolean wasOkSelected() {
+		return wasOkSelected;
+	}
+	public boolean wasCancelSelected() {
+        return wasCancelSelected;
+    }
+	/**
+	 * subclasses must implement this method and specify commands
+	 * to be executed when OK was clicked
+	  */
+	protected abstract void performOk();
+	/**
+	 * subclasses must implement this method and specify commands
+	 * to be executed when Cancel was clicked
+	 *
+	 */
+	protected abstract void performCancel();
+	/**
+	 * Adds a Component before the OK button
+	 * @param comp
+	 */
+	public void addBeforeOK(JComponent comp) {
+		int pos =
+			de.memtext.util.ComponentUtils.getPositionOnComponent(
+				pOkCancel.getBtnOk(),
+				pOkCancel);
+		pOkCancel.add(comp, pos);
+	}
+	/**
+			 * Adds a component right of the OK Button
+			 * @param comp
+			 */
+	public void addAfterOK(JComponent comp) {
+		int pos =
+			de.memtext.util.ComponentUtils.getPositionOnComponent(
+				pOkCancel.getBtnOk(),
+				pOkCancel);
+		pOkCancel.add(comp, pos + 1);
+	}
+	/**
+	 * Adds a component right of the Cancel Button
+	 * @param comp
+	 */
+	public void addAfterCancel(JComponent comp) {
+		int pos =
+			de.memtext.util.ComponentUtils.getPositionOnComponent(
+				pOkCancel.getBtnCancel(),
+				pOkCancel);
+		pOkCancel.add(comp, pos + 1);
+	}
+	/*	class OneTimeInitContentPane extends Container {
+			private int setLayoutCount=0;
+			public void setLayout(LayoutManager manager) {
+				if (!(manager instanceof BorderLayout)) {
+					throw new IllegalArgumentException("OKCancel Dlg must have BorderLayout");
+				}
+				super.setLayout(manager);
+				setLayoutCount++;
+				if (setLayoutCount > 0) {
+					System.out.println(
+						"changing layout may cause problems in OKCancelDlg");
+					
+				}
+			}
+		}*/
+
+	public void setOkVisible(boolean b) {
+		pOkCancel.setOkVisible(b);
+	}
+	public void setCancelVisible(boolean b) {
+		pOkCancel.setCancelVisible(b);
+	}
+	public boolean requestFocusForOK() {
+		return pOkCancel.getBtnOk().requestFocusInWindow();
+	}
+	public void setOkBold(boolean b) {
+		pOkCancel.setOkBold(b);
+	}
+
+	public void setOkDefaultButton() {
+		this.getRootPane().setDefaultButton(pOkCancel.getBtnOk());
+	}
+	
+	public static void main(String[] args) {
+
+		OkCancelDlg dlg = new OkCancelDlg(new JFrame(), "test") {
+			protected void performOk() {
+			}
+
+			protected void performCancel() {
+			}
+		};
+
+		//	dlg.addAboveOK(new JLabel("bla"));
+		dlg.setCenter(new JLabel("cnter"));
+		dlg.pack();
+		dlg.show();
+	}
+
+}
--- a/src/de/memtext/dlg/OkCancelPanel.java
+++ b/src/de/memtext/dlg/OkCancelPanel.java
@ -1,61 +1,56 @@
				@@ -1,61 +1,56 @@
-package de.memtext.dlg;
-
-import java.awt.Font;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JPanel;
-
-/**
-A Panel with an OK and a Cancel button.
- */
-public class OkCancelPanel extends JPanel {
-    protected JButton btnOk, btnCancel;
-
-    public OkCancelPanel() {
-        btnOk = new JButton("OK");
-        btnCancel = new JButton("Abbrechen");
-        btnCancel.setActionCommand("Cancel");
-        add(btnOk);
-        add(btnCancel);
-
-    }
-
-    public void addActionListener(ActionListener al) {
-        btnOk.addActionListener(al);
-        btnCancel.addActionListener(al);
-    }
-
-    /**
-     * Returns the btnCancel.
-     * @return JButton
-     */
-    public JButton getBtnCancel() {
-        return btnCancel;
-    }
-
-    /**
-     * Returns the btnOk.
-     * @return JButton
-     */
-    public JButton getBtnOk() {
-        return btnOk;
-    }
-
-    public void setOkVisible(boolean b) {
-        btnOk.setVisible(b);
-    }
-
-    public void setCancelVisible(boolean b) {
-        btnCancel.setVisible(b);
-    }
-
-    public void setOkBold(boolean b) {
-        Font f = btnOk.getFont();
-        if (b)
-            btnOk.setFont(f.deriveFont(Font.BOLD));
-        else
-            btnOk.setFont(f.deriveFont(Font.PLAIN));
-    }
-
-}
+package de.memtext.dlg;
+
+import java.awt.Font;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+
+/**
+A Panel with an OK and a Cancel button.
+ */
+public class OkCancelPanel extends JPanel {
+	protected JButton btnOk, btnCancel;
+	public OkCancelPanel() {
+		btnOk = new JButton("OK");
+		btnCancel = new JButton("Abbrechen");
+		btnCancel.setActionCommand("Cancel");
+		add(btnOk);
+		add(btnCancel);
+
+	}
+	public void addActionListener(ActionListener al) {
+		btnOk.addActionListener(al);
+		btnCancel.addActionListener(al);
+	}
+
+	/**
+	 * Returns the btnCancel.
+	 * @return JButton
+	 */
+	public JButton getBtnCancel() {
+		return btnCancel;
+	}
+
+	/**
+	 * Returns the btnOk.
+	 * @return JButton
+	 */
+	public JButton getBtnOk() {
+		return btnOk;
+	}
+	public void setOkVisible(boolean b) {
+		btnOk.setVisible(b);
+	}
+	public void setCancelVisible(boolean b) {
+		btnCancel.setVisible(b);
+	}
+	public void setOkBold(boolean b) {
+		Font f=btnOk.getFont();
+		if (b)
+		btnOk.setFont(f.deriveFont(Font.BOLD));
+		else
+		btnOk.setFont(f.deriveFont(Font.PLAIN));
+	}
+
+}
--- a/src/de/memtext/dlg/OkDlg.java
+++ b/src/de/memtext/dlg/OkDlg.java
@ -1,109 +1,106 @@
				@@ -1,109 +1,106 @@
-package de.memtext.dlg;
-
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.awt.HeadlessException;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-
-/**
- *  Dialog which can only be closed by clicking OK.
- * 
- *  setCenter for convenienance.
- *
- *  @author MB
- *
- */
-
-public class OkDlg extends DialogWithExit {
-    private JPanel psouth = new JPanel();
-
-    protected JButton ok = new JButton("OK");
-
-    /**
-     * Constructor for OkDlg.
-     * @param arg0
-     * @throws HeadlessException
-     */
-    public OkDlg(Frame owner) throws HeadlessException {
-        super(owner, true);
-        initSouth();
-    }
-
-    public OkDlg(Frame owner, String title, boolean isModal) {
-        super(owner, title, isModal);
-        initSouth();
-    }
-
-
-    public OkDlg(Frame owner, String title) throws HeadlessException {
-        super(owner, title, true);
-        initSouth();
-    }
-
-
-    public JButton getOkBtn() {
-        return ok;
-    }
-
-
-    /**
-     * Constructor for OkDlg.
-     * @param arg0
-     * @throws HeadlessException
-     */
-    public OkDlg(Dialog arg0) throws HeadlessException {
-        super(arg0, true);
-        initSouth();
-    }
-
-
-    private void initSouth() {
-
-        ok.addActionListener(new ActionListener() {
-            
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                performOk();
-            }
-        });
-        psouth.add(ok);
-
-        Container cp = this.getContentPane();
-        cp.add(psouth, BorderLayout.SOUTH);
-        this.getRootPane().setDefaultButton(ok);
-
-    }
-
-
-
-
-    public void addBeforeOK(JComponent comp) {
-        int pos = de.memtext.util.ComponentUtils.getPositionOnComponent(ok, psouth);
-        psouth.add(comp, pos);
-    }
-
-    public void addAfterOK(JComponent comp) {
-        int pos = de.memtext.util.ComponentUtils.getPositionOnComponent(ok, psouth);
-        psouth.add(comp, pos + 1);
-    }
-
-    /**
-     * subclasses can override this method and specify commands
-     * to be executed when OK was clicked
-      */
-    protected void performOk() {
-        this.hide();
-    }
-
-    public static void main(String args[]) {
-        OkDlg d = new OkDlg(new javax.swing.JFrame());
-        d.show();
-    }
-}
+package de.memtext.dlg;
+
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.HeadlessException;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+/**
+ *  Dialog which can only be closed by clicking OK.
+ * 
+ *  setCenter for convenienance.
+ *
+ *  @author MB
+ *
+ */
+
+public class OkDlg extends DialogWithExit  {
+	private JPanel psouth = new JPanel();
+	protected JButton ok = new JButton("OK");
+	
+	/**
+	 * Constructor for OkDlg.
+	 * @param arg0
+	 * @throws HeadlessException
+	 */
+	public OkDlg(Frame owner) throws HeadlessException {
+		super(owner,true);
+		initSouth();
+	}
+	public OkDlg(Frame owner, String title, boolean isModal) {
+		super(owner,title,isModal);
+		initSouth();
+		}
+
+
+	public OkDlg(Frame owner, String title) throws HeadlessException {
+		super(owner, title,true);
+		initSouth();
+	}
+
+
+	public JButton getOkBtn()
+	{
+		return ok;
+	}
+	
+	
+	/**
+	 * Constructor for OkDlg.
+	 * @param arg0
+	 * @throws HeadlessException
+	 */
+	public OkDlg(Dialog arg0) throws HeadlessException {
+		super(arg0,true);
+		initSouth();
+	}
+
+
+	private void initSouth() {
+
+		ok.addActionListener(new ActionListener(){
+            public void actionPerformed(ActionEvent ae)
+            {
+                performOk();
+            }
+        });
+		psouth.add(ok);
+		
+		Container cp = this.getContentPane();
+		cp.add(psouth, BorderLayout.SOUTH);
+		this.getRootPane().setDefaultButton(ok);
+
+	}
+	
+	
+
+	
+	public void addBeforeOK(JComponent comp) {
+		int pos =
+			de.memtext.util.ComponentUtils.getPositionOnComponent(ok, psouth);
+		psouth.add(comp, pos);
+	}
+	public void addAfterOK(JComponent comp) {
+			int pos =
+				de.memtext.util.ComponentUtils.getPositionOnComponent(ok, psouth);
+			psouth.add(comp, pos+1);
+		}
+	/**
+	 * subclasses can override this method and specify commands
+	 * to be executed when OK was clicked
+	  */
+	protected  void performOk()
+	{
+		this.hide();
+	}
+	public static void main(String args[]) {
+	    OkDlg d=new OkDlg(new javax.swing.JFrame());
+	    d.show();
+    }
+}
--- a/src/de/memtext/dlg/OkDoneDlg.java
+++ b/src/de/memtext/dlg/OkDoneDlg.java
@ -1,177 +1,185 @@
				@@ -1,177 +1,185 @@
-package de.memtext.dlg;
-
-
-
-
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.awt.GraphicsConfiguration;
-import java.awt.HeadlessException;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-/**
-A abstract dialog with OK and DONE buttons. Subclasses must implement 
-performDone() and performOK();
- */
-public abstract class OkDoneDlg extends DialogWithExit {
-    /**
-     * Constructor for OkDoneDlg.
-     * @throws HeadlessException
-     */
-    public OkDoneDlg() throws HeadlessException {
-        super();
-        initSouth();
-    }
-
-    /**
-     * Constructor for OkDoneDlg.
-     * @param arg0
-     * @throws HeadlessException
-     */
-    public OkDoneDlg(Frame arg0) throws HeadlessException {
-        super(arg0);
-        initSouth();
-    }
-
-    /**
-     * Constructor for OkDoneDlg.
-     * @param arg0
-     * @param arg1
-     * @throws HeadlessException
-     */
-    public OkDoneDlg(Frame arg0, boolean arg1) throws HeadlessException {
-        super(arg0, arg1);
-        initSouth();
-    }
-
-    /**
-     * Constructor for OkDoneDlg.
-     * @param arg0
-     * @param arg1
-     * @throws HeadlessException
-     */
-    public OkDoneDlg(Frame arg0, String arg1) throws HeadlessException {
-        super(arg0, arg1);
-        initSouth();
-    }
-
-    /**
-     * Constructor for OkDoneDlg.
-     * @param arg0
-     * @param arg1
-     * @param arg2
-     * @throws HeadlessException
-     */
-    public OkDoneDlg(Frame arg0, String arg1, boolean arg2) throws HeadlessException {
-        super(arg0, arg1, arg2);
-        initSouth();
-    }
-
-    /**
-     * Constructor for OkDoneDlg.
-     * @param arg0
-     * @param arg1
-     * @param arg2
-     * @param arg3
-     */
-    public OkDoneDlg(Frame arg0, String arg1, boolean arg2, GraphicsConfiguration arg3) {
-        super(arg0, arg1, arg2, arg3);
-        initSouth();
-    }
-
-    /**
-     * Constructor for OkDoneDlg.
-     * @param arg0
-     * @throws HeadlessException
-     */
-    public OkDoneDlg(Dialog arg0) throws HeadlessException {
-        super(arg0);
-        initSouth();
-    }
-
-    /**
-     * Constructor for OkDoneDlg.
-     * @param arg0
-     * @param arg1
-     * @throws HeadlessException
-     */
-    public OkDoneDlg(Dialog arg0, boolean arg1) throws HeadlessException {
-        super(arg0, arg1);
-        initSouth();
-    }
-
-    /**
-     * Constructor for OkDoneDlg.
-     * @param arg0
-     * @param arg1
-     * @throws HeadlessException
-     */
-    public OkDoneDlg(Dialog arg0, String arg1) throws HeadlessException {
-        super(arg0, arg1);
-        initSouth();
-    }
-
-    /**
-     * Constructor for OkDoneDlg.
-     * @param arg0
-     * @param arg1
-     * @param arg2
-     * @throws HeadlessException
-     */
-    public OkDoneDlg(Dialog arg0, String arg1, boolean arg2) throws HeadlessException {
-        super(arg0, arg1, arg2);
-        initSouth();
-    }
-
-    /**
-     * Constructor for OkDoneDlg.
-     * @param arg0
-     * @param arg1
-     * @param arg2
-     * @param arg3
-     * @throws HeadlessException
-     */
-    public OkDoneDlg(Dialog arg0, String arg1, boolean arg2, GraphicsConfiguration arg3) throws HeadlessException {
-        super(arg0, arg1, arg2, arg3);
-        initSouth();
-    }
-
-    private void initSouth() {
-        OkCancelPanel ocp = new OkCancelPanel();
-        Container cp = this.getContentPane();
-        cp.add(ocp, BorderLayout.SOUTH);
-        ocp.addActionListener(new ActionListener() {
-            
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                String cmd = ae.getActionCommand();
-                if (cmd.equals("OK")) {
-                    performOk();
-                }
-
-                if (cmd.equals("Done")) {
-                    performDone();
-                }
-            }
-        });
-        ;
-    }
-
-
-    /**
-    	 * subclasses must implement this method and specify commands
-    	 * to be executed when OK was clicked
-    	  */
-    protected abstract void performOk();
-
-    /**
-    	 * subclasses must implement this method and specify commands
-    	 * to be executed when DONE was clicked
-    	  */
-
-    protected abstract void performDone();
-}
+package de.memtext.dlg;
+
+
+
+
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.GraphicsConfiguration;
+import java.awt.HeadlessException;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+
+/**
+A abstract dialog with OK and DONE buttons. Subclasses must implement 
+performDone() and performOK();
+ */
+public abstract class OkDoneDlg extends DialogWithExit  {
+	/**
+	 * Constructor for OkDoneDlg.
+	 * @throws HeadlessException
+	 */
+	public OkDoneDlg() throws HeadlessException {
+		super();
+		initSouth();
+	}
+
+	/**
+	 * Constructor for OkDoneDlg.
+	 * @param arg0
+	 * @throws HeadlessException
+	 */
+	public OkDoneDlg(Frame arg0) throws HeadlessException {
+		super(arg0);
+		initSouth();
+	}
+
+	/**
+	 * Constructor for OkDoneDlg.
+	 * @param arg0
+	 * @param arg1
+	 * @throws HeadlessException
+	 */
+	public OkDoneDlg(Frame arg0, boolean arg1) throws HeadlessException {
+		super(arg0, arg1);
+		initSouth();
+	}
+
+	/**
+	 * Constructor for OkDoneDlg.
+	 * @param arg0
+	 * @param arg1
+	 * @throws HeadlessException
+	 */
+	public OkDoneDlg(Frame arg0, String arg1) throws HeadlessException {
+		super(arg0, arg1);
+		initSouth();
+	}
+
+	/**
+	 * Constructor for OkDoneDlg.
+	 * @param arg0
+	 * @param arg1
+	 * @param arg2
+	 * @throws HeadlessException
+	 */
+	public OkDoneDlg(Frame arg0, String arg1, boolean arg2)
+		throws HeadlessException {
+		super(arg0, arg1, arg2);
+		initSouth();
+	}
+
+	/**
+	 * Constructor for OkDoneDlg.
+	 * @param arg0
+	 * @param arg1
+	 * @param arg2
+	 * @param arg3
+	 */
+	public OkDoneDlg(
+		Frame arg0,
+		String arg1,
+		boolean arg2,
+		GraphicsConfiguration arg3) {
+		super(arg0, arg1, arg2, arg3);
+		initSouth();
+	}
+
+	/**
+	 * Constructor for OkDoneDlg.
+	 * @param arg0
+	 * @throws HeadlessException
+	 */
+	public OkDoneDlg(Dialog arg0) throws HeadlessException {
+		super(arg0);
+		initSouth();
+	}
+
+	/**
+	 * Constructor for OkDoneDlg.
+	 * @param arg0
+	 * @param arg1
+	 * @throws HeadlessException
+	 */
+	public OkDoneDlg(Dialog arg0, boolean arg1) throws HeadlessException {
+		super(arg0, arg1);
+		initSouth();
+	}
+
+	/**
+	 * Constructor for OkDoneDlg.
+	 * @param arg0
+	 * @param arg1
+	 * @throws HeadlessException
+	 */
+	public OkDoneDlg(Dialog arg0, String arg1) throws HeadlessException {
+		super(arg0, arg1);
+		initSouth();
+	}
+
+	/**
+	 * Constructor for OkDoneDlg.
+	 * @param arg0
+	 * @param arg1
+	 * @param arg2
+	 * @throws HeadlessException
+	 */
+	public OkDoneDlg(Dialog arg0, String arg1, boolean arg2)
+		throws HeadlessException {
+		super(arg0, arg1, arg2);
+		initSouth();
+	}
+
+	/**
+	 * Constructor for OkDoneDlg.
+	 * @param arg0
+	 * @param arg1
+	 * @param arg2
+	 * @param arg3
+	 * @throws HeadlessException
+	 */
+	public OkDoneDlg(
+		Dialog arg0,
+		String arg1,
+		boolean arg2,
+		GraphicsConfiguration arg3)
+		throws HeadlessException {
+		super(arg0, arg1, arg2, arg3);
+		initSouth();
+	}
+
+	private void initSouth() {
+		OkCancelPanel ocp = new OkCancelPanel();
+		Container cp = this.getContentPane();
+		cp.add(ocp, BorderLayout.SOUTH);
+		ocp.addActionListener(new ActionListener(){
+            public void actionPerformed(ActionEvent ae)
+            {
+                String cmd = ae.getActionCommand();
+        		if (cmd.equals("OK")) {
+        			performOk();
+        		}
+
+        		if (cmd.equals("Done")) {
+        			performDone();
+        		}
+            }
+        });;
+	}
+
+	
+	/**
+		 * subclasses must implement this method and specify commands
+		 * to be executed when OK was clicked
+		  */
+	 protected abstract void performOk();
+	/**
+		 * subclasses must implement this method and specify commands
+		 * to be executed when DONE was clicked
+		  */ 
+	  
+	 protected abstract void performDone();
+}
--- a/src/de/memtext/dlg/OkDonePanel.java
+++ b/src/de/memtext/dlg/OkDonePanel.java
@ -1,32 +1,32 @@
				@@ -1,32 +1,32 @@
-package de.memtext.dlg;
-
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JPanel;
-
-/**
- * @author MB
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class OkDonePanel extends JPanel {
-    JButton btnOk, btnDone;
-
-    public OkDonePanel() {
-        btnOk = new JButton("OK");
-        btnDone = new JButton("Fertig");
-        add(btnOk);
-        add(btnDone);
-    }
-
-    public void addActionListener(ActionListener al) {
-        btnOk.addActionListener(al);
-        btnDone.addActionListener(al);
-    }
-
-
-}
+package de.memtext.dlg;
+
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+
+/**
+ * @author MB
+ *
+ * To change this generated comment edit the template variable "typecomment":
+ * Window>Preferences>Java>Templates.
+ * To enable and disable the creation of type comments go to
+ * Window>Preferences>Java>Code Generation.
+ */
+public class OkDonePanel extends JPanel {
+JButton btnOk,btnDone;
+public OkDonePanel()
+{
+	btnOk=new JButton("OK");
+	btnDone=new JButton("Fertig");
+	add(btnOk);
+	add(btnDone);
+}
+public void addActionListener(ActionListener al)
+{
+	btnOk.addActionListener(al);
+	btnDone.addActionListener(al);
+}
+
+
+}
--- a/src/de/memtext/dlg/PasswdChangeDlg.java
+++ b/src/de/memtext/dlg/PasswdChangeDlg.java
@ -1,199 +1,185 @@
				@@ -1,199 +1,185 @@
-package de.memtext.dlg;
-
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridLayout;
-import java.awt.event.KeyEvent;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-
-import de.memtext.rights.NewPasswordChecker;
-import de.memtext.util.WindowUtils;
-import de.memtext.widgets.HorizontalBox;
-import de.memtext.widgets.WarningMessage;
-
-public abstract class PasswdChangeDlg extends OkCancelDlg {
-    private JLabel lblInfoDummy = new JLabel();
-
-    private NewPasswordChecker newPasswordChecker;
-
-    private boolean isCheckOldPasswdWanted = true, isNewPasswordRequired = true;
-
-    private JTextField usernameField = new JTextField(20);
-
-    private KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
-
-    private JLabel lblInfo = new JLabel();
-
-    private JLabel lbl0 = new JLabel("Username:", JLabel.RIGHT);
-
-    private JLabel lbl1 = new JLabel("altes Passwort:", JLabel.RIGHT);
-
-    private JPasswordField oldpasswField = new JPasswordField(30);
-
-    private JLabel lbl2 = new JLabel("neues Passwort:", JLabel.RIGHT);
-
-    private JPasswordField newpasswField = new JPasswordField(30);
-
-    private JLabel lbl3 = new JLabel("wiederholen:", JLabel.RIGHT);
-
-    private JPasswordField newpasswField2 = new JPasswordField(30);
-
-    public PasswdChangeDlg(Frame frame, String title) {
-        super(frame, title, true);
-        JPanel p = new JPanel();
-        p.add(lblInfo);
-        HorizontalBox hbox = new HorizontalBox();
-        JPanel lblPanel = new JPanel(new GridLayout(0, 1));
-        lblPanel.setMaximumSize(new Dimension(150, 100));
-
-
-        lblPanel.add(lbl0);
-        lblPanel.add(lbl1);
-        lblPanel.add(lbl2);
-        lblPanel.add(lbl3);
-
-        lblInfo.setVisible(false);
-        hbox.add(lblPanel);
-        JPanel fieldPanel = new JPanel(new GridLayout(0, 1));
-
-        fieldPanel.add(usernameField);
-        usernameField.getKeymap().removeKeyStrokeBinding(enter);
-
-        fieldPanel.add(oldpasswField);
-        oldpasswField.getKeymap().removeKeyStrokeBinding(enter);
-        fieldPanel.add(newpasswField);
-        newpasswField.getKeymap().removeKeyStrokeBinding(enter);
-        fieldPanel.add(newpasswField2);
-        newpasswField2.getKeymap().removeKeyStrokeBinding(enter);
-        hbox.add(fieldPanel);
-        this.setCenter(hbox);
-        this.setNorth(p);
-        this.pack();
-        WindowUtils.center(this);
-    }
-
-    public void setNewPasswordChecker(NewPasswordChecker newPasswordChecker) {
-        this.newPasswordChecker = newPasswordChecker;
-    }
-
-    public void setUsername(String username) {
-        usernameField.setText(username);
-    }
-
-    public void clear() {
-        usernameField.setText("");
-        oldpasswField.setText("");
-        newpasswField.setText("");
-        newpasswField2.setText("");
-    }
-
-    protected abstract boolean isOldPasswordOK(String username, String passwd);
-
-    /**
-     * wenn OK geklickt wird wird automatisch geprüft ob die Länge des neuen
-     * Passwort passt und beide gleich sind
-     */
-    @Override
-    protected final void performOk() {
-        String new1 = new String(newpasswField.getPassword());
-        if (new1 == null || new1.length() < 4) {
-            WarningMessage.show(this, "Das neue Passwort ist zu kurz.", "Achtung");
-            return;
-        }
-
-        String new2 = new String(newpasswField2.getPassword());
-        String oldPassword = new String(oldpasswField.getPassword());
-        if (!new1.equals(new2)) {
-            WarningMessage.show(this, "Die beiden neuen Passwörter stimmen nicht überein", "Achtung");
-            return;
-        }
-        String faults = null;
-        if (newPasswordChecker != null) faults = newPasswordChecker.checkForFaults(getUsername(), new String(newpasswField.getPassword()));
-
-        if (faults != null) {
-            WarningMessage.show(this, faults, "Achtung");
-            return;
-        }
-
-        if (isNewPasswordRequired && new1.equals(oldPassword)) {
-            WarningMessage.show(this, "Sie müssen ein neues Passwort eingeben", "Achtung");
-            return;
-        }
-
-        if (isCheckOldPasswdWanted && !isOldPasswordOK(usernameField.getText(), oldPassword)) {
-            WarningMessage.show(this, "Das alte Passwort stimmt nicht", "Achtung");
-            return;
-        }
-        this.hide();
-    }
-
-    @Override
-    protected void performCancel() {
-        this.hide();
-    }
-
-
-    public void setUsernameFieldEnabled(boolean b) {
-        usernameField.setEnabled(b);
-    }
-
-    public void setOldPassword(String passw) {
-        oldpasswField.setText(passw);
-    }
-
-    public String getUsername() {
-        return usernameField.getText();
-    }
-
-    public String getOldPasswd() {
-        return new String(oldpasswField.getPassword());
-    }
-
-    public String getNewPasswd() {
-        return new String(newpasswField.getPassword());
-    }
-
-    public boolean isCheckOldPasswdWanted() {
-        return isCheckOldPasswdWanted;
-    }
-
-    public void setCheckOldPasswdWanted(boolean b) {
-        isCheckOldPasswdWanted = b;
-        lbl1.setVisible(b);
-        oldpasswField.setVisible(b);
-    }
-
-    public void setInfoLabel(String txt) {
-        lblInfo.setVisible(true);
-        lblInfo.setText(txt);
-        lblInfo.setFont(new Font("SansSerif", Font.BOLD, 12));
-    }
-
-    public boolean isNewPasswordRequired() {
-        return isNewPasswordRequired;
-    }
-
-    public void setNewPasswordRequired(boolean b) {
-        isNewPasswordRequired = b;
-    }
-
-    public static void main(String a[]) {
-        PasswdChangeDlg dlg = new PasswdChangeDlg(null, "dummy") {
-
-            @Override
-            protected boolean isOldPasswordOK(String username, String passwd) {
-                return false;
-            }
-        };
-        dlg.setInfoLabel("bitte ändern");
-        dlg.show();
-    }
-}
-
+package de.memtext.dlg;
+
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.event.KeyEvent;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
+
+import de.memtext.rights.NewPasswordChecker;
+import de.memtext.util.WindowUtils;
+import de.memtext.widgets.HorizontalBox;
+import de.memtext.widgets.WarningMessage;
+
+public abstract class PasswdChangeDlg extends OkCancelDlg {
+	private JLabel lblInfoDummy=new JLabel();
+	private NewPasswordChecker newPasswordChecker;
+	private boolean isCheckOldPasswdWanted = true,isNewPasswordRequired=true;
+	private JTextField usernameField = new JTextField(20);
+	private KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
+    private JLabel lblInfo=new JLabel();
+	private JLabel lbl0 = new JLabel("Username:", JLabel.RIGHT);
+	private JLabel lbl1 = new JLabel("altes Passwort:", JLabel.RIGHT);
+	private JPasswordField oldpasswField = new JPasswordField(30);
+	private JLabel lbl2 = new JLabel("neues Passwort:", JLabel.RIGHT);
+	private JPasswordField newpasswField = new JPasswordField(30);
+	private JLabel lbl3 = new JLabel("wiederholen:", JLabel.RIGHT);
+	private JPasswordField newpasswField2 = new JPasswordField(30);
+
+	public PasswdChangeDlg(Frame frame, String title) {
+		super(frame, title, true);
+		JPanel p=new JPanel();
+		p.add(lblInfo);
+		HorizontalBox hbox = new HorizontalBox();
+		JPanel lblPanel = new JPanel(new GridLayout(0, 1));
+		lblPanel.setMaximumSize(new Dimension(150, 100));
+		
+		
+		lblPanel.add(lbl0);
+		lblPanel.add(lbl1);
+		lblPanel.add(lbl2);
+		lblPanel.add(lbl3);
+		
+		lblInfo.setVisible(false);
+		hbox.add(lblPanel);
+		JPanel fieldPanel = new JPanel(new GridLayout(0, 1));
+		
+		fieldPanel.add(usernameField);
+		usernameField.getKeymap().removeKeyStrokeBinding(enter);
+
+		fieldPanel.add(oldpasswField);
+		oldpasswField.getKeymap().removeKeyStrokeBinding(enter);
+		fieldPanel.add(newpasswField);
+		newpasswField.getKeymap().removeKeyStrokeBinding(enter);
+		fieldPanel.add(newpasswField2);
+		newpasswField2.getKeymap().removeKeyStrokeBinding(enter);
+		hbox.add(fieldPanel);
+		this.setCenter(hbox);
+		this.setNorth(p);
+		this.pack();
+		WindowUtils.center(this);
+	}
+	public void setNewPasswordChecker(NewPasswordChecker newPasswordChecker)
+	{
+	    this.newPasswordChecker=newPasswordChecker;
+	}
+	public void setUsername(String username) {
+		usernameField.setText(username);
+	}
+	public void clear() {
+		usernameField.setText("");
+		oldpasswField.setText("");
+		newpasswField.setText("");
+		newpasswField2.setText("");
+	}
+	protected abstract boolean isOldPasswordOK(String username, String passwd);
+
+	/**
+	 * wenn OK geklickt wird wird automatisch geprüft ob die Länge des neuen
+	 * Passwort passt und beide gleich sind
+	 */
+	protected final void performOk() {
+	    String new1 = new String(newpasswField.getPassword());
+		if (new1==null||new1.length()<4   )
+		{
+		    WarningMessage.show(this,
+					"Das neue Passwort ist zu kurz.",
+					"Achtung");
+				return;
+		}
+	    
+	    String new2 = new String(newpasswField2.getPassword());
+		String oldPassword = new String(oldpasswField.getPassword());
+		if (!new1.equals(new2)) {
+			WarningMessage.show(this,
+				"Die beiden neuen Passwörter stimmen nicht überein",
+				"Achtung");
+			return;
+		}
+		String faults=null;
+		if (newPasswordChecker!=null) faults=newPasswordChecker.checkForFaults(getUsername(),new String(newpasswField.getPassword()));
+		
+	    if (faults!=null) {
+			WarningMessage.show(this,
+				faults,
+				"Achtung");
+			return;
+		}
+		
+		if (isNewPasswordRequired&&new1.equals(oldPassword))
+		{
+			WarningMessage.show(this,"Sie müssen ein neues Passwort eingeben","Achtung");
+			return;
+		}
+		
+		if (isCheckOldPasswdWanted
+			&& !isOldPasswordOK(usernameField.getText(),
+				oldPassword)) {
+			WarningMessage.show(this,"Das alte Passwort stimmt nicht", "Achtung");
+			return;
+		}
+		this.hide();
+	}
+
+	protected void performCancel() {
+		this.hide();
+	}
+
+
+	public void setUsernameFieldEnabled(boolean b) {
+		usernameField.setEnabled(b);
+	}
+	public void setOldPassword(String passw) {
+		oldpasswField.setText(passw);
+		}
+	public String getUsername() {
+		return usernameField.getText();
+	}
+	public String getOldPasswd() {
+		return new String(oldpasswField.getPassword());
+	}
+	public String getNewPasswd() {
+		return new String(newpasswField.getPassword());
+	}
+	public boolean isCheckOldPasswdWanted() {
+		return isCheckOldPasswdWanted;
+	}
+
+	public void setCheckOldPasswdWanted(boolean b) {
+		isCheckOldPasswdWanted = b;
+		lbl1.setVisible(b);
+		oldpasswField.setVisible(b);
+	}
+	public void setInfoLabel(String txt) {
+		lblInfo.setVisible(true);
+		lblInfo.setText(txt);
+		lblInfo.setFont(new Font("SansSerif",Font.BOLD,12));
+		}
+
+	public boolean isNewPasswordRequired() {
+		return isNewPasswordRequired;
+	}
+
+	public void setNewPasswordRequired(boolean b) {
+		isNewPasswordRequired = b;
+	}
+public static void main(String a[])
+{
+	PasswdChangeDlg dlg=new PasswdChangeDlg(null,"dummy"){
+
+		protected boolean isOldPasswordOK(String username, String passwd) {
+			return false;
+		}}
+	;
+	dlg.setInfoLabel("bitte ändern");
+	dlg.show();
+}
+}
+
 //Created on 09.01.2004 at 17:16:16
--- a/src/de/memtext/hbt/AbstractAriel.java
+++ b/src/de/memtext/hbt/AbstractAriel.java
@ -0,0 +1,122 @@
				@@ -0,0 +1,122 @@
+package de.memtext.hbt;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.mail.Flags;
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.search.FlagTerm;
+
+import de.memtext.util.LogUtils;
+import de.superx.servlet.SxMail;
+import de.superx.servlet.SxPool;
+
+public abstract class AbstractAriel extends Thread {
+	// this is defined as private static method to use as little memory as possible,
+	// it would be neglectable in moder computers to create it every time the method
+	// runs, GarbargeCollection would easily do the job
+	// yet I define it that way out of respect for the programmers of beginning in
+	// the 50ies/60ies or whenever
+//	private static FlagTerm flagUnseen = new FlagTerm(new Flags(Flags.Flag.SEEN), true); // ja ich weiß, flagUnseen
+	Flags seen = new Flags(Flags.Flag.RECENT);
+	private static FlagTerm flagUnseen = new FlagTerm(new Flags(Flags.Flag.SEEN), false);
+	static Flags flagsContainingOnlySeen=new Flags(Flags.Flag.SEEN);	
+	protected Logger logger=null;
+	// wird bisher nicht
+												   											// benötigt, aber ist doch
+																				// klar, dass ich das gleich
+																							// nutzen will, dass nervt,
+																							// dass die Meldung jetzt
+																							// kommt
+	private boolean isActive = true;
+	private int interval = 10;
+	protected SxMail sxmail;
+
+	public AbstractAriel() {
+		super();
+			}
+
+	public AbstractAriel(Runnable target) {
+		super(target);
+	}
+
+	public AbstractAriel(String name) {
+		super(name);
+	}
+
+	public AbstractAriel(ThreadGroup group, Runnable target) {
+		super(group, target);
+	}
+
+	public AbstractAriel(ThreadGroup group, String name) {
+		super(group, name);
+	}
+
+	public AbstractAriel(Runnable target, String name) {
+		super(target, name);
+	}
+
+	public AbstractAriel(ThreadGroup group, Runnable target, String name) {
+		super(group, target, name);
+	}
+
+	public AbstractAriel(ThreadGroup group, Runnable target, String name, long stackSize) {
+		super(group, target, name, stackSize);
+	}
+
+	public void initLogging()throws IOException 
+	{
+		String filename=SxPool.getLogDir() + "/superx_"
+				+ getArielName() + ".log";
+			LogUtils.initRawFile("superx_" + getArielName(), filename, 20000, 1, true, true);
+			System.out.println("Superx Mail logging in "+filename);
+			logger=Logger.getLogger("superx_" + getArielName());
+			Level lev = Level.SEVERE;
+			logger.setLevel(lev);
+			
+
+		
+	}
+	public String getArielName()
+	{
+		return "mail";
+	}
+	public void run() {
+		while (isActive) {
+			try {
+				Thread.sleep(interval * 1000);
+
+			} catch (InterruptedException e) {
+				// e.printStackTrace();
+			}
+
+			try {
+				
+				logger.log(Level.INFO,"SuperX is checking mails for new heartbeats...");
+
+				
+				Folder inbox=sxmail.getInbox();
+				//if (inbox.hasNewMessages())
+					processNewMessages(inbox.getMessages()); // processed messages will be deleted -> don#t need inbox.search(flagUnseen)); // former first attempt was : processNewMessages(inbox.getMessages()); // should be in differnt colour (<- British English)
+				
+					sxmail.closeInbox(); //deletes marked mails
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+
+		}
+	}
+
+	abstract void processNewMessages(Message[] messages) throws MessagingException, IOException, SQLException;
+
+	public void setActive(boolean isActive) {
+		this.isActive=isActive;
+		
+	}
+
+}
--- a/src/de/memtext/hbt/Checker.java
+++ b/src/de/memtext/hbt/Checker.java
@ -0,0 +1,96 @@
				@@ -0,0 +1,96 @@
+package de.memtext.hbt;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.Store;
+import javax.mail.Transport;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
+public class Checker {
+
+	public static void check(Session emailSession, String user, String password)
+			throws MessagingException, IOException {
+
+		// create the POP3 store object and connect with the pop server
+		// pop3s wichtig -> vermutlich secure
+		Store store = emailSession.getStore("pop3s");
+		store.connect(emailSession.getProperty("mail.pop3.host"), user, password);
+
+		Folder emailFolder = store.getFolder("INBOX");
+		emailFolder.open(Folder.READ_ONLY);
+
+		// messages werden geholt, können nur ausgelesen werden, wenn Folder noch open
+		// ist!
+		Message[] messages = emailFolder.getMessages();
+
+		System.out.println("messages.length---" + messages.length);
+
+		for (int i = 0, n = messages.length; i < n; i++) {
+			Message message = messages[i];
+			System.out.println("---------------------------------");
+			System.out.println("Email Number " + (i + 1));
+			System.out.println("Subject: " + message.getSubject());
+			System.out.println("From: " + message.getFrom()[0]);
+			System.out.println("Text: " + message.getContent().toString());
+
+		}
+
+		// close the store and folder objects
+		emailFolder.close(false);
+		store.close();
+
+	}
+
+	private static void send(Session emailSession, String user, String recipient, String subject, String text,
+			String password) throws AddressException, MessagingException {
+		MimeMessage replyMessage = new MimeMessage(emailSession);
+		// replyMessage = (MimeMessage) message.reply(false);
+		replyMessage.setFrom(new InternetAddress(user));
+		replyMessage.setRecipients(Message.RecipientType.TO, recipient);
+		replyMessage.setSubject(subject);
+		replyMessage.setText(text);
+		Transport t = emailSession.getTransport("smtp");
+		t.connect(user, password);
+		t.sendMessage(replyMessage, replyMessage.getAllRecipients());
+		System.out.println("Message sent...");
+	}
+
+	private static Session initSession(String pophost, String smtphost) {
+		Properties properties = new Properties();
+		properties.put("mail.pop3.host", pophost);
+		properties.put("mail.pop3.port", "995");
+		properties.put("mail.pop3.starttls.enable", "true");
+		properties.put("mail.smtp.auth", "true");
+		properties.put("mail.smtp.starttls.enable", "true");
+		properties.put("mail.smtp.host", smtphost);
+		properties.put("mail.smtp.port", "25");
+		return Session.getDefaultInstance(properties);
+	}
+
+	public static void main(String[] args) {
+		Session session = initSession("pop3.strato.de", "smtp.strato.de");
+		String username = "heartbeat@mbisping.de";
+		String password = "$Anfang1200";
+
+		try {
+			check(session, username, password);
+			send(session, username, "danielq@memtext.de", "From Düsseldorf with fun...", "This is the memtext's first digitial 'heartbeat' :-)\n send via java mail - \nThanks and see you around :-)",
+					password);
+		} catch (MessagingException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+	}
+
+}
--- a/src/de/memtext/hbt/NewHeartBeatAriel.java
+++ b/src/de/memtext/hbt/NewHeartBeatAriel.java
@ -0,0 +1,293 @@
				@@ -0,0 +1,293 @@
+package de.memtext.hbt;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.logging.Level;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.mail.BodyPart;
+import javax.mail.Flags;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Multipart;
+import javax.mail.Part;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.MimeMessage;
+
+import clover.com.atlassian.extras.common.org.springframework.util.StringUtils;
+import de.memtext.db.DbUtils;
+import de.memtext.util.FileUtils;
+import de.memtext.util.MailUtils;
+import de.superx.servlet.SuperXManager;
+import de.superx.servlet.SxMail;
+import de.superx.servlet.SxPools;
+
+public class NewHeartBeatAriel extends AbstractAriel {
+	private static final Pattern pHbtId = Pattern.compile("@hbt:\\d*@");
+
+	public NewHeartBeatAriel(SxMail sxmail) throws IOException {
+		this.sxmail = sxmail;
+		initLogging();
+	}
+
+	void processNewMessages(Message newMessages[]) throws MessagingException, IOException, SQLException {
+
+		
+		logger.log(Level.INFO,"  found " + newMessages.length + " new messages");
+		for (int i = 0, n = newMessages.length; i < n; i++) {
+			Message aNewMessage = newMessages[i];
+
+			String content = MailUtils.getContent(aNewMessage);
+			if (content.indexOf("@hbt:") == -1)
+				createNewHeartBeat(aNewMessage, content);
+			else
+				appendToHeartBeat(aNewMessage, content);
+			// had thought setting via inbox nessary, but that's only the preferred way to
+			// set flags for group of messages since some mail implementations by have
+			// optimized support for groups of messages
+			// inbox.setFlags(new Message[] {message}, , true);
+			// message.setFlags(flagsContainingOnlySeen, true);
+			// unseen wäre schöner, mailapi.jar aktualisieren bei HIS Antrag
+			// nötig,vielleicht klappt mit delete
+			aNewMessage.setFlag(Flags.Flag.DELETED, true); // AbstractAriel.run ruft sxmail.closeInbox() auf mit
+															// Anweisung zu löschen
+
+			// sorry to bother you, Garbage collector , need message only to times, hey or
+			// doesn't that matter anyway since only a simple reference (like in good old
+			// C), but clearer/easier to read if line Message message=.. was superfolous
+
+		}
+	}
+
+	private void appendToHeartBeat(Message message, String content)
+			throws SQLException, IOException, MessagingException {
+		StringBuffer result = new StringBuffer();
+		int hbtTid = -1;
+		Connection con = SxPools.getConnection(sxmail.getMandantenID());
+		Statement stm = con.createStatement();
+		boolean isHbtFoundInDb = false;
+		String feedbackSubject = "";
+		Matcher m = pHbtId.matcher(content);
+		boolean foundHbtTag=m.find();
+		if (foundHbtTag) {
+			String hbtIdString = content.substring(m.start() + 5, m.end() - 1);
+			content=content.replaceAll("@hbt:\\d*@", "");
+			try {
+				hbtTid = Integer.parseInt(hbtIdString);
+				if (DbUtils.getInt(con, "select count(*) from hbt_heartbeat where tid=?", hbtTid) > 0)
+					isHbtFoundInDb = true;
+			} catch (NumberFormatException e) {
+				result.append(" hbt:" + hbtIdString
+						+ " konnte nicht in integer transformiert werden, Nachricht wird zwischengespeichert");
+				isHbtFoundInDb = false;
+			}
+			if (isHbtFoundInDb) {
+				// TODO ggfs. mehrer Topics
+				int maxTopic = DbUtils.getInt(con, "select max(tid) from hbt_topic where hbt_id=?", hbtTid);
+				// int maxNote = DbUtils.getInt(stm, "select max(tid) from hbt_note where
+				// hbt_id=" + hbtTid + " hbt_topic_id=" + maxTopic);
+				int newNoteId = createNote(con, stm, hbtTid, maxTopic, message, content);
+				feedbackSubject = "Your new note was added to Heartbeat " + hbtTid;
+				result.append("Feel free to view this HeartBeat by visiting " + sxmail.getWTFAI()
+						+ "/edit/hbt/hbt_viewer.jsp?tid=" + hbtTid + " \n\n" + "Always at your service: \n"
+						+ " your HeartBeatAriel @ SuperX");
+
+			}
+		}
+
+		if (!foundHbtTag || !isHbtFoundInDb) {
+			feedbackSubject = "Sorry, target hbt found found ...";
+			PreparedStatement pst=con.prepareStatement("insert into hbt_tmp_note (note) values (?)");
+			pst.setString(1,content);
+			pst.execute();
+			pst.close();
+			int newNoteId=DbUtils.getInt(stm, "select max(tid) from hbt_tmp_note");
+			result.append("you can select the right hbt_id by visiting  " + sxmail.getWTFAI()+"/servlet/SuperXmlMaske?tid=60040?note_id="+newNoteId);
+		}
+stm.close();
+con.close();
+		sendFeedbackEmail(feedbackSubject, result.toString(), message);
+	}
+
+	private void createNewHeartBeat(Message inMessage, String content)
+			throws SQLException, MessagingException, IOException {
+		int newHbtTid = performHbtInsert(inMessage, content);
+		String text = "Feel free to complete this heartbeat's details by visiting " + sxmail.getWTFAI()
+				+ "/edit/hbt/hbt_edit.jsp?tid=" + newHbtTid + " \n\n" + "Always at your service: \n"
+				+ " your HeartBeatAriel @ SuperX";
+		sendFeedbackEmail("Your new digital heartbeat has been created ...", text, inMessage);
+	}
+
+	/**
+	 * Performs the creation of a new HeartBeat in the database
+	 * 
+	 * @param message
+	 * @return newHbtTid
+	 * @throws SQLException
+	 * @throws MessagingException
+	 * @throws IOException
+	 */
+	private int performHbtInsert(Message m, String content) throws SQLException, IOException, MessagingException {
+		Connection con = SxPools.getConnection(sxmail.getMandantenID());
+		Statement stm = con.createStatement();
+
+		int newHbtTid = createHbt(con, stm, content, m.getSubject());
+		int newTopicId = createTopic(stm, newHbtTid);
+		createNote(con, stm, newHbtTid, newTopicId, m, content);
+		con.close();
+		return newHbtTid;
+	}
+
+	private int createHbt(Connection dbConnection, Statement stm, String content, String subject)
+			throws IOException, MessagingException, SQLException {
+		String primary_customer_id = identifyPrimaryCustomerId(dbConnection, stm, content);
+		String name = StringUtils.replace(subject, "'", "''");// for SQL insert
+		// Sql insert - fuck prepared statements, nobody hacks this, I don't give a
+		// shit, not worth my extra time or effort, I want to get things done now while
+		// having fun :-)
+		stm.execute("select sp_update_sequence('hbt_heartbeat')");
+		String insertSql = "INSERT INTO hbt_heartbeat \n" + "( primary_customer_id,name," + "  created_at, \n"
+				+ "  status \n" + ") \n" + "VALUES \n" + "( " + primary_customer_id + ",'" + name + "', "
+				+ "  today(), \n" + "  1 \n" + ") " + "";
+		stm.execute(insertSql);
+		int newHbtTid = DbUtils.getInt(stm, "select max(tid) from hbt_heartbeat");
+		return newHbtTid;
+	}
+
+	/**
+	 * 
+	 * Wenn im Text der weitergeleiteten Email der Absender mit @@ markiert ist,
+	 * z.B. @@hiber@his.de@@, diesen auslesen zugehörige Organisation auslesen
+	 * 
+	 * @param m
+	 * @return String null oder key_apnr z.B. '1001'
+	 * @throws IOException
+	 * @throws MessagingException
+	 * @throws SQLException
+	 */
+	private String identifyPrimaryCustomerId(Connection con, Statement stm, String content)
+			throws IOException, MessagingException, SQLException {
+		String result = "null";
+		int pos1 = content.indexOf("@@");
+		int pos2 = content.substring(pos1 + 2).indexOf("@@");
+		if (pos1 > -1 && pos2 > -1) {
+			String absender = content.substring(pos1 + 2);
+			absender = absender.substring(0, absender.lastIndexOf("@@"));
+			logger.log(Level.INFO,"  checking customer " + absender);
+			int userinfo_id = DbUtils.getInt(con, "select tid from userinfo where email=?", absender);
+			result = DbUtils.getString(stm,
+					"select min(ch110_institut) from user_institution where userid=" + userinfo_id);
+
+			if (result == null)
+				result = "null";
+			else
+				result = "'" + result + "'";
+		}
+		return result;
+	}
+
+	private int createTopic(Statement stm, int newHbtTid) throws SQLException {
+		stm.execute("select sp_update_sequence('hbt_topic')");
+		String insertSql = "INSERT INTO hbt_topic \n" + "( hbt_id,name, created_at)" + "VALUES (" + newHbtTid
+				+ ",'Start',now() )";
+		stm.execute(insertSql);
+		int newTopicId = DbUtils.getInt(stm, "select max(tid) from hbt_topic");
+		return newTopicId;
+	}
+
+	private int createNote(Connection con, Statement stm, int hbtId, int topicId, Message m, String content)
+			throws IOException, MessagingException, SQLException {
+		stm.execute("select sp_update_sequence('hbt_note')");
+		PreparedStatement pst = con
+				.prepareStatement(" INSERT INTO hbt_note (hbt_id,hbt_topic_id,note, created_at) VALUES (?,?,?,now());");
+		pst.setInt(1, hbtId);
+		pst.setInt(2, topicId);
+
+		pst.setString(3, content);
+		pst.execute();
+		pst.close();
+		int newNoteId = DbUtils.getInt(stm, "select max(tid) from hbt_note");
+		saveAttachments(stm, hbtId, topicId, newNoteId, m);
+		return newNoteId;
+	}
+
+	private void saveAttachments(Statement stm, int newHbtTid, int newTopicId, int newNoteId, Message m)
+			throws IOException, MessagingException, SQLException {
+		// List<String> attachments = new ArrayList<String>();
+		Object content = m.getContent();
+		// if (content instanceof String) return null;
+
+		if (content instanceof Multipart) {
+			Multipart multipart = (Multipart) content;
+			for (int i = 0; i < multipart.getCount(); i++) {
+				BodyPart part = multipart.getBodyPart(i);
+				logger.log(Level.INFO,part.getFileName() + " " + part.getContentType() + " " + part.getDisposition());
+				if (part.getDisposition() != null && part.getDisposition().equalsIgnoreCase(Part.ATTACHMENT)) {
+					// result.addAll(getAttachments(multipart.getBodyPart(i)));
+					String filename = SuperXManager.getWEB_INFPfad()+"/downloads/hbt_"+newHbtTid+"_" +newNoteId+"_"+FileUtils.removeProblemChars(part.getFileName());
+					sxDownloadsInsert(stm, newHbtTid, newTopicId, newNoteId, filename, part.getContentType());
+					// javaxmail >1.4 bodyPart.saveFile(filename);
+					// old version
+					InputStream is = part.getInputStream();
+					File f = new File(filename);
+					FileOutputStream fos = new FileOutputStream(f);
+					byte[] buf = new byte[4096];
+					int bytesRead;
+					while ((bytesRead = is.read(buf)) != -1) {
+						fos.write(buf, 0, bytesRead);
+					}
+					fos.close();
+					logger.log(Level.INFO," saving attachment " + (i++) + " as " + filename);
+				}
+			}
+
+		}
+
+	}
+
+	private void sxDownloadsInsert(Statement stm, int newHbtTid, int newTopicId, int newNoteId, String filename,
+			String contenttype) throws SQLException {
+		stm.execute("select sp_update_sequence('sx_downloads')");
+		String filenameShort = filename.substring(filename.indexOf(File.separator + "hbt") + 1);
+		String insertSQLSxDownloads = "INSERT INTO sx_downloads \n" + "( \n" + "  name, \n" + "  importdatum, \n"
+				+ "  kommentar, \n" + "  kommentar_url, \n" + "  contenttype, \n" + "  datei, \n" + "  gueltig_seit, \n"
+				+ "  gueltig_bis \n" + ") \n" + "VALUES \n" + "( \n" + "  '" + filenameShort + "', \n" + "  today(), \n"
+				+ "  'kommentar_value', \n" + "  'kommentar_url_value', \n" + "  '" + contenttype + "', \n" + "  '"
+				+ filenameShort + "', \n" + "  today(), \n" + "  date_val('1.1.3000') \n" + ") \n" + "";
+		stm.execute(insertSQLSxDownloads);
+		int newDownloadTid = DbUtils.getInt(stm, "select max(tid) from sx_downloads");
+		stm.executeUpdate("insert into hbt_attachment (hbt_id,topic_id,note_id,download_id) values (" + newHbtTid + ","
+				+ newTopicId + "," + newNoteId + "," + newDownloadTid + ")");
+	}
+
+	/**
+	 * sendFeedBackEmail -- hier hätte ich gern automatisch newline in Zeile 60
+	 * direkt unter createNewHeartBeat automatisch erzeugt, dann nach weiter unten
+	 * im Quelltext verlagert, damit von der Reihenfolge in
+	 * createNewHeartBeat(Message message) her passt
+	 * 
+	 * @param newHbtTid : tid von neuem HeartBeat in der Datenbank
+	 * @param inMessage
+	 * @throws MessagingException
+	 * @throws AddressException
+	 */
+	private void sendFeedbackEmail(String subject, String text, Message inMessage)
+			throws AddressException, MessagingException {
+		MimeMessage reply = sxmail.createMessage();
+		reply.setRecipients(Message.RecipientType.TO, inMessage.getFrom());
+		reply.setSubject(subject);
+		reply.setText(text);
+		sxmail.setMessage(reply);
+
+		logger.log(Level.INFO,"Reply message happily sent...");
+	}
+
+	
+}
--- a/src/de/memtext/icons/ArrowDownIcon.java
+++ b/src/de/memtext/icons/ArrowDownIcon.java
@ -1,11 +1,10 @@
				@@ -1,11 +1,10 @@
-package de.memtext.icons;
-
-import java.awt.Graphics;
-
-public class ArrowDownIcon extends BasicIcon {
-    @Override
-    public void myPaint(Graphics g) {
-        drawArrowDown(g, 6);
-    }
-
-}
+package de.memtext.icons;
+
+import java.awt.Graphics;
+
+public class ArrowDownIcon extends BasicIcon {
+	public void myPaint(Graphics g) {
+		drawArrowDown(g, 6);
+	}
+
+}
--- a/src/de/memtext/icons/ArrowRight.java
+++ b/src/de/memtext/icons/ArrowRight.java
@ -1,14 +1,13 @@
				@@ -1,14 +1,13 @@
-package de.memtext.icons;
-
-import java.awt.Graphics;
-
-public class ArrowRight extends BasicIcon {
-
-    @Override
-    void myPaint(Graphics g) {
-        drawArrowRight(g);
-    }
-
-}
-
+package de.memtext.icons;
+
+import java.awt.Graphics;
+
+public class ArrowRight extends BasicIcon {
+
+	void myPaint(Graphics g) {
+		drawArrowRight(g);
+	}
+
+}
+
 //Created on 17.04.2004 at 21:42:08
--- a/src/de/memtext/icons/ArrowUpIcon.java
+++ b/src/de/memtext/icons/ArrowUpIcon.java
@ -1,15 +1,14 @@
				@@ -1,15 +1,14 @@
-package de.memtext.icons;
-
-import java.awt.Graphics;
-
-import javax.swing.Icon;
-
-public class ArrowUpIcon extends BasicIcon implements Icon {
-
-    @Override
-    public void myPaint(Graphics g) {
-        drawArrowUp(g, 4);
-
-    }
-
-}
+package de.memtext.icons;
+
+import java.awt.Graphics;
+
+import javax.swing.Icon;
+
+public class ArrowUpIcon extends BasicIcon implements Icon {
+
+	public void myPaint(Graphics g) {
+		drawArrowUp(g, 4);
+
+	}
+
+}
--- a/src/de/memtext/icons/BasicIcon.java
+++ b/src/de/memtext/icons/BasicIcon.java
@ -1,109 +1,99 @@
				@@ -1,109 +1,99 @@
-package de.memtext.icons;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-
-import javax.swing.Icon;
-import javax.swing.JButton;
-
-public abstract class BasicIcon implements Icon {
-    private int iconWidth = 16, iconHeight = 16;
-
-    private Color color = Color.black;
-
-    /**
-     * @see javax.swing.Icon#getIconWidth()
-     */
-    @Override
-    public int getIconWidth() {
-        return iconWidth;
-    }
-
-    /**
-     * @see javax.swing.Icon#getIconHeight()
-     */
-    @Override
-    public int getIconHeight() {
-        return iconHeight;
-    }
-
-    @Override
-    public void paintIcon(Component c, Graphics g, int x, int y) {
-        g.translate(x, y);
-        if (c.isEnabled())
-            g.setColor(color);
-        else
-            g.setColor(Color.GRAY);
-        myPaint(g);
-        g.translate(-x, -y);
-    }
-
-    abstract void myPaint(Graphics g);
-
-    void drawDoubleLine(Graphics g, int y) {
-        if (y > getIconHeight() - 2) throw new IllegalArgumentException("can't draw that low");
-        g.drawLine(0, y, getIconWidth(), y);
-        g.drawLine(0, y + 1, getIconWidth(), y + 1);
-    }
-
-    void drawArrowRight(Graphics g) {
-        int midx = (int) Math.floor(getIconWidth() / 2);
-        int midy = (int) Math.floor(getIconHeight() / 2);
-        //		mittellinie
-        g.drawLine(0, midy - 1, getIconWidth(), midy - 1);
-        g.drawLine(0, midy, getIconWidth(), midy);
-        g.drawLine(0, midy + 1, getIconWidth(), midy + 1);
-
-        g.drawLine(midx + 1, 1, getIconWidth(), midy - 1);
-        g.drawLine(midx + 1, 2, getIconWidth(), midy);
-
-        g.drawLine(midx + 1, getIconHeight() - 1, getIconWidth(), midy + 1);
-        g.drawLine(midx + 1, getIconHeight() - 2, getIconWidth(), midy);
-
-    }
-
-    void drawArrowUp(Graphics g, int y) {
-        int midx = (int) Math.floor(getIconWidth() / 2);
-        int midy = (int) Math.floor(getIconHeight() / 2);
-        g.drawLine(0, y + midy, midx, y);
-        g.drawLine(midx, y, getIconWidth(), y + midy);
-        g.drawLine(0, y + midy + 1, midx, y + 1);
-        g.drawLine(midx, y + 1, getIconWidth(), y + midy + 1);
-
-    }
-
-    void drawArrowDown(Graphics g, int y) {
-        int midx = (int) Math.floor(getIconWidth() / 2);
-        int midy = (int) Math.floor(getIconHeight() / 2);
-        g.drawLine(0, y, midx, midy + y);
-        g.drawLine(midx, y + midy, getIconWidth(), y);
-        g.drawLine(0, y + 1, midx, midy + y + 1);
-        g.drawLine(midx, y + midy + 1, getIconWidth(), y + 1);
-
-    }
-
-    public static void main(String[] args) {
-        de.memtext.widgets.MBFrame f = new de.memtext.widgets.MBFrame("test");
-        f.setCenter(new JButton("test", new ArrowRight()));
-        f.pack();
-        f.show();
-    }
-
-    public void setIconHeight(int i) {
-        iconHeight = i;
-    }
-
-    public void setIconWidth(int i) {
-        iconWidth = i;
-    }
-
-    public Color getColor() {
-        return color;
-    }
-
-    public void setColor(Color color) {
-        this.color = color;
-    }
-
-}
+package de.memtext.icons;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+
+import javax.swing.Icon;
+import javax.swing.JButton;
+
+public abstract class BasicIcon implements Icon {
+	private int iconWidth = 16, iconHeight = 16;
+	private Color color = Color.black;
+	/**
+	 * @see javax.swing.Icon#getIconWidth()
+	 */
+	public int getIconWidth() {
+		return iconWidth;
+	}
+
+	/**
+	 * @see javax.swing.Icon#getIconHeight()
+	 */
+	public int getIconHeight() {
+		return iconHeight;
+	}
+	public void paintIcon(Component c, Graphics g, int x, int y) {
+		g.translate(x, y);
+		if (c.isEnabled())
+			g.setColor(color);
+		else
+			g.setColor(Color.GRAY);
+		myPaint(g);
+		g.translate(-x, -y);
+	}
+	abstract void myPaint(Graphics g);
+	void drawDoubleLine(Graphics g, int y) {
+		if (y > getIconHeight() - 2)
+			throw new IllegalArgumentException("can't draw that low");
+		g.drawLine(0, y, getIconWidth(), y);
+		g.drawLine(0, y + 1, getIconWidth(), y + 1);
+	}
+
+	void drawArrowRight(Graphics g) {
+		int midx = (int) Math.floor(getIconWidth() / 2);
+		int midy = (int) Math.floor(getIconHeight() / 2);
+		//		mittellinie
+		g.drawLine(0, midy - 1, getIconWidth(), midy - 1);
+		g.drawLine(0, midy, getIconWidth(), midy);
+		g.drawLine(0, midy + 1, getIconWidth(), midy + 1);
+
+		g.drawLine(midx + 1, 1, getIconWidth(), midy - 1);
+		g.drawLine(midx + 1, 2, getIconWidth(), midy);
+
+		g.drawLine(midx + 1, getIconHeight() - 1, getIconWidth(), midy + 1);
+		g.drawLine(midx + 1, getIconHeight() - 2, getIconWidth(), midy);
+
+	}
+
+	void drawArrowUp(Graphics g, int y) {
+		int midx = (int) Math.floor(getIconWidth() / 2);
+		int midy = (int) Math.floor(getIconHeight() / 2);
+		g.drawLine(0, y + midy, midx, y);
+		g.drawLine(midx, y, getIconWidth(), y + midy);
+		g.drawLine(0, y + midy + 1, midx, y + 1);
+		g.drawLine(midx, y + 1, getIconWidth(), y + midy + 1);
+
+	}
+	void drawArrowDown(Graphics g, int y) {
+		int midx = (int) Math.floor(getIconWidth() / 2);
+		int midy = (int) Math.floor(getIconHeight() / 2);
+		g.drawLine(0, y, midx, midy + y);
+		g.drawLine(midx, y + midy, getIconWidth(), y);
+		g.drawLine(0, y + 1, midx, midy + y + 1);
+		g.drawLine(midx, y + midy + 1, getIconWidth(), y + 1);
+
+	}
+	public static void main(String[] args) {
+		de.memtext.widgets.MBFrame f = new de.memtext.widgets.MBFrame("test");
+		f.setCenter(new JButton("test", new ArrowRight()));
+		f.pack();
+		f.show();
+	}
+	public void setIconHeight(int i) {
+		iconHeight = i;
+	}
+
+	public void setIconWidth(int i) {
+		iconWidth = i;
+	}
+
+	public Color getColor() {
+		return color;
+	}
+
+	public void setColor(Color color) {
+		this.color = color;
+	}
+
+}
--- a/src/de/memtext/icons/DoubleArrowDownIcon.java
+++ b/src/de/memtext/icons/DoubleArrowDownIcon.java
@ -1,16 +1,16 @@
				@@ -1,16 +1,16 @@
-package de.memtext.icons;
-
-import java.awt.Graphics;
-
-
-public class DoubleArrowDownIcon extends BasicIcon {
-    @Override
-    public void myPaint(Graphics g) {
-        drawArrowDown(g, 2);
-        drawArrowDown(g, 6);
-
-
-    }
-
-}
-
+package de.memtext.icons;
+
+import java.awt.Graphics;
+
+
+public class DoubleArrowDownIcon extends BasicIcon {
+public void myPaint(Graphics g)
+{
+drawArrowDown(g,2);
+drawArrowDown(g,6);
+
+
+} 
+
+}
+
--- a/src/de/memtext/icons/DoubleArrowDownLineIcon.java
+++ b/src/de/memtext/icons/DoubleArrowDownLineIcon.java
@ -1,23 +1,23 @@
				@@ -1,23 +1,23 @@
-package de.memtext.icons;
-
-import java.awt.Graphics;
-
-/**
- * @author MB
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DoubleArrowDownLineIcon extends BasicIcon {
-    @Override
-    public void myPaint(Graphics g) {
-        drawArrowDown(g, 0);
-        drawArrowDown(g, 4);
-        drawDoubleLine(g, getIconHeight() - 2);
-
-    }
-
-}
-
+package de.memtext.icons;
+
+import java.awt.Graphics;
+
+/**
+ * @author MB
+ *
+ * To change this generated comment edit the template variable "typecomment":
+ * Window>Preferences>Java>Templates.
+ * To enable and disable the creation of type comments go to
+ * Window>Preferences>Java>Code Generation.
+ */
+public class DoubleArrowDownLineIcon extends BasicIcon {
+public void myPaint(Graphics g)
+{
+drawArrowDown(g,0);
+drawArrowDown(g,4);
+drawDoubleLine(g,getIconHeight()-2);
+
+} 
+
+}
+
--- a/src/de/memtext/icons/DoubleArrowUpIcon.java
+++ b/src/de/memtext/icons/DoubleArrowUpIcon.java
@ -1,22 +1,22 @@
				@@ -1,22 +1,22 @@
-package de.memtext.icons;
-
-import java.awt.Graphics;
-
-/**
- * @author MB
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DoubleArrowUpIcon extends BasicIcon {
-    @Override
-    public void myPaint(Graphics g) {
-        drawArrowUp(g, 0);
-        drawArrowUp(g, 4);
-
-    }
-
-}
-
+package de.memtext.icons;
+
+import java.awt.Graphics;
+
+/**
+ * @author MB
+ *
+ * To change this generated comment edit the template variable "typecomment":
+ * Window>Preferences>Java>Templates.
+ * To enable and disable the creation of type comments go to
+ * Window>Preferences>Java>Code Generation.
+ */
+public class DoubleArrowUpIcon extends BasicIcon {
+public void myPaint(Graphics g)
+{
+drawArrowUp(g,0);
+drawArrowUp(g,4);
+
+} 
+
+}
+
--- a/Show More
+++ b/Show More