Anpassungen. Funktioniert nicht

src/de/memtext/baseobjects/ActivatableItem.java

@@ -6,26 +6,30 @@ package de.memtext.baseobjects;
  * */
 public class ActivatableItem implements ActivatableItemI {
     private static final long serialVersionUID = 1;
-private boolean isActive;
-	/**
-	 * 
-	 */
-	public ActivatableItem() {
-		super();
-	}
 
-	/* (non-Javadoc)
+    private boolean isActive;
-	 * @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) {
+    public ActivatableItem() {
-		 this.isActive=isActive;
+        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;
+    }
 
 }

src/de/memtext/baseobjects/ActivatableItemI.java

@@ -5,6 +5,7 @@ package de.memtext.baseobjects;
  *  @author MB
  * */
 public interface ActivatableItemI {
-boolean isActive();
+    boolean isActive();
-void setActive(boolean isActive);
+
+    void setActive(boolean isActive);
 }

src/de/memtext/baseobjects/ComparableObject.java

@@ -2,6 +2,7 @@ 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) {
@@ -9,12 +10,11 @@ public class ComparableObject extends NamedObject implements Comparable {
         this.sortNr = sortNr;
     }
 
+    @Override
     public int compareTo(Object o) {
         int result = 0;
-        if (getSortNr() < ((ComparableObject) o).getSortNr())
+        if (getSortNr() < ((ComparableObject) o).getSortNr()) result = -1;
-            result = -1;
+        if (getSortNr() > ((ComparableObject) o).getSortNr()) result = 1;
-        if (getSortNr() > ((ComparableObject) o).getSortNr())
-            result = 1;
         return result;
     }
 
@@ -22,12 +22,11 @@ public class ComparableObject extends NamedObject implements Comparable {
         return sortNr;
     }
 
+    @Override
     public boolean equals(Object o) {
         boolean result = false;
         ComparableObject comp = (ComparableObject) o;
-        if (this.getName().equals(comp.getName())
+        if (this.getName().equals(comp.getName()) && this.getSortNr() == comp.getSortNr()) result = true;
-                && this.getSortNr() == comp.getSortNr())
-            result = true;
 
         return result;
     }

src/de/memtext/baseobjects/DataList.java

@@ -19,32 +19,34 @@ import java.util.LinkedList;
 public class DataList extends LinkedList {
     private static final long serialVersionUID = 1;
 
-	/**
+    /**
-	 * 
+     * 
-	 */
+     */
-	public DataList() {
+    public DataList() {
-		super();
+        super();
-	}
+    }
-
+
-	/**
+    /**
-	 * @param c
+     * @param c
-	 */
+     */
-	public DataList(Collection c) {
+    public DataList(Collection c) {
-		super(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.
+     * 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) {
+    @Override
-			this.add(null);
+    public Object set(int index, Object o) {
-		}
+        while (index > this.size() - 1) {
-		Object previous = this.get(index);
+            this.add(null);
-		super.set(index, o);
+        }
-		return previous;
+        Object previous = this.get(index);
-	}
+        super.set(index, o);
+        return previous;
+    }
 
 }

src/de/memtext/baseobjects/DoubleClickMouseListener.java

@@ -5,13 +5,16 @@ import java.awt.event.MouseEvent;
 
 public abstract class DoubleClickMouseListener extends MouseAdapter {
 
-	public DoubleClickMouseListener() {
+    public DoubleClickMouseListener() {
-		super();
+        super();
-	}
+    }
-	public final void mousePressed(MouseEvent e) {
+
-			if (e.getClickCount() == 2) doubleClickOccured();
+    @Override
-}
+    public final void mousePressed(MouseEvent e) {
-	protected abstract void doubleClickOccured() ;
+        if (e.getClickCount() == 2) doubleClickOccured();
+    }
+
+    protected abstract void doubleClickOccured();
 
 
 }

src/de/memtext/baseobjects/IdObject.java

@@ -6,45 +6,52 @@ import java.io.Serializable;
  *
  *  @author MB
  * */
-public class IdObject  implements IdObjectI,Serializable {
+public class IdObject implements IdObjectI, Serializable {
-	private Object id;
+    private Object id;
-	private static final long serialVersionUID = 1;
+
-	public IdObject() {
+    private static final long serialVersionUID = 1;
-
+
-	}
+    public IdObject() {
-	public IdObject(Object id) {
+
-		setId(id);
+    }
-		
+
-	}
+    public IdObject(Object id) {
-
+        setId(id);
-	/**
+
-	 * @return
+    }
-	 */
+
-	public Object getId() {
+    /**
-		return id;
+     * @return
-	}
+     */
-
+    @Override
-
+    public Object getId() {
-
+        return id;
-	/**
+    }
-	 * @param object
+
-	 */
+
-	public void setId(Object object) {
+
-		id = object;
+    /**
-	}
+     * @param object
-
+     */
-	public String toString()
+    @Override
-	{
+    public void setId(Object object) {
-	    return "id:"+getId();
+        id = object;
-	}
+    }
-	/**
+
-	 * Provides a deep copy
+    @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))
+        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());
+            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());
+        IdObject cl = new IdObject(this.getId());
-       return cl;
+        return cl;
     }
 }

src/de/memtext/baseobjects/IdObjectI.java

@@ -1,10 +1,12 @@
 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 Object getId();
-	public void setId(Object id);
+
+    public void setId(Object id);
 
 }
 

src/de/memtext/baseobjects/NameDecorator.java

@@ -5,24 +5,29 @@ 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{
+public final class NameDecorator implements NamedObjectI {
-private Object object;
+    private Object object;
-private String name;
+
-	public NameDecorator(String name,Object object) {
+    private String name;
-		this.name=name;
+
-		this.object=object;
+    public NameDecorator(String name, Object object) {
-	}
+        this.name = name;
-	public String getName() {
+        this.object = object;
-		return name;
+    }
-	}
+
-	public void setName(String name) {
+    @Override
-		this.name=name;
+    public String getName() {
-	}
+        return name;
-
+    }
-	public Object getObject()
+
-	{
+    @Override
-		return object;
+    public void setName(String name) {
-	}
+        this.name = name;
+    }
+
+    public Object getObject() {
+        return object;
+    }
 }
 
 //Created on 25.11.2003 at 14:49:50

src/de/memtext/baseobjects/NamedIdObject.java

@@ -9,10 +9,11 @@ import de.memtext.util.HashCodeUtil;
  * 
  * @author MB
  */
-public class NamedIdObject extends NamedObject implements NamedIdObjectI,
+public class NamedIdObject extends NamedObject implements NamedIdObjectI, Serializable {
-        Serializable {
     private Object id;
+
     private static final long serialVersionUID = 1;
+
     public NamedIdObject() {
     }
 
@@ -28,6 +29,7 @@ public class NamedIdObject extends NamedObject implements NamedIdObjectI,
     /**
      * @return
      */
+    @Override
     public Object getId() {
         return id;
     }
@@ -35,47 +37,50 @@ public class NamedIdObject extends NamedObject implements NamedIdObjectI,
     /**
      * @param object
      */
+    @Override
     public void setId(Object id) {
         this.id = id;
     }
 
+    @Override
     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());
 
+    @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;
     }
-    return result;
+
-}
+    @Override
-public int hashCode(){
+    public int hashCode() {
         int result = HashCodeUtil.SEED;
         //collect the contributions of various fields
         result = HashCodeUtil.hash(result, getId());
-       result = HashCodeUtil.hash(result, getName());
+        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(
+            throw new CloneNotSupportedException(" You have to check in NamedIdObject.clone if deep copying is necessary for class " + id.getClass());
-                    " You have to check in NamedIdObject.clone if deep copying is necessary for class "
-                            + id.getClass());
 
-        if (this.id != null)
+        if (this.id != null) cl.setId(id);
-            cl.setId(id);
         return cl;
     }
 

src/de/memtext/baseobjects/NamedIdObjectI.java

@@ -4,7 +4,7 @@ package de.memtext.baseobjects;
  *
  *  @author MB
  * */
-public interface NamedIdObjectI extends NamedObjectI, IdObjectI{
+public interface NamedIdObjectI extends NamedObjectI, IdObjectI {
 
 
 }

src/de/memtext/baseobjects/NamedIdObjectWithParent.java

@@ -6,10 +6,11 @@ import de.memtext.tree.KeyParentEqualException;
 import de.memtext.util.EqualsUtil;
 import de.memtext.util.HashCodeUtil;
 
-public class NamedIdObjectWithParent extends NamedIdObject implements
+public class NamedIdObjectWithParent extends NamedIdObject implements NamedIdObjectWithParentI, Serializable {
-        NamedIdObjectWithParentI, Serializable {
     private Object parentKey;
+
     private static final long serialVersionUID = 1;
+
     public NamedIdObjectWithParent() {
         super();
     }
@@ -23,33 +24,31 @@ public class NamedIdObjectWithParent extends NamedIdObject implements
         super(id, name);
     }
 
-    public NamedIdObjectWithParent(Object id, String name, Object parentKey)
+    public NamedIdObjectWithParent(Object id, String name, Object parentKey) throws KeyParentEqualException {
-            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)
+        if ((getId() == null && getParentKey() == null) || (getId() != null && getId().equals(getParentKey()))) throw new KeyParentEqualException((NamedIdObjectWithParentI) this);
-                || (getId() != null && getId().equals(getParentKey())))
-            throw new KeyParentEqualException((NamedIdObjectWithParentI) this);
     }
-//TODO aufteilen auf übergeordnete Objekte
+
+    //TODO aufteilen auf übergeordnete Objekte
+    @Override
     public boolean equals(Object obj) {
 
-        if ( this == obj ) return true;
+        if (this == obj) return true;
-      if ( obj == null || obj.getClass() != this.getClass() ) return false;
+        if (obj == null || obj.getClass() != this.getClass()) return false;
 
-      NamedIdObjectWithParent i2=(NamedIdObjectWithParent)obj;
+        NamedIdObjectWithParent i2 = (NamedIdObjectWithParent) obj;
-      return
+        return EqualsUtil.areEqual(this.getId(), i2.getId()) && EqualsUtil.areEqual(this.getName(), i2.getName()) && EqualsUtil.areEqual(this.getParentKey(), i2.getParentKey());
-        EqualsUtil.areEqual(this.getId(), i2.getId()) &&
-        EqualsUtil.areEqual(this.getName(), i2.getName()) &&
-        EqualsUtil.areEqual(this.getParentKey(), i2.getParentKey());
 
 
     }
@@ -57,33 +56,31 @@ public class NamedIdObjectWithParent extends NamedIdObject implements
     /* 
      * @see java.lang.Object#hashCode()
      */
+    @Override
     public int hashCode() {
         int result = HashCodeUtil.SEED;
-         result = HashCodeUtil.hash(result, getId());
+        result = HashCodeUtil.hash(result, getId());
-         result = HashCodeUtil.hash(result, getName());
+        result = HashCodeUtil.hash(result, getName());
-         result = HashCodeUtil.hash(result, getParentKey());
+        result = HashCodeUtil.hash(result, getParentKey());
-         return result ;
+        return result;
     }
+
     /**
      * Provides a deep copy
      */
+    @Override
     public Object clone() throws CloneNotSupportedException {
 
-        NamedIdObjectWithParent cl = new NamedIdObjectWithParent(
+        NamedIdObjectWithParent cl = new NamedIdObjectWithParent((NamedIdObject) super.clone());
-                (NamedIdObject) super.clone());
+
-
+        if (parentKey != null && !(parentKey instanceof String) && !(parentKey instanceof Integer))
-        if (parentKey != null && !(parentKey instanceof String)
+            throw new CloneNotSupportedException(" You have to check in NamedIdObjectWithParent.clone if deep copying is necessary for class " + parentKey.getClass());
-                && !(parentKey instanceof Integer))
+
-            throw new CloneNotSupportedException(
+        if (this.parentKey != null) try {
-                    " You have to check in NamedIdObjectWithParent.clone if deep copying is necessary for class "
+            cl.setParentKey(this.parentKey);
-                            + parentKey.getClass());
+        } catch (KeyParentEqualException e) {
-
+            throw new CloneNotSupportedException("Cloning didn't work" + e);
-        if (this.parentKey != null)
+        }
-            try {
-                cl.setParentKey(this.parentKey);
-            } catch (KeyParentEqualException e) {
-                throw new CloneNotSupportedException("Cloning didn't work" + e);
-            }
         return cl;
     }
 }

src/de/memtext/baseobjects/NamedIdObjectWithParentI.java

@@ -3,7 +3,8 @@ package de.memtext.baseobjects;
 import de.memtext.tree.KeyParentEqualException;
 
 public interface NamedIdObjectWithParentI extends NamedIdObjectI {
-	public Object getParentKey();
+    public Object getParentKey();
-	public void setParentKey(Object parentKey) throws KeyParentEqualException;
+
+    public void setParentKey(Object parentKey) throws KeyParentEqualException;
 }
 //Created on 18.11.2003

src/de/memtext/baseobjects/NamedObject.java

@@ -6,44 +6,52 @@ import java.io.Serializable;
  *
  *  @author MB
  * */
-public class NamedObject implements NamedObjectI,Serializable {
+public class NamedObject implements NamedObjectI, Serializable {
-		private String name;
+    private String name;
-		private static final long serialVersionUID = 1;
+
-	/**
+    private static final long serialVersionUID = 1;
-	 * 
+
-	 */
+    /**
-
+     * 
-	public NamedObject() {
+     */
-
+
-	}
+    public NamedObject() {
-	public NamedObject(String name) {
+
-				setName(name);
+    }
-	}
+
-
+    public NamedObject(String name) {
-	
+        setName(name);
-	/**
+    }
-	 * @return
+
-	 */
+
-	public String getName() {
+    /**
-		return name;
+     * @return
-	}
+     */
-
+    @Override
-	
+    public String getName() {
-
+        return name;
-	/**
+    }
-	 * @param string
+
-	 */
+
-	public void setName(String string) {
+
-		name = string;
+    /**
-	}
+     * @param string
-	public String toString() {
+     */
-		return name;
+    @Override
-	}
+    public void setName(String string) {
-
+        name = string;
-	/**
+    }
-	 * Provides a deep copy
+
-	 */
+    @Override
+    public String toString() {
+        return name;
+    }
+
+    /**
+     * Provides a deep copy
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-              return new NamedObject(this.getName());
+        return new NamedObject(this.getName());
     }
 }

src/de/memtext/baseobjects/NamedObjectI.java

@@ -6,8 +6,10 @@ package de.memtext.baseobjects;
  * */
 public interface NamedObjectI {
 
-	public String getName();
+    public String getName();
 
-	public void setName(String name);
+    public void setName(String name);
-	public String toString();
+
+    @Override
+    public String toString();
 }

src/de/memtext/baseobjects/SearchReplaceTextHolder.java

@@ -1,4 +1,5 @@
 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 
@@ -6,26 +7,27 @@ package de.memtext.baseobjects;
  * By default both are empty strings.
  */
 public class SearchReplaceTextHolder {
-	private String searchText="", replaceText="";
+    private String searchText = "", replaceText = "";
-	public SearchReplaceTextHolder() {
+
-		super();
+    public SearchReplaceTextHolder() {
-	}
+        super();
-
+    }
-	public String getReplaceText() {
+
-		return replaceText;
+    public String getReplaceText() {
-	}
+        return replaceText;
-
+    }
-	public String getSearchText() {
+
-		return searchText;
+    public String getSearchText() {
-	}
+        return searchText;
-
+    }
-	public void setReplaceText(String string) {
+
-		replaceText = string;
+    public void setReplaceText(String string) {
-	}
+        replaceText = string;
-
+    }
-	public void setSearchText(String string) {
+
-		searchText = string;
+    public void setSearchText(String string) {
-	}
+        searchText = string;
+    }
 
 }
 

src/de/memtext/baseobjects/User.java

@@ -13,72 +13,84 @@ import de.memtext.rights.Rights;
  *  @author MB
  * */
 public class User extends NamedIdObject implements Serializable {
-	private List groupMembershipIds = new ArrayList(5);
+    private List groupMembershipIds = new ArrayList(5);
-	private String passwd;
+
-	
+    private String passwd;
-	private Rights rights;
+
-	private boolean isAdmin=false;
+    private Rights rights;
-	private static final long serialVersionUID = 1;
+
-	public User() {
+    private boolean isAdmin = false;
-		setName("");
+
-		setPasswd("");
+    private static final long serialVersionUID = 1;
-	}
+
-	public User(String username, String passwd) {
+    public User() {
-	setName(username);
+        setName("");
-		setPasswd(passwd);
+        setPasswd("");
-
-	}
-
-	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);
     }
+
+    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
+     * @param groupmemberships
-	 */
+     */
-	public void addAllGroupmembershipsById(List groupmemberships) {
+    public void addAllGroupmembershipsById(List groupmemberships) {
-		groupMembershipIds.addAll(groupmemberships);
+        groupMembershipIds.addAll(groupmemberships);
-	}
+    }
-	public void addGroupMembershipById(Integer groupid) {
-		groupMembershipIds.add(groupid);
-	}
 
-	public String getPasswd() {
+    public void addGroupMembershipById(Integer groupid) {
-		return passwd;
+        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) {
+    public Iterator groupmembershipIdIterator() {
-		passwd = pwd;
+        return groupMembershipIds.iterator();
-	}
+    }
 
+    public void removeGroupMembershipById(Integer groupid) {
+        groupMembershipIds.remove(groupid);
+    }
+
+    public void setPasswd(String pwd) {
+        passwd = pwd;
+    }
 
-	public String toString()
-	{
 
-		return getName();
+    @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;
     }

src/de/memtext/baseobjects/coll/ActivatableItemList.java

@@ -13,309 +13,335 @@ import de.memtext.baseobjects.ActivatableItemI;
  *
  *  @author MB
  * */
-public class ActivatableItemList implements List,Serializable {
+public class ActivatableItemList implements List, Serializable {
-	private List collect = new LinkedList();
+    private List collect = new LinkedList();
-	 private static final long serialVersionUID = 1;
+
-	/**
+    private static final long serialVersionUID = 1;
-	 * 
+
-	 */
+    /**
-	public ActivatableItemList() {
+     * 
-		super();
+     */
-	}
+    public ActivatableItemList() {
-
+        super();
-	public Iterator activeItemIterator() {
+    }
-		return getActiveItems().iterator();
+
-	}
+    public Iterator activeItemIterator() {
-
+        return getActiveItems().iterator();
-	public Collection getActiveItems() {
+    }
-		Collection result = new LinkedList();
+
-		for (Iterator iter = this.iterator(); iter.hasNext();) {
+    public Collection getActiveItems() {
-			ActivatableItemI element = (ActivatableItemI) iter.next();
+        Collection result = new LinkedList();
-			if (element.isActive())
+        for (Iterator iter = this.iterator(); iter.hasNext();) {
-				result.add(element);
+            ActivatableItemI element = (ActivatableItemI) iter.next();
-		}
+            if (element.isActive()) result.add(element);
-		return result;
+        }
-	}
+        return result;
-	public void setAllActive(boolean active) {
+    }
-		for (Iterator iter = this.iterator(); iter.hasNext();) {
+
-			ActivatableItemI element = (ActivatableItemI) iter.next();
+    public void setAllActive(boolean active) {
-			element.setActive(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();
+    public boolean isAllActive() {
-			if (!element.isActive()) {
+        boolean result = true;
-				result = false;
+        for (Iterator iter = this.iterator(); iter.hasNext();) {
-				break;
+            ActivatableItemI element = (ActivatableItemI) iter.next();
-			}
+            if (!element.isActive()) {
-		}
+                result = false;
-		return result;
+                break;
-	}
+            }
-	public boolean isAllDeactivated() {
+        }
-		boolean result = true;
+        return result;
-		for (Iterator iter = this.iterator(); iter.hasNext();) {
+    }
-			ActivatableItemI element = (ActivatableItemI) iter.next();
+
-			if (element.isActive()) {
+    public boolean isAllDeactivated() {
-				result = false;
+        boolean result = true;
-				break;
+        for (Iterator iter = this.iterator(); iter.hasNext();) {
-			}
+            ActivatableItemI element = (ActivatableItemI) iter.next();
-		}
+            if (element.isActive()) {
-		return result;
+                result = false;
-	}
+                break;
-	public int activeCount() {
+            }
-		int count = 0;
+        }
-		for (Iterator iter = this.iterator(); iter.hasNext();) {
+        return result;
-			ActivatableItemI element = (ActivatableItemI) iter.next();
+    }
-			if (element.isActive())
+
-				count++;
+    public int activeCount() {
-		}
+        int count = 0;
-		return count;
+        for (Iterator iter = this.iterator(); iter.hasNext();) {
-	}
+            ActivatableItemI element = (ActivatableItemI) iter.next();
-	public int deactivatedCount() {
+            if (element.isActive()) count++;
-
+        }
-		int count = 0;
+        return count;
-		for (Iterator iter = this.iterator(); iter.hasNext();) {
+    }
-			ActivatableItemI element = (ActivatableItemI) iter.next();
+
-			if (!element.isActive())
+    public int deactivatedCount() {
-				count++;
+
-		}
+        int count = 0;
-		return count;
+        for (Iterator iter = this.iterator(); iter.hasNext();) {
-
+            ActivatableItemI element = (ActivatableItemI) iter.next();
-	}
+            if (!element.isActive()) count++;
-	public ActivatableItemI getActiveItem(int pos) {
+        }
-		ActivatableItemI result = null;
+        return count;
-		int i = 0;
+
-
+    }
-		for (Iterator it = activeItemIterator(); it.hasNext();) {
+
-			ActivatableItemI element = (ActivatableItemI) it.next();
+    public ActivatableItemI getActiveItem(int pos) {
-			if (i == pos) {
+        ActivatableItemI result = null;
-				result = element;
+        int i = 0;
-				break;
+
-			}
+        for (Iterator it = activeItemIterator(); it.hasNext();) {
-			i++;
+            ActivatableItemI element = (ActivatableItemI) it.next();
-		}
+            if (i == pos) {
-		if (result == null)
+                result = element;
-			throw new RuntimeException("not found");
+                break;
-
+            }
-		return result;
+            i++;
-	}
+        }
-	/**
+        if (result == null) throw new RuntimeException("not found");
-	 * 
+
-	 * @return null if all deactivated
+        return result;
-	 */
+    }
-	public ActivatableItemI getFirstActive() {
+
-		ActivatableItemI result = null;
+    /**
-		for (Iterator iter = this.iterator(); iter.hasNext();) {
+     * 
-			ActivatableItemI element = (ActivatableItemI) iter.next();
+     * @return null if all deactivated
-			if (element.isActive()) {
+     */
-				result = element;
+    public ActivatableItemI getFirstActive() {
-				break;
+        ActivatableItemI result = null;
-			}
+        for (Iterator iter = this.iterator(); iter.hasNext();) {
-		}
+            ActivatableItemI element = (ActivatableItemI) iter.next();
-		return result;
+            if (element.isActive()) {
-	}
+                result = element;
-	/**
+                break;
-		 * 
+            }
-		 * @return null if all active
+        }
-		 */
+        return result;
-	public ActivatableItemI getFirstDeactivated() {
+    }
-		ActivatableItemI result = null;
+
-		for (Iterator iter = this.iterator(); iter.hasNext();) {
+    /**
-			ActivatableItemI element = (ActivatableItemI) iter.next();
+    	 * 
-			if (!element.isActive()) {
+    	 * @return null if all active
-				result = element;
+    	 */
-				break;
+    public ActivatableItemI getFirstDeactivated() {
-			}
+        ActivatableItemI result = null;
-		}
+        for (Iterator iter = this.iterator(); iter.hasNext();) {
-		return result;
+            ActivatableItemI element = (ActivatableItemI) iter.next();
-	}
+            if (!element.isActive()) {
-	/* (non-Javadoc)
+                result = element;
-	 * @see java.util.Collection#size()
+                break;
-	 */
+            }
-	public int size() {
+        }
-		return collect.size();
+        return result;
-	}
+    }
-
+
-	/* (non-Javadoc)
+    /* (non-Javadoc)
-	 * @see java.util.Collection#isEmpty()
+     * @see java.util.Collection#size()
-	 */
+     */
-	public boolean isEmpty() {
+    @Override
-		return collect.isEmpty();
+    public int size() {
-	}
+        return collect.size();
-
+    }
-	/* (non-Javadoc)
+
-	 * @see java.util.Collection#contains(java.lang.Object)
+    /* (non-Javadoc)
-	 */
+     * @see java.util.Collection#isEmpty()
-	public boolean contains(Object o) {
+     */
-		return collect.contains(o);
+    @Override
-	}
+    public boolean isEmpty() {
-
+        return collect.isEmpty();
-	/* (non-Javadoc)
+    }
-	 * @see java.util.Collection#iterator()
+
-	 */
+    /* (non-Javadoc)
-	public Iterator iterator() {
+     * @see java.util.Collection#contains(java.lang.Object)
-		return collect.iterator();
+     */
-	}
+    @Override
-
+    public boolean contains(Object o) {
-	/* (non-Javadoc)
+        return collect.contains(o);
-	 * @see java.util.Collection#toArray()
+    }
-	 */
+
-	public Object[] toArray() {
+    /* (non-Javadoc)
-		return collect.toArray();
+     * @see java.util.Collection#iterator()
-	}
+     */
-
+    @Override
-	/* (non-Javadoc)
+    public Iterator iterator() {
-	 * @see java.util.Collection#toArray(java.lang.Object[])
+        return collect.iterator();
-	 */
+    }
-	public Object[] toArray(Object[] a) {
+
-		return collect.toArray(a);
+    /* (non-Javadoc)
-	}
+     * @see java.util.Collection#toArray()
-
+     */
-	/* (non-Javadoc)
+    @Override
-	 * @see java.util.Collection#containsAll(java.util.Collection)
+    public Object[] toArray() {
-	 */
+        return collect.toArray();
-	public boolean containsAll(Collection c) {
+    }
-		return collect.containsAll(c);
+
-	}
+    /* (non-Javadoc)
-
+     * @see java.util.Collection#toArray(java.lang.Object[])
-	/* (non-Javadoc)
+     */
-	 * @see java.util.Collection#addAll(java.util.Collection)
+    @Override
-	 */
+    public Object[] toArray(Object[] a) {
-	public boolean addAll(Collection c) {
+        return collect.toArray(a);
-		for (Iterator iter = c.iterator(); iter.hasNext();) {
+    }
-			Object element = iter.next();
+
-			if (!(element instanceof ActivatableItemI))
+    /* (non-Javadoc)
-				throw new IllegalArgumentException("only Activatable items");
+     * @see java.util.Collection#containsAll(java.util.Collection)
-
+     */
-		}
+    @Override
-		return collect.addAll(c);
+    public boolean containsAll(Collection c) {
-	}
+        return collect.containsAll(c);
-
+    }
-	/* (non-Javadoc)
+
-	 * @see java.util.Collection#removeAll(java.util.Collection)
+    /* (non-Javadoc)
-	 */
+     * @see java.util.Collection#addAll(java.util.Collection)
-	public boolean removeAll(Collection c) {
+     */
-		return collect.removeAll(c);
+    @Override
-	}
+    public boolean addAll(Collection c) {
-
+        for (Iterator iter = c.iterator(); iter.hasNext();) {
-	/* (non-Javadoc)
+            Object element = iter.next();
-	 * @see java.util.Collection#retainAll(java.util.Collection)
+            if (!(element instanceof ActivatableItemI)) throw new IllegalArgumentException("only Activatable items");
-	 */
+
-	public boolean retainAll(Collection c) {
+        }
-		for (Iterator iter = c.iterator(); iter.hasNext();) {
+        return collect.addAll(c);
-			Object element = iter.next();
+    }
-			if (!(element instanceof ActivatableItemI))
+
-				throw new IllegalArgumentException("only Activatable items");
+    /* (non-Javadoc)
-
+     * @see java.util.Collection#removeAll(java.util.Collection)
-		}
+     */
-		return collect.retainAll(c);
+    @Override
-	}
+    public boolean removeAll(Collection c) {
-
+        return collect.removeAll(c);
-	/* (non-Javadoc)
+    }
-	 * @see java.util.Collection#clear()
+
-	 */
+    /* (non-Javadoc)
-	public void clear() {
+     * @see java.util.Collection#retainAll(java.util.Collection)
-		collect.clear();
+     */
-	}
+    @Override
-
+    public boolean retainAll(Collection c) {
-	/* (non-Javadoc)
+        for (Iterator iter = c.iterator(); iter.hasNext();) {
-	 * @see java.util.Collection#add(java.lang.Object)
+            Object element = iter.next();
-	 */
+            if (!(element instanceof ActivatableItemI)) throw new IllegalArgumentException("only Activatable items");
-	public boolean add(Object o) {
+
-		if (!(o instanceof ActivatableItemI))
+        }
-			throw new IllegalArgumentException("only Activatable items");
+        return collect.retainAll(c);
-		return collect.add(o);
+    }
-	}
+
-
+    /* (non-Javadoc)
-	/* (non-Javadoc)
+     * @see java.util.Collection#clear()
-	 * @see java.util.Collection#remove(java.lang.Object)
+     */
-	 */
+    @Override
-	public boolean remove(Object o) {
+    public void clear() {
-		return collect.remove(o);
+        collect.clear();
-	}
+    }
-
+
-	/* (non-Javadoc)
+    /* (non-Javadoc)
-	 * @see java.util.List#addAll(int, java.util.Collection)
+     * @see java.util.Collection#add(java.lang.Object)
-	 */
+     */
-	public boolean addAll(int index, Collection c) {
+    @Override
-		for (Iterator iter = c.iterator(); iter.hasNext();) {
+    public boolean add(Object o) {
-			Object element = iter.next();
+        if (!(o instanceof ActivatableItemI)) throw new IllegalArgumentException("only Activatable items");
-			if (!(element instanceof ActivatableItemI))
+        return collect.add(o);
-				throw new IllegalArgumentException("only Activatable items");
+    }
-
+
-		}
+    /* (non-Javadoc)
-		return collect.addAll(c);
+     * @see java.util.Collection#remove(java.lang.Object)
-	}
+     */
-
+    @Override
-	/* (non-Javadoc)
+    public boolean remove(Object o) {
-	 * @see java.util.List#get(int)
+        return collect.remove(o);
-	 */
+    }
-	public Object get(int index) {
+
-		return collect.get(index);
+    /* (non-Javadoc)
-	}
+     * @see java.util.List#addAll(int, java.util.Collection)
-
+     */
-	/* (non-Javadoc)
+    @Override
-	 * @see java.util.List#set(int, java.lang.Object)
+    public boolean addAll(int index, Collection c) {
-	 */
+        for (Iterator iter = c.iterator(); iter.hasNext();) {
-	public Object set(int index, Object element) {
+            Object element = iter.next();
-		if (!(element instanceof ActivatableItemI))
+            if (!(element instanceof ActivatableItemI)) throw new IllegalArgumentException("only Activatable items");
-			throw new IllegalArgumentException("only Activatable items");
+
-		return collect.set(index, element);
+        }
-	}
+        return collect.addAll(c);
-
+    }
-	/* (non-Javadoc)
+
-	 * @see java.util.List#add(int, java.lang.Object)
+    /* (non-Javadoc)
-	 */
+     * @see java.util.List#get(int)
-	public void add(int index, Object element) {
+     */
-		if (!(element instanceof ActivatableItemI))
+    @Override
-			throw new IllegalArgumentException("only Activatable items");
+    public Object get(int index) {
-		collect.add(index, element);
+        return collect.get(index);
-	}
+    }
-
+
-	/* (non-Javadoc)
+    /* (non-Javadoc)
-	 * @see java.util.List#remove(int)
+     * @see java.util.List#set(int, java.lang.Object)
-	 */
+     */
-	public Object remove(int index) {
+    @Override
-		return collect.remove(index);
+    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#indexOf(java.lang.Object)
+
-	 */
+    /* (non-Javadoc)
-	public int indexOf(Object o) {
+     * @see java.util.List#add(int, java.lang.Object)
-		return collect.indexOf(o);
+     */
-	}
+    @Override
-
+    public void add(int index, Object element) {
-	/* (non-Javadoc)
+        if (!(element instanceof ActivatableItemI)) throw new IllegalArgumentException("only Activatable items");
-	 * @see java.util.List#lastIndexOf(java.lang.Object)
+        collect.add(index, element);
-	 */
+    }
-	public int lastIndexOf(Object o) {
+
-		return collect.lastIndexOf(o);
+    /* (non-Javadoc)
-	}
+     * @see java.util.List#remove(int)
-
+     */
-	/* (non-Javadoc)
+    @Override
-	 * @see java.util.List#listIterator()
+    public Object remove(int index) {
-	 */
+        return collect.remove(index);
-	public ListIterator listIterator() {
+    }
-		return collect.listIterator();
+
-	}
+    /* (non-Javadoc)
-
+     * @see java.util.List#indexOf(java.lang.Object)
-	/* (non-Javadoc)
+     */
-	 * @see java.util.List#listIterator(int)
+    @Override
-	 */
+    public int indexOf(Object o) {
-	public ListIterator listIterator(int index) {
+        return collect.indexOf(o);
-		return collect.listIterator(index);
+    }
-	}
+
-
+    /* (non-Javadoc)
-	/* (non-Javadoc)
+     * @see java.util.List#lastIndexOf(java.lang.Object)
-	 * @see java.util.List#subList(int, int)
+     */
-	 */
+    @Override
-	public List subList(int fromIndex, int toIndex) {
+    public int lastIndexOf(Object o) {
-		return collect.subList(fromIndex, toIndex);
+        return collect.lastIndexOf(o);
-	}
+    }
-	public String toString() {
+
-		return "ActivatableItemsList " + size() + " items";
+    /* (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";
+    }
 }

src/de/memtext/baseobjects/coll/BaseObjectCollection.java

@@ -10,114 +10,130 @@ import java.util.LinkedList;
  * linkedList, subclasses may change to use a list or set
  *  @author MB
  * */
-public class BaseObjectCollection implements Collection,Serializable {
+public class BaseObjectCollection implements Collection, Serializable {
-	protected Collection collect;
+    protected Collection collect;
-	 private static final long serialVersionUID = 1;
+
-	public BaseObjectCollection() {
+    private static final long serialVersionUID = 1;
-		super();
+
-		collect = new LinkedList();
+    public BaseObjectCollection() {
-	}
+        super();
-
+        collect = new LinkedList();
-
+    }
-
+
-		public int size() {
+
-		return collect.size();
+
-	}
+    @Override
-
+    public int size() {
-	/* (non-Javadoc)
+        return collect.size();
-	 * @see java.util.Collection#isEmpty()
+    }
-	 */
+
-	public boolean isEmpty() {
+    /* (non-Javadoc)
-		return collect.isEmpty();
+     * @see java.util.Collection#isEmpty()
-	}
+     */
-
+    @Override
-	/* (non-Javadoc)
+    public boolean isEmpty() {
-	 * @see java.util.Collection#contains(java.lang.Object)
+        return collect.isEmpty();
-	 */
+    }
-	public boolean contains(Object o) {
+
-		return collect.contains(o);
+    /* (non-Javadoc)
-	}
+     * @see java.util.Collection#contains(java.lang.Object)
-
+     */
-	/* (non-Javadoc)
+    @Override
-	 * @see java.util.Collection#iterator()
+    public boolean contains(Object o) {
-	 */
+        return collect.contains(o);
-	public Iterator iterator() {
+    }
-		return collect.iterator();
+
-	}
+    /* (non-Javadoc)
-
+     * @see java.util.Collection#iterator()
-	/* (non-Javadoc)
+     */
-	 * @see java.util.Collection#toArray()
+    @Override
-	 */
+    public Iterator iterator() {
-	public Object[] toArray() {
+        return collect.iterator();
-		return collect.toArray();
+    }
-	}
+
-
+    /* (non-Javadoc)
-	/* (non-Javadoc)
+     * @see java.util.Collection#toArray()
-	 * @see java.util.Collection#toArray(java.lang.Object[])
+     */
-	 */
+    @Override
-	public Object[] toArray(Object[] a) {
+    public Object[] toArray() {
-		return collect.toArray(a);
+        return collect.toArray();
-	}
+    }
-
+
-	
+    /* (non-Javadoc)
-	
+     * @see java.util.Collection#toArray(java.lang.Object[])
-
+     */
-	/* (non-Javadoc)
+    @Override
-	 * @see java.util.Collection#containsAll(java.util.Collection)
+    public Object[] toArray(Object[] a) {
-	 */
+        return collect.toArray(a);
-	public boolean containsAll(Collection c) {
+    }
-		return collect.containsAll(c);
+
-	}
+
-
+
-	/* (non-Javadoc)
+
-	 * @see java.util.Collection#addAll(java.util.Collection)
+    /* (non-Javadoc)
-	 */
+     * @see java.util.Collection#containsAll(java.util.Collection)
-	public boolean addAll(Collection c) {
+     */
-		return collect.addAll(c);
+    @Override
-	}
+    public boolean containsAll(Collection c) {
-
+        return collect.containsAll(c);
-	/* (non-Javadoc)
+    }
-	 * @see java.util.Collection#removeAll(java.util.Collection)
+
-	 */
+    /* (non-Javadoc)
-	public boolean removeAll(Collection c) {
+     * @see java.util.Collection#addAll(java.util.Collection)
-		return collect.removeAll(c);
+     */
-	}
+    @Override
-
+    public boolean addAll(Collection c) {
-	/* (non-Javadoc)
+        return collect.addAll(c);
-	 * @see java.util.Collection#retainAll(java.util.Collection)
+    }
-	 */
+
-	public boolean retainAll(Collection c) {
+    /* (non-Javadoc)
-		return collect.retainAll(c);
+     * @see java.util.Collection#removeAll(java.util.Collection)
-	}
+     */
-
+    @Override
-	/* (non-Javadoc)
+    public boolean removeAll(Collection c) {
-	 * @see java.util.Collection#clear()
+        return collect.removeAll(c);
-	 */
+    }
-	public void clear() {
+
-		collect.clear();
+    /* (non-Javadoc)
-	}
+     * @see java.util.Collection#retainAll(java.util.Collection)
-
+     */
-	/* (non-Javadoc)
+    @Override
-	 * @see java.util.Collection#add(java.lang.Object)
+    public boolean retainAll(Collection c) {
-	 */
+        return collect.retainAll(c);
-	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#clear()
-
+     */
-	/* (non-Javadoc)
+    @Override
-	 * @see java.util.Collection#remove(java.lang.Object)
+    public void clear() {
-	 */
+        collect.clear();
-	public boolean remove(Object o) {
+    }
-		return collect.remove(o);
+
-	}
+    /* (non-Javadoc)
-
+     * @see java.util.Collection#add(java.lang.Object)
-	
+     */
-	/**
+    @Override
-	 * Only shallow copy
+    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();
+        BaseObjectCollection c = new BaseObjectCollection();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/IdObjectCollection.java

@@ -11,96 +11,95 @@ import de.memtext.util.StringUtils;
  *
  *  @author MB
  * */
-public class IdObjectCollection
+public class IdObjectCollection extends BaseObjectCollection implements Collection, Serializable {
-	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())
+    public IdObjectCollection() {
-			return false;
+        super();
-		boolean result = true;
+    }
-		for (Iterator it = ids.iterator(); it.hasNext();) {
+
-			Object id = it.next();
+    /**
-			try {
+     * 
-				Object dummy = getById(id);
+     * @param id
-			} catch (IllegalArgumentException e) {
+     * @return object
-				result = false;
+     * @throws IllegalArgumentException if nothing found
-				break;
+     */
-			}
+    public IdObjectI getById(Object id) {
-		}
+        IdObjectI test, result = null;
-		return result;
+        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;
+    }
 
-	public boolean add(Object o) {
+    /**
-		if (o == null)
+     * like '12','34','343'
-			throw new IllegalArgumentException("can't add null value");
+     * useful for creating sqls like where x in (...)
-		if (!(o instanceof IdObjectI))
+     * @return
-			throw new IllegalArgumentException("only named IdObjects allowed");
+     */
-		return collect.add(o);
+    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
+     * Only shallow copy
-	 */
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-        IdObjectCollection c=new IdObjectCollection();
+        IdObjectCollection c = new IdObjectCollection();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/IdObjectList.java

@@ -15,68 +15,81 @@ import de.memtext.util.StringUtils;
  * */
 public class IdObjectList extends IdObjectCollection implements List {
     private static final long serialVersionUID = 1;
-	public IdObjectList() {
-		super();
-		collect=new LinkedList();
-	}
 
+    public IdObjectList() {
+        super();
+        collect = new LinkedList();
+    }
 
-	public Object get(int pos)
-	{
-		return ((List)collect).get(pos);
-	}
 
-	public boolean addAll(int arg0, Collection arg1) {
+    @Override
-		return ((List)collect).addAll(arg0,arg1);
+    public Object get(int pos) {
-	}
+        return ((List) collect).get(pos);
+    }
 
-	public Object set(int arg0, Object arg1) {
+    @Override
-		return ((List)collect).set(arg0,arg1);
+    public boolean addAll(int arg0, Collection arg1) {
-	}
+        return ((List) collect).addAll(arg0, arg1);
+    }
 
-	public void add(int pos, Object arg1) {
+    @Override
-		((List)collect).add(pos,arg1);
+    public Object set(int arg0, Object arg1) {
-	}
+        return ((List) collect).set(arg0, arg1);
+    }
 
-	public Object remove(int arg0) {
+    @Override
-		return ((List)collect).remove(arg0);
+    public void add(int pos, Object arg1) {
-	}
+        ((List) collect).add(pos, arg1);
+    }
 
+    @Override
+    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) {
+    @Override
-		return ((List)collect).subList(arg0,arg1);
+    public ListIterator listIterator(int arg0) {
-	}
+        return ((List) collect).listIterator(arg0);
+    }
     
-	public int indexOf(Object arg0) {
+    @Override
-		return ((List)collect).indexOf(arg0);
+    public List subList(int arg0, int arg1) {
-	}
+        return ((List) collect).subList(arg0, arg1);
+    }
 
-	public int lastIndexOf(Object arg0) {
+    @Override
-		return ((List)collect).lastIndexOf(arg0);
+    public int indexOf(Object arg0) {
-	}
+        return ((List) collect).indexOf(arg0);
+    }
+
+    @Override
+    public int lastIndexOf(Object arg0) {
+        return ((List) collect).lastIndexOf(arg0);
+    }
 
-	public ListIterator listIterator() {
+    @Override
-		return ((List)collect).listIterator();
+    public ListIterator listIterator() {
-	}
+        return ((List) collect).listIterator();
-	public String toString()
+    }
-	{
+
-	    StringBuffer result=new StringBuffer("idobject list:");
+    @Override
-	    for (Iterator it = this.iterator(); it.hasNext();) {
+    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()+",");
+            result.append(element.toString() + ",");
         }
-	    StringUtils.getLastChar(result);
+        StringUtils.getLastChar(result);
-	    return result.toString();
+        return result.toString();
-	}
+    }
-	/**
+
-	 * Only shallow copy
+    /**
-	 */
+     * Only shallow copy
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-        IdObjectList c=new IdObjectList();
+        IdObjectList c = new IdObjectList();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/IdObjectSet.java

@@ -3,19 +3,21 @@ package de.memtext.baseobjects.coll;
 import java.util.HashSet;
 import java.util.Set;
 
-public class IdObjectSet extends IdObjectCollection implements Set  {
+public class IdObjectSet extends IdObjectCollection implements Set {
     private static final long serialVersionUID = 1;
-	public IdObjectSet() {
+
-		super();
+    public IdObjectSet() {
-		collect=new HashSet();
+        super();
-	}
+        collect = new HashSet();
+    }
 
 
-	/**
+    /**
-	 * Only shallow copy
+     * Only shallow copy
-	 */
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-        IdObjectSet c=new IdObjectSet();
+        IdObjectSet c = new IdObjectSet();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/NamedIdObjectCollection.java

@@ -4,7 +4,6 @@ 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;
@@ -13,9 +12,9 @@ import de.memtext.util.StringUtils;
  * 
  * @author MB
  */
-public class NamedIdObjectCollection extends NamedObjectCollection implements
+public class NamedIdObjectCollection extends NamedObjectCollection implements Collection, Serializable {
-        Collection, Serializable {
     private static final long serialVersionUID = 1;
+
     public NamedIdObjectCollection() {
         super();
     }
@@ -31,15 +30,12 @@ public class NamedIdObjectCollection extends NamedObjectCollection implements
         NamedIdObjectI test, result = null;
         for (Iterator it = collect.iterator(); it.hasNext();) {
             test = (NamedIdObjectI) it.next();
-            if ((id == null && test.getId() == null)
+            if ((id == null && test.getId() == null) || (test.getId() != null && test.getId().equals(id))) {
-                    || (test.getId() != null && test.getId().equals(id))) {
                 result = test;
                 break;
             }
         }
-        if (result == null)
+        if (result == null) throw new IllegalArgumentException("No element with id " + id + " found!");
-            throw new IllegalArgumentException("No element with id " + id
-                    + " found!");
         return result;
     }
 
@@ -59,6 +55,7 @@ public class NamedIdObjectCollection extends NamedObjectCollection implements
         return result.toString();
     }
 
+    @Override
     public boolean containsItemWithName(String name) {
         boolean result = false;
         NamedIdObjectI test;
@@ -77,7 +74,7 @@ public class NamedIdObjectCollection extends NamedObjectCollection implements
         NamedIdObjectI test;
         for (Iterator it = collect.iterator(); it.hasNext();) {
             test = (NamedIdObjectI) it.next();
-            if (EqualsUtil.areEqual(test.getId(),id)) {
+            if (EqualsUtil.areEqual(test.getId(), id)) {
                 result = true;
                 break;
             }
@@ -95,8 +92,7 @@ public class NamedIdObjectCollection extends NamedObjectCollection implements
      */
     public boolean consistsOfIds(Collection ids) {
 
-        if (this.size() != ids.size())
+        if (this.size() != ids.size()) return false;
-            return false;
         boolean result = true;
         for (Iterator it = ids.iterator(); it.hasNext();) {
             Object id = it.next();
@@ -110,14 +106,14 @@ public class NamedIdObjectCollection extends NamedObjectCollection implements
         return result;
     }
 
+    @Override
     public boolean add(Object o) {
-        if (o == null)
+        if (o == null) throw new IllegalArgumentException("can't add null value");
-            throw new IllegalArgumentException("can't add null value");
+        if (!(o instanceof NamedIdObjectI)) throw new IllegalArgumentException("only named IdObjects allowed");
-        if (!(o instanceof NamedIdObjectI))
+        return collect.add(o);
-            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();) {
@@ -128,10 +124,11 @@ public class NamedIdObjectCollection extends NamedObjectCollection implements
     }
 
     /**
-	 * Only shallow copy
+     * Only shallow copy
-	 */
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectCollection c=new NamedIdObjectCollection();
+        NamedIdObjectCollection c = new NamedIdObjectCollection();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/NamedIdObjectList.java

@@ -11,59 +11,70 @@ import java.util.ListIterator;
  * */
 public class NamedIdObjectList extends NamedIdObjectCollection implements List {
     private static final long serialVersionUID = 1;
-	public NamedIdObjectList() {
+
-		super();
+    public NamedIdObjectList() {
-		collect=new LinkedList();
+        super();
-	}
+        collect = new LinkedList();
+    }
 
 
-	public Object get(int pos)
+    @Override
-	{
+    public Object get(int pos) {
-		return ((List)collect).get(pos);
+        return ((List) collect).get(pos);
-	}
+    }
 
-	public boolean addAll(int arg0, Collection arg1) {
+    @Override
-		return ((List)collect).addAll(arg0,arg1);
+    public boolean addAll(int arg0, Collection arg1) {
-	}
+        return ((List) collect).addAll(arg0, arg1);
+    }
 
-	public Object set(int arg0, Object arg1) {
+    @Override
-		return ((List)collect).set(arg0,arg1);
+    public Object set(int arg0, Object arg1) {
-	}
+        return ((List) collect).set(arg0, arg1);
+    }
 
-	public void add(int pos, Object arg1) {
+    @Override
-		((List)collect).add(pos,arg1);
+    public void add(int pos, Object arg1) {
-	}
+        ((List) collect).add(pos, arg1);
+    }
 
-	public Object remove(int arg0) {
+    @Override
-		return ((List)collect).remove(arg0);
+    public Object remove(int arg0) {
-	}
+        return ((List) collect).remove(arg0);
+    }
 
 
-	public ListIterator listIterator(int arg0) {
+    @Override
-		return ((List)collect).listIterator(arg0);
+    public ListIterator listIterator(int arg0) {
-	}
+        return ((List) collect).listIterator(arg0);
+    }
 
-	public List subList(int arg0, int arg1) {
+    @Override
-		return ((List)collect).subList(arg0,arg1);
+    public List subList(int arg0, int arg1) {
-	}
+        return ((List) collect).subList(arg0, arg1);
+    }
 
-	public int indexOf(Object arg0) {
+    @Override
-		return ((List)collect).indexOf(arg0);
+    public int indexOf(Object arg0) {
-	}
+        return ((List) collect).indexOf(arg0);
+    }
 
-	public int lastIndexOf(Object arg0) {
+    @Override
-		return ((List)collect).lastIndexOf(arg0);
+    public int lastIndexOf(Object arg0) {
-	}
+        return ((List) collect).lastIndexOf(arg0);
+    }
 
-	public ListIterator listIterator() {
+    @Override
-		return ((List)collect).listIterator();
+    public ListIterator listIterator() {
-	}
+        return ((List) collect).listIterator();
+    }
 
-	/**
+    /**
-	 * Only shallow copy
+     * Only shallow copy
-	 */
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectList c=new NamedIdObjectList();
+        NamedIdObjectList c = new NamedIdObjectList();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/NamedIdObjectSet.java

@@ -3,30 +3,33 @@ package de.memtext.baseobjects.coll;
 import java.util.HashSet;
 import java.util.Set;
 
-public class NamedIdObjectSet extends NamedIdObjectCollection implements Set  {
+public class NamedIdObjectSet extends NamedIdObjectCollection implements Set {
     private static final long serialVersionUID = 1;
-	/**
+
-	 * Default uses a HashSet internally;
+    /**
-	 *
+     * Default uses a HashSet internally;
-	 */
+     *
+     */
     public NamedIdObjectSet() {
-		super();
+        super();
-		collect=new HashSet();
+        collect = new HashSet();
-	}
+    }
-	/**
+
-	 *  
+    /**
-	 * @param set the implementation of Set interface to use internally
+     *  
-	 */
+     * @param set the implementation of Set interface to use internally
-	public NamedIdObjectSet(Set set) {
+     */
-		super();
+    public NamedIdObjectSet(Set set) {
-		collect=set;
+        super();
-	}
+        collect = set;
+    }
 
-	/**
+    /**
-	 * Only shallow copy
+     * Only shallow copy
-	 */
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectSet c=new NamedIdObjectSet();
+        NamedIdObjectSet c = new NamedIdObjectSet();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/NamedIdObjectWithParentCollection.java

@@ -3,77 +3,70 @@ 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
+public class NamedIdObjectWithParentCollection extends NamedIdObjectCollection implements Collection {
-	extends NamedIdObjectCollection
-	implements Collection {
     private static final long serialVersionUID = 1;
-	public NamedIdObjectWithParentCollection() {
-		super();
-	}
 
-	public boolean containsItemWithParent(Object parent) {
+    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)) {
+            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 =
+     * get a collection with all objects in the collection that have a 
-				(NamedIdObjectWithParentI) it.next();
+     * given parentKey
-			if (EqualsUtil.areEqual(element.getParentKey(),parentKey))
+     * @param parentKey
-				result.add(element);
+     * @return collection if concrete object is a NamedIdObjectWithParentList also
-		}
+     * returns a NamedIdObjectWithParentList, same for NamedIdObjectWithParentSet
-		return result;
+     * 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 int countItemsWithParent(Object parent)
+    }
-	{
-	   return getByParent(parent).size();
 
-	}
+    @Override
-	public String toString()
+    public String toString() {
-	{
+        StringBuffer result = new StringBuffer(size() + " NamedIdObjectsWithParent: ");
-	    StringBuffer result=new StringBuffer(size()+" NamedIdObjectsWithParent: ");
+        for (Iterator it = this.iterator(); it.hasNext();) {
-	    for (Iterator it = this.iterator(); it.hasNext();) {
+            NamedIdObjectWithParentI element = (NamedIdObjectWithParentI) it.next();
-	        NamedIdObjectWithParentI element = (NamedIdObjectWithParentI) it.next();
+            result.append(element + " - ");
-	        result.append(element+" - ");
+        }
-	    }
+        return result.toString();
-	    return result.toString();
+    }
-	}
 
-	/**
+    /**
-	 * Only shallow copy
+     * Only shallow copy
-	 */
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectWithParentCollection c=new NamedIdObjectWithParentCollection();
+        NamedIdObjectWithParentCollection c = new NamedIdObjectWithParentCollection();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/NamedIdObjectWithParentList.java

@@ -7,56 +7,67 @@ 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) {
+    public NamedIdObjectWithParentList() {
-		return ((List)collect).addAll(arg0,arg1);
+        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);
+    }
 
-	public Object set(int arg0, Object arg1) {
+    @Override
-		return ((List)collect).set(arg0,arg1);
+    public Object set(int arg0, Object arg1) {
-	}
+        return ((List) collect).set(arg0, arg1);
+    }
 
-	public void add(int pos, Object arg1) {
+    @Override
-		((List)collect).add(pos,arg1);
+    public void add(int pos, Object arg1) {
-	}
+        ((List) collect).add(pos, arg1);
+    }
 
-	public Object remove(int arg0) {
+    @Override
-		return ((List)collect).remove(arg0);
+    public Object remove(int arg0) {
-	}
+        return ((List) collect).remove(arg0);
+    }
 
+    @Override
+    public ListIterator listIterator(int arg0) {
+        return ((List) collect).listIterator(arg0);
+    }
     
-	public ListIterator listIterator(int arg0) {
+    @Override
-		return ((List)collect).listIterator(arg0);
+    public List subList(int arg0, int arg1) {
-	}
+        return ((List) collect).subList(arg0, arg1);
+    }
 
-	public List subList(int arg0, int arg1) {
+    @Override
-		return ((List)collect).subList(arg0,arg1);
+    public int indexOf(Object arg0) {
-	}
+        return ((List) collect).indexOf(arg0);
+    }
 
-	public int indexOf(Object arg0) {
+    @Override
-		return ((List)collect).indexOf(arg0);
+    public int lastIndexOf(Object arg0) {
-	}
+        return ((List) collect).lastIndexOf(arg0);
+    }
     
-	public int lastIndexOf(Object arg0) {
+    @Override
-		return ((List)collect).lastIndexOf(arg0);
+    public ListIterator listIterator() {
-	}
+        return ((List) collect).listIterator();
+    }
 
-	public ListIterator listIterator() {
+    /**
-		return ((List)collect).listIterator();
+     * Only shallow copy
-	}
+     */
-	/**
+    @Override
-	 * Only shallow copy
-	 */
     protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectWithParentList c=new NamedIdObjectWithParentList();
+        NamedIdObjectWithParentList c = new NamedIdObjectWithParentList();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/NamedIdObjectWithParentSet.java

@@ -3,19 +3,21 @@ package de.memtext.baseobjects.coll;
 import java.util.HashSet;
 import java.util.Set;
 
-public class NamedIdObjectWithParentSet extends NamedIdObjectWithParentCollection implements Set  {
+public class NamedIdObjectWithParentSet extends NamedIdObjectWithParentCollection implements Set {
     private static final long serialVersionUID = 1;
-	public NamedIdObjectWithParentSet() {
+
-		super();
+    public NamedIdObjectWithParentSet() {
-		collect=new HashSet();
+        super();
-	}
+        collect = new HashSet();
+    }
 
 
-	/**
+    /**
-	 * Only shallow copy
+     * Only shallow copy
-	 */
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-        NamedIdObjectWithParentCollection c=new NamedIdObjectWithParentSet();
+        NamedIdObjectWithParentCollection c = new NamedIdObjectWithParentSet();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/NamedObjectCollection.java

@@ -12,90 +12,87 @@ import de.memtext.util.StringUtils;
  *
  *  @author MB
  * */
-public class NamedObjectCollection
+public class NamedObjectCollection extends BaseObjectCollection implements Collection, Serializable {
-	extends BaseObjectCollection
-	implements Collection,Serializable {
     private static final long serialVersionUID = 1;
 
-	public NamedObjectCollection() {
+    public NamedObjectCollection() {
-		super();
+        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() {
-	 * Tries to find an element with the given name
+        StringBuffer result = new StringBuffer();
-	 * @param name
+        NamedObjectI test;
-	 * @return first element with given name
+        for (Iterator it = collect.iterator(); it.hasNext();) {
-	 * @throws IllegalArgumentException if nothing found
+            test = (NamedObjectI) it.next();
-	 */public NamedObjectI getByName(String name) {
+            result.append("'" + test.getName() + "',");
-		NamedObjectI test, result = null;
+        }
-		for (Iterator it = collect.iterator(); it.hasNext();) {
+        StringUtils.deleteLastChar(result);
-			test = (NamedObjectI) it.next();
+        if (result.length() == 0) result.append("''");
-			if (test.getName().equals(name)) {
+        return result.toString();
-				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() {
+    public boolean containsItemWithName(String name) {
-		StringBuffer result = new StringBuffer();
+        boolean result = false;
-		NamedObjectI test;
+        NamedObjectI test;
-		for (Iterator it = collect.iterator(); it.hasNext();) {
+        for (Iterator it = collect.iterator(); it.hasNext();) {
-			test = (NamedObjectI) it.next();
+            test = (NamedObjectI) it.next();
-			result.append("'" + test.getName() + "',");
+            if (EqualsUtil.areEqual(test.getName(), name)) {
-		}
+                result = true;
-		StringUtils.deleteLastChar(result);
+                break;
-		if (result.length() == 0)
+            }
-			result.append("''");
+        }
-		return result.toString();
+        return result;
-	}
+    }
 
-	public boolean containsItemWithName(String name) {
+    @Override
-		boolean result = false;
+    public boolean add(Object o) {
-		NamedObjectI test;
+        if (o == null) throw new IllegalArgumentException("can't add null value");
-		for (Iterator it = collect.iterator(); it.hasNext();) {
+        if (!(o instanceof NamedObjectI)) throw new IllegalArgumentException("only named Objects allowed");
-			test = (NamedObjectI) it.next();
+        return collect.add(o);
-			  if (EqualsUtil.areEqual(test.getName(),name))
+    }
-		          {
-				result = true;
-				break;
-			}
-		}
-		return result;
-	}
 
-	public boolean add(Object o) {
+    @Override
-		if (o == null)
+    public String toString() {
-			throw new IllegalArgumentException("can't add null value");
+        StringBuffer result = new StringBuffer(size() + " NamedObjects: ");
-		if (!(o instanceof NamedObjectI))
+        for (Iterator it = this.iterator(); it.hasNext();) {
-			throw new IllegalArgumentException("only named Objects allowed");
+            NamedObjectI element = (NamedObjectI) it.next();
-		return collect.add(o);
+            result.append(element + " - ");
-	}
+        }
-	public String toString()
+        return result.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
+     * Only shallow copy
-	 */
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-        NamedObjectCollection c=new NamedObjectCollection();
+        NamedObjectCollection c = new NamedObjectCollection();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/NamedObjectList.java

@@ -12,58 +12,67 @@ import java.util.ListIterator;
  * */
 public class NamedObjectList extends NamedObjectCollection implements List {
     private static final long serialVersionUID = 1;
-	public NamedObjectList() {
-		super();
-		collect = new LinkedList();
-	}
 
-	public Object get(int pos)
+    public NamedObjectList() {
-	{
+        super();
-		return ((List)collect).get(pos);
+        collect = new LinkedList();
-	}
+    }
-	
-	public boolean addAll(int arg0, Collection arg1) {
-		return ((List)collect).addAll(arg0,arg1);
-	}
 
-	public Object set(int arg0, Object arg1) {
+    @Override
-		return ((List)collect).set(arg0,arg1);
+    public Object get(int pos) {
-	}
+        return ((List) collect).get(pos);
+    }
+    @Override
+    public boolean addAll(int arg0, Collection arg1) {
+        return ((List) collect).addAll(arg0, arg1);
+    }
 
-	public void add(int pos, Object arg1) {
+    @Override
-		((List)collect).add(pos,arg1);
+    public Object set(int arg0, Object arg1) {
-	}
+        return ((List) collect).set(arg0, arg1);
+    }
 
-	public Object remove(int arg0) {
+    @Override
-		return ((List)collect).remove(arg0);
+    public void add(int pos, Object arg1) {
-	}
+        ((List) collect).add(pos, arg1);
+    }
 
+    @Override
+    public Object remove(int arg0) {
+        return ((List) collect).remove(arg0);
+    }
 
-	public ListIterator listIterator(int arg0) {
+    @Override
-		return ((List)collect).listIterator(arg0);
+    public ListIterator listIterator(int arg0) {
-	}
+        return ((List) collect).listIterator(arg0);
+    }
 
-	public List subList(int arg0, int arg1) {
+    @Override
-		return ((List)collect).subList(arg0,arg1);
+    public List subList(int arg0, int arg1) {
-	}
+        return ((List) collect).subList(arg0, arg1);
+    }
 
-	public int indexOf(Object arg0) {
+    @Override
-		return ((List)collect).indexOf(arg0);
+    public int indexOf(Object arg0) {
-	}
+        return ((List) collect).indexOf(arg0);
+    }
 
-	public int lastIndexOf(Object arg0) {
+    @Override
-		return ((List)collect).lastIndexOf(arg0);
+    public int lastIndexOf(Object arg0) {
-	}
+        return ((List) collect).lastIndexOf(arg0);
+    }
     
-	public ListIterator listIterator() {
+    @Override
-		return ((List)collect).listIterator();
+    public ListIterator listIterator() {
-	}
+        return ((List) collect).listIterator();
+    }
 
-	/**
+    /**
-	 * Only shallow copy
+     * Only shallow copy
-	 */
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-        NamedObjectCollection c=new NamedObjectList();
+        NamedObjectCollection c = new NamedObjectList();
         c.addAll(this);
         return c;
     }

src/de/memtext/baseobjects/coll/NamedObjectSet.java

@@ -3,24 +3,26 @@ package de.memtext.baseobjects.coll;
 import java.util.HashSet;
 import java.util.Set;
 
-public class NamedObjectSet extends NamedObjectCollection implements Set  {
+public class NamedObjectSet extends NamedObjectCollection implements Set {
     private static final long serialVersionUID = 1;
-	public NamedObjectSet() {
-		super();
-		collect=new HashSet();
-	}
 
-	public NamedObjectSet(Set set) {
+    public NamedObjectSet() {
-			super();
+        super();
-			if (set==null)throw new IllegalArgumentException("set must not be null");
+        collect = new HashSet();
-			collect=set;
+    }
-		}
+
+    public NamedObjectSet(Set set) {
+        super();
+        if (set == null) throw new IllegalArgumentException("set must not be null");
+        collect = set;
+    }
 
-	/**
+    /**
-	 * Only shallow copy
+     * Only shallow copy
-	 */
+     */
+    @Override
     protected Object clone() throws CloneNotSupportedException {
-        NamedObjectCollection c=new NamedObjectSet();
+        NamedObjectCollection c = new NamedObjectSet();
         c.addAll(this);
         return c;
     }

src/de/memtext/buttons/ButtonGroupPanel.java

@@ -3,86 +3,89 @@ 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();
+    ButtonGroup group = new ButtonGroup();
-	ButtonWithValue hiddenNoSelectionButton = new ButtonWithValue("", null);
+
-
+    ButtonWithValue hiddenNoSelectionButton = new ButtonWithValue("", null);
-	public ButtonGroupPanel() {
+
-		this(null);
+    public ButtonGroupPanel() {
-	}
+        this(null);
-	public ButtonGroupPanel(String header) {
+    }
-		super();
+
-		if (header != null)
+    public ButtonGroupPanel(String header) {
-			this.add(new JLabel(header));
+        super();
-			
+        if (header != null) this.add(new JLabel(header));
-		hiddenNoSelectionButton.setVisible(false);
+
-		hiddenNoSelectionButton.setSelected(true);
+        hiddenNoSelectionButton.setVisible(false);
-		group.add(hiddenNoSelectionButton);
+        hiddenNoSelectionButton.setSelected(true);
-	}
+        group.add(hiddenNoSelectionButton);
-	public void addCategory(String label, Object value,boolean isSelected) {
+    }
-		ButtonWithValue b = new ButtonWithValue(label, value);
+
-		this.add(b);
+    public void addCategory(String label, Object value, boolean isSelected) {
-		group.add(b);
+        ButtonWithValue b = new ButtonWithValue(label, value);
-		b.setSelected(isSelected);
+        this.add(b);
-	}
+        group.add(b);
-	public void addCategory(String label, Object value) {
+        b.setSelected(isSelected);
-		addCategory(label, value,false);
+    }
-		}
+
-	
+    public void addCategory(String label, Object value) {
-	public void addCategory(String label, int i) {
+        addCategory(label, value, false);
-			addCategory(label, new Integer(i));
+    }
-		}
+
-	public void addCategory(String label, int i,boolean isSelected) {
+    public void addCategory(String label, int i) {
-				addCategory(label, new Integer(i),isSelected);
+        addCategory(label, Integer.valueOf(i));
-			}
+    }
-	/**
+
-	 * If you pass null as an argument no element will be selected 
+    public void addCategory(String label, int i, boolean isSelected) {
-	 * @param label
+        addCategory(label, Integer.valueOf(i), isSelected);
-	 */
+    }
-	public void setSelected(String label) {
+
-		if (label == null)
+    /**
-			hiddenNoSelectionButton.setSelected(true);
+     * If you pass null as an argument no element will be selected 
-		else
+     * @param label
-			for (Enumeration en = group.getElements();
+     */
-				en.hasMoreElements();
+    public void setSelected(String label) {
-				) {
+        if (label == null)
-				ButtonWithValue b = (ButtonWithValue) en.nextElement();
+            hiddenNoSelectionButton.setSelected(true);
-				if (b.getText().equals(label)) {
+        else
-									b.doClick();
+            for (Enumeration en = group.getElements(); en.hasMoreElements();) {
-										break;
+                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();
+    public Object getSelectedValue() {
-			) {
+        ButtonWithValue selectedButton = null;
-			ButtonWithValue b = (ButtonWithValue) en.nextElement();
+        for (Enumeration en = group.getElements(); en.hasMoreElements();) {
-			if (b.isSelected()) {
+            ButtonWithValue b = (ButtonWithValue) en.nextElement();
-				selectedButton=b;
+            if (b.isSelected()) {
-				break;
+                selectedButton = b;
-			}
+                break;
-		}
+            }
-		return selectedButton.getValue();
+        }
-	}
+        return selectedButton.getValue();
-	class ButtonWithValue extends JRadioButton {
+    }
-		private Object value;
+
-		ButtonWithValue(String label, Object value) {
+    class ButtonWithValue extends JRadioButton {
-			super(label);
+        private Object value;
-			this.value = value;
+
-		}
+        ButtonWithValue(String label, Object value) {
-		Object getValue() {
+            super(label);
-			return value;
+            this.value = value;
-		}
+        }
-
+
-	}
+        Object getValue() {
+            return value;
+        }
+
+    }
 
 }
 

src/de/memtext/buttons/Standard.java

@@ -10,30 +10,29 @@ import javax.swing.JButton;
  */
 public class Standard {
 
-	/**
+    /**
-	 * Constructor for Standard.
+     * Constructor for Standard.
-	 */
+     */
-	private Standard() {
+    private Standard() {
-		super();
+        super();
-	}
+    }
-	
+
-	public static JButton getCopy()
+    public static JButton getCopy() {
-	{
+
-		
+        JButton copy = new JButton(de.memtext.icons.MBStandardIcons.getCopy());
-		JButton copy=new JButton(de.memtext.icons.MBStandardIcons.getCopy());
+        copy.setToolTipText("Kopieren");
-		copy.setToolTipText("Kopieren");
+        copy.setActionCommand("copy");
-		copy.setActionCommand("copy");
+        return copy;
-		return copy;
+
-	
+    }
-	}
+
-	public static JButton getCopyWithText()
+    public static JButton getCopyWithText() {
-	{
+
-		
+        JButton copy = new JButton("Kopieren", de.memtext.icons.MBStandardIcons.getCopy());
-		JButton copy=new JButton("Kopieren",de.memtext.icons.MBStandardIcons.getCopy());
+        copy.setToolTipText("Kopieren");
-		copy.setToolTipText("Kopieren");
+        copy.setActionCommand("copy");
-		copy.setActionCommand("copy");
+        return copy;
-		return copy;
+
-	
+    }
-	}
 
 }

src/de/memtext/db/AbstractHsqlStandaloneMgrResources.java

@@ -31,6 +31,7 @@
 package de.memtext.db;
 
 import java.util.ListResourceBundle;
+
 /**
  * Resources for HsqlStandaloneMgr.
  * For other locales extend AbstractHsqlStandloneMgrResources, i.e.
@@ -38,6 +39,6 @@ import java.util.ListResourceBundle;
  */
 public abstract class AbstractHsqlStandaloneMgrResources extends ListResourceBundle {
 
-    public abstract String getDbInUseBy(String dbname,String user);
+    public abstract String getDbInUseBy(String dbname, String user);
 }
 

src/de/memtext/db/AddProc.java

@@ -10,6 +10,7 @@ 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.
@@ -27,148 +28,131 @@ import java.util.Date;
 	
  */
 public class AddProc {
-	private static DateFormat dfUS = new SimpleDateFormat("yyyy-MM-dd");
+    private static DateFormat dfUS = new SimpleDateFormat("yyyy-MM-dd");
-
+
-	private AddProc() {
+    private AddProc() {
-		super();
+        super();
-	}
+    }
-	/**
+
-	 * Fills regular tables with values from a CSV-file.
+    /**
-	 * Similar to Postgres COPY FROM command.
+     * 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>
+     * If you want to fill your table TEST with data from test.csv
-	 * GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC;<br>
+     * make sure that this class in the classpath and that<br>
-	  CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"<br>
+     * GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC;<br>
-	 * has been called in your database at some point.
+      CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"<br>
-	<br>
+     * has been called in your database at some point.
-	 *   Then execute   <br>
+    <br>
-	 * CALL  COPYFROM('TEST','test.csv',null)<br>
+     *   Then execute   <br>
-	 * <br>
+     * CALL  COPYFROM('TEST','test.csv',null)<br>
-	 * if your not using , but | as a field separator<br>
+     * <br>
-	  CALL COPYFROM('TEST','test.csv','fs=|')<br>
+     * if your not using , but | as a field separator<br>
-	<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
+     * @param con - Connection is automatically handed over by HSQL
-	 *  if you created your table with "",  e.g. create table "myData" <br>
+     * @param table - the name of the table that is to be filled
-	 *  also pass the inverted commans like this CALL COPYFROM('\"myData\"','test.csv',null); 
+     *  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 ; 
+     * @param file - the filename of the CSV-file
-	 * which are described in the text table documentation e.g.<br>
+     * @param options - you can specify options separated by ; 
-	 * fs=| to use pipe instead of default comma as field separator or<br>
+     * 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>
+     * fs=|;vs=.;lvs=~" varchar separator, longvarchar separator<br>
-	 * all_quoted=true or<br>
+     * ignore_first=true; ignore first line<br>
-	 * encoding=UTF-8 if you don't have ASCII<br>
+     * all_quoted=true or<br>
-	 * @throws SQLException
+     * encoding=UTF-8 if you don't have ASCII<br>
-	 */
+     * @throws SQLException
-	public static String copyFrom(
+     */
-		Connection con,
+    public static String copyFrom(Connection con, String table, String file, String options) throws SQLException {
-		String table,
+        if (table == null || table.equals("")) throw new IllegalArgumentException("Table must not be null or empty");
-		String file,
+        if (file == null || file.equals("")) throw new IllegalArgumentException("File must not be null or empty");
-		String options)
+        File f = new File(file);
-		throws SQLException {
+        if (!f.exists()) throw new IllegalArgumentException("source file " + file + " doesn't exist");
-		if (table == null || table.equals(""))
+
-			throw new IllegalArgumentException("Table must not be null or empty");
+        //normally created tables are in UPPERCASE in the metadata,
-		if (file == null || file.equals(""))
+        //but tables in inverted commas (create table "myData")
-			throw new IllegalArgumentException("File must not be null or empty");
+        //are stored case sensitive
-		File f = new File(file);
+        String tableNameInMetaData;
-		if (!f.exists())
+        if (table.startsWith("\""))
-			throw new IllegalArgumentException(
+            tableNameInMetaData = table.substring(1, table.length() - 1);
-				"source file " + file + " doesn't exist");
+        else
-	
+            tableNameInMetaData = table.toUpperCase();
-    //normally created tables are in UPPERCASE in the metadata,
+        StringBuffer buf = new StringBuffer("create temp text table TMP_COPYFROM(");
-    //but tables in inverted commas (create table "myData")
+
-    //are stored case sensitive
+        ResultSet rs = con.getMetaData().getColumns(null, null, tableNameInMetaData, null);
-	String tableNameInMetaData;
+        String colname, coltype;
-		if (table.startsWith("\""))
+        boolean tableFound = false;
-			tableNameInMetaData = table.substring(1, table.length() - 1);
+        while (rs.next()) {
-		else
+            tableFound = true;
-			tableNameInMetaData = table.toUpperCase();
+            colname = rs.getObject(4).toString();
-		StringBuffer buf =
+            coltype = rs.getObject(6).toString();
-			new StringBuffer("create temp text table TMP_COPYFROM(");
+            buf.append(colname + " " + coltype + ",");
-
+        }
-		ResultSet rs =
+        rs.close();
-			con.getMetaData().getColumns(null, null, tableNameInMetaData, null);
+        if (!tableFound) throw new SQLException("Copy from failed - table " + table + " not found");
-		String colname, coltype;
+        buf.deleteCharAt(buf.lastIndexOf(","));
-		boolean tableFound = false;
+        buf.append("); SET TABLE TMP_COPYFROM SOURCE \"" + file);
-		while (rs.next()) {
+        if (options != null) buf.append(";" + options);
-			tableFound = true;
+        buf.append("\";");
-			colname = rs.getObject(4).toString();
+        buf.append("insert into " + table + " select * from TMP_COPYFROM");
-			coltype = rs.getObject(6).toString();
+        System.out.println(buf);
-			buf.append(colname + " " + coltype + ",");
+        Statement stmt = con.createStatement();
-		}
+        try {
-		rs.close();
+            stmt.execute(buf.toString());
-		if (!tableFound)
+            return "success";
-			throw new SQLException(
+        }
-				"Copy from failed - table "
+        //finally is executed before returning whether an exception occurs or not
-					+ table
+        finally {
-					+ " not found");
+            stmt.execute("drop table TMP_COPYFROM IF EXISTS");
-		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");
+    public static String toDate(String year, String month, String day) throws ParseException {
-		System.out.println(buf);
+        String result;
-		Statement stmt = con.createStatement();
+        Date d = dfUS.parse(year.trim() + "-" + month.trim() + "-" + day.trim());
-		try {
+        result = dfUS.format(d);
-			stmt.execute(buf.toString());
+        return result;
-			return "success";
+    }
-		}
+
-		//finally is executed before returning whether an exception occurs or not
+    public static String toDate(String year, int month, int day) throws ParseException {
-		finally {
+        return toDate(year + "", month + "", day + "");
-			stmt.execute("drop table TMP_COPYFROM IF EXISTS");
+    }
-		}
+
-
+    public static String toDate(int year, int month, int day) throws ParseException {
-	}
+        return toDate(year + "", month + "", day + "");
-	
+
-	
+    }
-	public static String toDate(String year, String month, String day)
+
-		throws ParseException {
+    public static void main(String a[]) {
-		String result;
+        Connection conn = null;
-		Date d =
+        try {
-			dfUS.parse(year.trim() + "-" + month.trim() + "-" + day.trim());
+            Class.forName("org.hsqldb.jdbcDriver");
-		result = dfUS.format(d);
+            conn = DriverManager.getConnection("jdbc:hsqldb:test", "sa", "");
-		return result;
+            java.sql.Statement stmt = conn.createStatement();
-	}
+            stmt.execute("drop table \"test\" if exists;create table \"test\" (col1 integer,col2 varchar, col3 double,col4 date)");
-	public static String toDate(String year, int month, int day)
+            copyFrom(conn, "\"test\"", "test.csv", "fs=;");
-		throws ParseException {
+            System.out.println("2");
-		return toDate(year + "", month + "", day + "");
+            copyFrom(conn, "\"test\"", "test.csv", "fs=;");
-	}
+            stmt.close();
-	public static String toDate(int year, int month, int day)
+
-		throws ParseException {
+        } catch (ClassNotFoundException e) {
-		return toDate(year + "", month + "", day + "");
+            e.printStackTrace();
-
+        } catch (SQLException e) {
-	}
+            e.printStackTrace();
-	public static void main(String a[]) {
+        } finally {
-		Connection conn = null;
+            try {
-		try {
+                conn.close();
-			Class.forName("org.hsqldb.jdbcDriver");
+            } catch (SQLException e1) {
-			conn = DriverManager.getConnection("jdbc:hsqldb:test", "sa", "");
+                e1.printStackTrace();
-			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

src/de/memtext/db/Comparison.java

@@ -17,27 +17,33 @@ import java.util.LinkedList;
  * Window>Preferences>Java>Code Generation>Code and Comments
  */
 public class Comparison {
-	private String name;
+    private String name;
-	private Collection units = new LinkedList();
+
-	public Comparison(String name) {
+    private Collection units = new LinkedList();
-		this.name = name;
+
-	}
+    public Comparison(String name) {
-	public void addUnit(ComparisonUnit unit) {
+        this.name = name;
-		units.add(unit);
+    }
-
+
-	}
+    public void addUnit(ComparisonUnit unit) {
-	public Iterator iterator()
+        units.add(unit);
-	{
+
-		return units.iterator();
+    }
-	}
+
-	public int getUnitCount()
+    public Iterator iterator() {
-	{
+        return units.iterator();
-		return units.size();
+    }
-	}
+
-	public void removeUnit(ComparisonUnit unit) {
+    public int getUnitCount() {
-		units.remove(unit);
+        return units.size();
-	}
+    }
-	public String toString() {
+
-		return name;
+    public void removeUnit(ComparisonUnit unit) {
-	}
+        units.remove(unit);
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
 }

src/de/memtext/db/ComparisonUnit.java

@@ -13,38 +13,39 @@ package de.memtext.db;
  * Window>Preferences>Java>Code Generation>Code and Comments
  */
 public class ComparisonUnit {
-private String name,sql;
+    private String name, sql;
-public ComparisonUnit(String name,String sql)
-{
-	this.name=name;
-	this.sql=sql;
-}
-/**
- * @return
- */
-public String getName() {
-	return name;
-}
 
-/**
+    public ComparisonUnit(String name, String sql) {
- * @return
+        this.name = name;
- */
+        this.sql = sql;
-public String getSql() {
+    }
-	return sql;
-}
 
-/**
+    /**
- * @param string
+     * @return
- */
+     */
-public void setName(String string) {
+    public String getName() {
-	name = string;
+        return name;
-}
+    }
 
-/**
+    /**
- * @param string
+     * @return
- */
+     */
-public void setSql(String string) {
+    public String getSql() {
-	sql = string;
+        return sql;
-}
+    }
+
+    /**
+     * @param string
+     */
+    public void setName(String string) {
+        name = string;
+    }
+
+    /**
+     * @param string
+     */
+    public void setSql(String string) {
+        sql = string;
+    }
 
 }

src/de/memtext/db/ConnectionCreator.java

@@ -1,4 +1,5 @@
 package de.memtext.db;
+
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -7,6 +8,7 @@ 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 
@@ -16,112 +18,83 @@ import de.memtext.util.PropUtils;
  
  */
 public class ConnectionCreator {
-	public static void loadClass(String className) {
+    public static void loadClass(String className) {
-		try {
+        try {
-			Class.forName(className);
+            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);
+    }
 
-		} catch (Exception e) {
+    public static Connection getConnectionQuitOnException(String driver, String url, String username, String passwd) {
-			System.out.println(e.toString());
+        Connection con = null;
-			System.exit(0);
+        try {
-		}
+            con = getConnection(driver, url, username, passwd);
-	}
+        } catch (Exception e) {
-	public static Connection getConnection(
+            System.out.println("Couldn't create connection to database " + url + "\n" + e.toString());
-		String url,
+            System.exit(-1);
-		String username,
+        }
-		String passwd) throws SQLException
+        return con;
-		{
+    }
 
-		return DriverManager.getConnection(url, username, passwd);
+    public static Connection getConnection(String propfilename, String driverkey, String urlkey, String usernamekey, String passwordkey)
-	}
+                    throws IOException, SQLException, ClassNotFoundException {
-	public static Connection getConnection(
+        Properties props = PropUtils.getProps(propfilename);
-		String driver,
+        String driver = PropUtils.getProperty(props, driverkey);
-		String url,
+        String url = PropUtils.getProperty(props, urlkey);
-		String username,
+        String username = PropUtils.getProperty(props, usernamekey);
-		String passwd)
+        String passwd = PropUtils.getProperty(props, passwordkey);
-		throws SQLException, ClassNotFoundException {
+        return getConnection(driver, url, username, passwd);
-		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 {
-	public static Connection getConnection(String propfilename) throws IOException, SQLException, ClassNotFoundException
+        return getConnection(propfilename, "driver", "url", "username", "password");
-		 {
+    }
-		return getConnection(
-			propfilename,
-			"driver",
-			"url",
-			"username",
-			"password");
-	}
 
-	/**
+    /**
-	 * Method getConnectionCryptPassword.
+     * Method getConnectionCryptPassword.
-	 * 28.10.08 EInfache Verschlüsselungsmethode wird nicht mehr unterstützt
+     * 28.10.08 EInfache Verschlüsselungsmethode wird nicht mehr unterstützt
-	 * @param propfilename
+     * @param propfilename
-	 * @param string
+     * @param string
-	 * @param string1
+     * @param string1
-	 * @param string11
+     * @param string11
-	 * @param string111
+     * @param string111
-	 * @return Connection
+     * @return Connection
-	 * @throws IOException
+     * @throws IOException
-	 * @throws ClassNotFoundException
+     * @throws ClassNotFoundException
-	 * @throws SQLException
+     * @throws SQLException
-	 */
+     */
-	public static Connection getConnectionCryptPassword(
+    public static Connection getConnectionCryptPassword(String propfilename, String driverkey, String urlkey, String usernamekey, String passwordkey)
-		String propfilename,
+                    throws IOException, SQLException, ClassNotFoundException {
-		String driverkey,
+        Properties props = PropUtils.getProps(propfilename);
-		String urlkey,
+        String driver = PropUtils.getProperty(props, driverkey);
-		String usernamekey,
+        String url = PropUtils.getProperty(props, urlkey);
-		String passwordkey) throws IOException, SQLException, ClassNotFoundException
+        String username = PropUtils.getProperty(props, usernamekey);
-		 {
+        String passwd = PropUtils.getProperty(props, passwordkey);
-		Properties props = PropUtils.getProps(propfilename);
+        if (passwd.startsWith("sx_des")) {
-		String driver = PropUtils.getProperty(props, driverkey);
+            try {
-		String url = PropUtils.getProperty(props, urlkey);
+                passwd = CryptUtils.decryptStringDES(passwd.substring(6));
-		String username = PropUtils.getProperty(props, usernamekey);
+            } catch (Exception e) {
-		String passwd =PropUtils.getProperty(props, passwordkey);
+                e.printStackTrace();
-		   if (passwd.startsWith("sx_des")) {
+                throw new SQLException("DES-Passwort konnte nicht entschlüsselt werden");
-	            try {
+            }
-                    passwd = CryptUtils.decryptStringDES(passwd.substring(6));
+        }
-                } catch (Exception e) {
+        // else
-                    e.printStackTrace();
+        //	passwd=de.memtext.util.CryptUtils.decryptSimple(passwd	);
-                    throw new SQLException("DES-Passwort konnte nicht entschlüsselt werden");
+        return getConnection(driver, url, username, passwd);
-                }
+    }
-	        } 
-		  // else
-		//	passwd=de.memtext.util.CryptUtils.decryptSimple(passwd	);
-		return getConnection(driver, url, username, passwd);
-	}
 
 }

src/de/memtext/db/DB.java

@@ -1,37 +1,43 @@
 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;
+    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 INFORMIX = new DB("Informix", "7.3");
-	static public final DB ACCESS = new DB("Access", "2000");
+
-	/**
+    static public final DB POSTGRES = new DB("Postgres", "7.3");
-	 * The public constructors are needed because the DB class is
+
-	 * a java bean which is cool for XMLEncoding
+    static public final DB ACCESS = new DB("Access", "2000");
-	 *
+
-	 */
+    /**
-	public DB() {
+     * The public constructors are needed because the DB class is
-		this("Unbekannte Datenbank","");
+     * a java bean which is cool for XMLEncoding
-	}
+     *
-	public DB(String name) {
+     */
-		this(name, "");
+    public DB() {
-	}
+        this("Unbekannte Datenbank", "");
-
+    }
-	public DB(String name, String version) {
+
-		super(name);
+    public DB(String name) {
-		this.version = version;
+        this(name, "");
-	}
+    }
-
+
-	public boolean equals(Object o) {
+    public DB(String name, String version) {
-		if (!(o instanceof DB))
+        super(name);
-			return false;
+        this.version = version;
-		DB db = (DB) o;
+    }
-		return this.getName().equals(db.getName());
+
-	}
+    @Override
+    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

src/de/memtext/db/DBComparison.java

@@ -9,96 +9,70 @@ import de.memtext.util.StringUtils;
 
 public class DBComparison {
 
-	private DBComparison() {
+    private DBComparison() {
-		super();
+        super();
-	}
+    }
-	public static void main(String a[]) {
-		try {
-			Class.forName("org.hsqldb.jdbcDriver");
 
-			java.sql.Connection con =
+    public static void main(String a[]) {
-				DriverManager.getConnection(
+        try {
-					"jdbc:hsqldb:hsql://localhost:9000",
+            Class.forName("org.hsqldb.jdbcDriver");
-					"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) {
+            java.sql.Connection con = DriverManager.getConnection("jdbc:hsqldb:hsql://localhost:9000", "sa", "");
-			e.printStackTrace();
+            DBAccess.addConnection("ssc", con);
-		} catch (SQLException e) {
+            java.sql.Connection con2 = DriverManager.getConnection("jdbc:hsqldb:hsql://localhost:9500", "sa", "");
-			e.printStackTrace();
+            DBAccess.addConnection("ssc-test", con2);
-		} catch (Exception e) {
+            compare("ssc", "ssc-test");
-			e.printStackTrace();
-		}
 
-	}
+        } catch (ClassNotFoundException e) {
-	private static void compare(String db1, String db2) {
+            e.printStackTrace();
-		System.out.println("Start comparing...");
+        } catch (SQLException e) {
-		StringBuffer fineTables =
+            e.printStackTrace();
-			new StringBuffer("The following tables are fine: ");
+        } catch (Exception e) {
-		List tableList = DBAccess.get(db1).getTableList();
+            e.printStackTrace();
-		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)
+    private static void compare(String db1, String db2) throws SQLException {
-								!= DBAccess.get(db2).getColumnType(
+        System.out.println("Start comparing...");
-									table,
+        StringBuffer fineTables = new StringBuffer("The following tables are fine: ");
-									colname)) {
+        List tableList = DBAccess.get(db1).getTableList();
-								System.out.println(
+        boolean isOk = false;
-									"Table "
+        for (Iterator it = tableList.iterator(); it.hasNext();) {
-										+ table
+            String table = (String) it.next();
-										+ " column:"
-										+ colname
-										+ " are of different types");
-								isOk = false;
-							}
 
-						}
+            if (DBAccess.get(db2).hasTable(table)) {
-					}
+                isOk = true;
-					if (isOk)
+                if (DBAccess.get(db1).getColumnCount(table) != DBAccess.get(db2).getColumnCount(table)) {
-						fineTables.append(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 {
 
-			} else {
+                            if (DBAccess.get(db1).getColumnType(table, colname) != DBAccess.get(db2).getColumnType(table, colname)) {
-				System.out.println(db2 + " doesn't contain table:" + table);
+                                System.out.println("Table " + table + " column:" + colname + " are of different types");
-			}
+                                isOk = false;
-		}
+                            }
-		StringUtils.deleteLastChar(fineTables);
+
-		System.out.println(fineTables);
+                        }
-		System.out.println("..done");
+                    }
-	}
+                    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

src/de/memtext/db/DBServletException.java

@@ -1,4 +1,5 @@
 package de.memtext.db;
+
 /**
  * Eine spezielle Exception im Servlet.
  * Wird zwar im Applet eigentlich nicht gebraucht, aber trotzdem 
@@ -7,14 +8,12 @@ package de.memtext.db;
  * @author Marlies Winterstein 
  * @version 2.0, 18.2.2002
 */
-public class DBServletException extends Exception
+public class DBServletException extends Exception {
-{
+    public DBServletException() {
-    public DBServletException()
-    {
         super();
     }
-    public DBServletException(String msg)
+
-    {
+    public DBServletException(String msg) {
         super(msg);
     }
 }

src/de/memtext/db/DBTimer.java

@@ -6,90 +6,57 @@ import java.sql.Statement;
 import de.memtext.util.TimeUtils;
 
 public class DBTimer {
-private static int runCount=200;
+    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 boolean logEachRun = false;
-private static String sql2=null;//"select sum(betrag) from cob_busa,tmp_children T where fikrkey=T.key";
+
+    //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;";
+
+    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 C, tmp_children T where fikrkey=T.key and T.parent='1'";
-       sql = "select sum(betrag) from cob_busa where fikrkey in ('1', \n" + 
+        sql = "select sum(betrag) from cob_busa where fikrkey in ('1', \n" + " '11      ', \n" + " '111     ', \n" + " '1111    ', \n" + " '1112    ', \n" + " '112     ', \n"
-      " '11      ', \n" + 
+              + " '1121    ', \n" + " '1122    ', \n" + " '113     ', \n" + " '1131    ', \n" + " '1132    ', \n" + " '12      ', \n" + " '121     ', \n" + " '1211    ', \n"
-      " '111     ', \n" + 
+              + " '1212    ', \n" + " '1213    ', \n" + " '122     ', \n" + " '123     ', \n" + " '124     ', \n" + " '125     ', \n" + " '126     ', \n" + " '13      ', \n"
-      " '1111    ', \n" + 
+              + " '131     ', \n" + " '1311    ', \n" + " '1312    ', \n" + " '1313    ', \n" + " '132     ', \n" + " '1321    ', \n" + " '1322    ', \n" + " '1323    ', \n"
-      " '1112    ', \n" + 
+              + " '133     ', \n" + " '1331    ', \n" + " '1332    ', \n" + " '1333    ', \n" + " '1334    ', \n" + " '134     ', \n" + " '135     ', \n" + " '136     ', \n"
-      " '112     ', \n" + 
+              + " '137     ', \n" + " '138     ')";
-      " '1121    ', \n" + 
+        try {
-      " '1122    ', \n" + 
+            Class.forName(driver);
-      " '113     ', \n" + 
+            Connection conn = java.sql.DriverManager.getConnection(url, user, passwd);
-      " '1131    ', \n" + 
+            Statement stmt = conn.createStatement();
-      " '1132    ', \n" + 
+            TimeUtils t = new TimeUtils();
-      " '12      ', \n" + 
+            System.out.println("start " + sql);
-      " '121     ', \n" + 
+            for (int i = 1; i <= runCount; i++) {
-      " '1211    ', \n" + 
+                if (logEachRun) System.out.println(i);
-      " '1212    ', \n" + 
+                stmt.execute(sql);
-      " '1213    ', \n" + 
+                if (sql2 != null) stmt.execute(sql2);
-      " '122     ', \n" + 
+                if (sql3 != null) stmt.execute(sql3);
-      " '123     ', \n" + 
+            }
-      " '124     ', \n" + 
+            t.print(runCount + " times");
-      " '125     ', \n" + 
+            stmt.close();
-      " '126     ', \n" + 
+            conn.close();
-      " '13      ', \n" + 
+            System.out.println("done");
-      " '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) {
+        } catch (Exception e) {
-			e.printStackTrace();
+            e.printStackTrace();
-			System.exit(-1);
+            System.exit(-1);
-		}
+        }
     }
 }
 

src/de/memtext/db/DataSource.java

@@ -5,102 +5,105 @@ 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 static final String CRYPT_PREFIX = "^^@@@";
-	private String url, username, cryptPassword, driver;
+
-	private transient String password;
+    private String url, username, cryptPassword, driver;
-	private DB db;
+
-	public DataSource() {
+    private transient String password;
-	}
+
-
+    private DB db;
-	public DataSource(String url, String username, String password) {
+
-		setUrl(url);
+    public DataSource() {
-		setUsername(username);
+    }
-		setPassword(password);
+
-	}
+    public DataSource(String url, String username, String password) {
-
+        setUrl(url);
-	public void setInformixSampleValues() {
+        setUsername(username);
-		setUrl("jupiter:50000:informixserver=superx_host;database=superx");
+        setPassword(password);
-		setUsername("informix");
+    }
-		setPassword("");
+
-		this.db=DB.INFORMIX;
+    public void setInformixSampleValues() {
-	}
+        setUrl("jupiter:50000:informixserver=superx_host;database=superx");
-	public void setAccessSampleValues() {
+        setUsername("informix");
-		setUrl("jdbc:odbc:jdbcodbc:");
+        setPassword("");
-		setUsername("informix");
+        this.db = DB.INFORMIX;
-		setPassword("");
+    }
-		this.db=DB.ACCESS;
+
-	}
+    public void setAccessSampleValues() {
-
+        setUrl("jdbc:odbc:jdbcodbc:");
-	public String getDriver() {
+        setUsername("informix");
-		return driver;
+        setPassword("");
-	}
+        this.db = DB.ACCESS;
-
+    }
-	public String getPassword() {
+
-		return password;
+    public String getDriver() {
-	}
+        return driver;
-
+    }
-	public String getUrl() {
+
-		return url;
+    public String getPassword() {
-	}
+        return password;
-
+    }
-	public String getUsername() {
+
-		return username;
+    public String getUrl() {
-	}
+        return url;
-
+    }
-	public void setDriver(String string) {
+
-		driver = string;
+    public String getUsername() {
-	}
+        return username;
-
+    }
-	public void setPassword(String string) {
+
-		password = string;
+    public void setDriver(String string) {
-		this.setCryptPassword(string);
+        driver = string;
-	}
+    }
-
+
-	public void setUrl(String string) {
+    public void setPassword(String string) {
-		url = string;
+        password = string;
-	}
+        this.setCryptPassword(string);
-
+    }
-	public void setUsername(String string) {
+
-		username = string;
+    public void setUrl(String string) {
-	}
+        url = string;
-
+    }
-	public DB getDb() {
+
-		return db;
+    public void setUsername(String string) {
-	}
+        username = string;
-
+    }
-	public void setDb(DB db) {
+
-		this.db = db;
+    public DB getDb() {
-	}
+        return db;
-
+    }
-	public void testConnection() throws SQLException, ClassNotFoundException {
+
-	Class.forName("sun.jdbc.odbc.JdbcOdbcDriver");
+    public void setDb(DB db) {
-	Connection con=DriverManager.getConnection(url,username,password);
+        this.db = db;
-	con.close();
+    }
-		
+
-		
+    public void testConnection() throws SQLException, ClassNotFoundException {
-	}
+        Class.forName("sun.jdbc.odbc.JdbcOdbcDriver");
-
+        Connection con = DriverManager.getConnection(url, username, password);
-	public String getCryptPassword() {
+        con.close();
-		return cryptPassword;
+
-	}
+
-
+    }
-	public void setCryptPassword(String aPwd) {
+
-		if (!isEncrypted(aPwd))
+    public String getCryptPassword() {
-		{
+        return cryptPassword;
-			//cryptPassword =CRYPT_PREFIX + CryptUtils.encryptStringDES(aPwd); 
+    }
-				}
+
-	}
+    public void setCryptPassword(String aPwd) {
-
+        if (!isEncrypted(aPwd)) {
-public boolean isEncrypted(String aPwd)
+            //cryptPassword =CRYPT_PREFIX + CryptUtils.encryptStringDES(aPwd); 
-{
+        }
-	return aPwd.startsWith(CRYPT_PREFIX);
+    }
-}
+
+    public boolean isEncrypted(String aPwd) {
+        return aPwd.startsWith(CRYPT_PREFIX);
+    }
 }
 
 //Created on 17.04.2004 at 16:28:15

src/de/memtext/db/DataSourceEditPanel.java

@@ -15,102 +15,107 @@ import de.memtext.widgets.MultilineEditPanel;
 import de.memtext.widgets.WarningMessage;
 
 public class DataSourceEditPanel extends MultilineEditPanel {
-	private DataSource ds;
+    private DataSource ds;
-	private LabeledTextField hostField = new LabeledTextField("Host", 10);
+
-	private LabeledTextField serverField = new LabeledTextField("Server", 10);
+    private LabeledTextField hostField = new LabeledTextField("Host", 10);
-	private LabeledTextField serviceField = new LabeledTextField("Service", 10);
+
-	private LabeledTextField odbcSourceField =
+    private LabeledTextField serverField = new LabeledTextField("Server", 10);
-		new LabeledTextField("Odbc-DSN", 10);
+
-	private LabeledTextField usernameField =
+    private LabeledTextField serviceField = new LabeledTextField("Service", 10);
-		new LabeledTextField("Kennung", 10);
+
-	private LabeledTextField passwordField =
+    private LabeledTextField odbcSourceField = new LabeledTextField("Odbc-DSN", 10);
-		new LabeledPasswordField("Password", 10);
+
-	private JPanel pButtons = new JPanel();
+    private LabeledTextField usernameField = new LabeledTextField("Kennung", 10);
-
+
-	public DataSourceEditPanel() {
+    private LabeledTextField passwordField = new LabeledPasswordField("Password", 10);
-		this.setBackground(null);
+
-		odbcSourceField.setValue("sospos");
+    private JPanel pButtons = new JPanel();
-		odbcSourceField.setBackground(null);
+
-		usernameField.setValue("admin");
+    public DataSourceEditPanel() {
-		this.add(hostField);
+        this.setBackground(null);
-		this.add(serverField);
+        odbcSourceField.setValue("sospos");
-		this.add(serviceField);
+        odbcSourceField.setBackground(null);
-		this.add(odbcSourceField);
+        usernameField.setValue("admin");
-
+        this.add(hostField);
-		this.add(usernameField);
+        this.add(serverField);
-
+        this.add(serviceField);
-		this.add(passwordField);
+        this.add(odbcSourceField);
-		//this.addGlue();
+
-		JButton btnTesten = new JButton("testen");
+        this.add(usernameField);
-		btnTesten.setBackground(null);
+
-		pButtons.setBackground(null);
+        this.add(passwordField);
-		btnTesten.addActionListener(new ActionListener() {
+        //this.addGlue();
-			public void actionPerformed(ActionEvent ae) {
+        JButton btnTesten = new JButton("testen");
-				test();
+        btnTesten.setBackground(null);
-			}
+        pButtons.setBackground(null);
-		});
+        btnTesten.addActionListener(new ActionListener() {
-		pButtons.add(btnTesten);
+            
-		//this.addGlue();
+            @Override
-		this.add(pButtons);
+            public void actionPerformed(ActionEvent ae) {
-	}
+                test();
-	public void setDataSource(DataSource ds) {
+            }
-		this.ds = ds;
+        });
-		setMode(ds.getDb());
+        pButtons.add(btnTesten);
-	}
+        //this.addGlue();
-	public void addButton(JButton btn) {
+        this.add(pButtons);
-		pButtons.add(btn);
+    }
-	}
+
-	private void setMode(DB db) {
+    public void setDataSource(DataSource ds) {
-		if (db.equals(DB.ACCESS)) {
+        this.ds = ds;
-			odbcSourceField.setVisible(true);
+        setMode(ds.getDb());
-			hostField.setVisible(false);
+    }
-			serverField.setVisible(false);
+
-			serviceField.setVisible(false);
+    public void addButton(JButton btn) {
-		}
+        pButtons.add(btn);
-		if (db.equals(DB.INFORMIX)) {
+    }
-			odbcSourceField.setVisible(false);
+
-			hostField.setVisible(true);
+    private void setMode(DB db) {
-			serverField.setVisible(true);
+        if (db.equals(DB.ACCESS)) {
-			serviceField.setVisible(true);
+            odbcSourceField.setVisible(true);
-		}
+            hostField.setVisible(false);
-	}
+            serverField.setVisible(false);
-	protected void test() {
+            serviceField.setVisible(false);
-		updateDataSource();
+        }
-		try {
+        if (db.equals(DB.INFORMIX)) {
-			ds.testConnection();
+            odbcSourceField.setVisible(false);
-			InfoMessage.show(this, "Verbindung erfolgreich aufgebaut", "Erfolg");
+            hostField.setVisible(true);
-		} catch (SQLException e) {
+            serverField.setVisible(true);
-			if (ds.getDb().equals( DB.ACCESS)) {
+            serviceField.setVisible(true);
-				WarningMessage.show(this,
+        }
-					"Verbindung zur ODBC-Quelle "
+    }
-						+ odbcSourceField.getValue()
+
-						+ " konnte nicht aufgebaut werden.\n"
+    protected void test() {
-						+ e,
+        updateDataSource();
-					"Achtung");
+        try {
-			}
+            ds.testConnection();
-		} catch (ClassNotFoundException e) {
+            InfoMessage.show(this, "Verbindung erfolgreich aufgebaut", "Erfolg");
-			WarningMessage.show(this,
+        } catch (SQLException e) {
-				"Benötigte Treiber-Klase nicht gefunden ",
+            if (ds.getDb().equals(DB.ACCESS)) {
-				"Achtung");
+                WarningMessage.show(this, "Verbindung zur ODBC-Quelle " + odbcSourceField.getValue() + " konnte nicht aufgebaut werden.\n" + e, "Achtung");
-		}
+            }
-	}
+        } catch (ClassNotFoundException e) {
-	public void updateDataSource() {
+            WarningMessage.show(this, "Benötigte Treiber-Klase nicht gefunden ", "Achtung");
-		if (ds.getDb() == DB.ACCESS) {
+        }
-			ds.setUrl("jdbc:odbc:" + odbcSourceField.getValue());
+    }
-		}
+
-		ds.setUsername(usernameField.getValue().toString());
+    public void updateDataSource() {
-		ds.setPassword("");
+        if (ds.getDb() == DB.ACCESS) {
-	}
+            ds.setUrl("jdbc:odbc:" + odbcSourceField.getValue());
-	public void addDocumentListener(DocumentListenerObserver listener) {
+        }
-		hostField.addDocumentListener(listener);
+        ds.setUsername(usernameField.getValue().toString());
-		serverField.addDocumentListener(listener);
+        ds.setPassword("");
-		serviceField.addDocumentListener(listener);
+    }
-		odbcSourceField.addDocumentListener(listener);
+
-
+    public void addDocumentListener(DocumentListenerObserver listener) {
-		usernameField.addDocumentListener(listener);
+        hostField.addDocumentListener(listener);
-
+        serverField.addDocumentListener(listener);
-		passwordField.addDocumentListener(listener);
+        serviceField.addDocumentListener(listener);
-	}
+        odbcSourceField.addDocumentListener(listener);
+
+        usernameField.addDocumentListener(listener);
+
+        passwordField.addDocumentListener(listener);
+    }
 }
 
 //Created on 17.04.2004 at 16:37:44

src/de/memtext/db/DbRequest.java

@@ -14,81 +14,79 @@ package de.memtext.db;
  */
 public class DbRequest
 
-	implements java.io.Serializable {
+                implements java.io.Serializable {
-	static final long serialVersionUID = -2L;
+    static final long serialVersionUID = -2L;
-	
+
-
+
-	private String sql;
+    private String sql;
-	private String name;
+
-	private Object[] params;
+    private String name;
-	private int type;
+
-	private DbRequestType dbRequestType;
+    private Object[] params;
-	public DbRequest(String sql)
+
-		{
+    private int type;
-			this(null,sql,null,null);
+
-		}
+    private DbRequestType dbRequestType;
-	public DbRequest(String name,String sql,Object[] params)
+
-	{
+    public DbRequest(String sql) {
-		this(name,sql,params,null);
+        this(null, sql, null, null);
-	}
+    }
-	/**
+
-	 * Request type used by servlet
+    public DbRequest(String name, String sql, Object[] params) {
-	 * @param name
+        this(name, sql, params, null);
-	 * @param sql
+    }
-	 * @param params
+
-	 * @param dbRequestType
+    /**
-	 */
+     * Request type used by servlet
-	public DbRequest(String name,String sql,Object[] params,DbRequestType dbRequestType)
+     * @param name
-	{
+     * @param sql
-	setName(name);
+     * @param params
-	setSql(sql);
+     * @param dbRequestType
-	setParams(params);
+     */
-	this.dbRequestType=dbRequestType;
+    public DbRequest(String name, String sql, Object[] params, DbRequestType dbRequestType) {
-	}
+        setName(name);
-
+        setSql(sql);
-	public String getName()
+        setParams(params);
-	{
+        this.dbRequestType = dbRequestType;
-	return name;
+    }
-	}
+
-
+    public String getName() {
-	public void setName(String name)
+        return name;
-	{
+    }
-	this.name=name;
+
-	}
+    public void setName(String name) {
-
+        this.name = name;
-	public Object[] getParams()
+    }
-	{
+
-	return params;
+    public Object[] getParams() {
-	}
+        return params;
-
+    }
-	public void setParams(Object[] params)
+
-	{
+    public void setParams(Object[] params) {
-	this.params=params;
+        this.params = params;
-	}
+    }
-
+
-	public String getSql()
+    public String getSql() {
-	{
+        return sql;
-	return sql;
+    }
-	}
+
-
+    public void setSql(String sql) {
-	public void setSql(String sql)
+        this.sql = sql;
-	{
+    }
-	this.sql=sql;
+
-	}
+    /**
-
+     * @return
-	/**
+     */
-	 * @return
+    public DbRequestType getDbRequestType() {
-	 */
+        return dbRequestType;
-	public DbRequestType getDbRequestType() {
+    }
-		return dbRequestType;
+
-	}
+    /**
-
+     * @param type
-	/**
+     */
-	 * @param type
+    public void setDbRequestType(DbRequestType type) {
-	 */
+        dbRequestType = type;
-	public void setDbRequestType(DbRequestType type) {
+    }
-		dbRequestType = type;
+
-	}
+}
-
-	}
 

src/de/memtext/db/DbRequestType.java

@@ -14,14 +14,18 @@ package de.memtext.db;
  */
 public class DbRequestType {
 
-	private final String name;
+    private final String name;
 
-public static final DbRequestType QUERY=new DbRequestType("QUERY");
+    public static final DbRequestType QUERY = new DbRequestType("QUERY");
-public static final DbRequestType UPDATE=new DbRequestType("UPDATE");
+
-private DbRequestType(String name) 
+    public static final DbRequestType UPDATE = new DbRequestType("UPDATE");
-{
+
-	this.name=name;
+    private DbRequestType(String name) {
-}
+        this.name = name;
-public String toString() {return name;
+    }
-}	
+
+    @Override
+    public String toString() {
+        return name;
+    }
 }

src/de/memtext/db/DbResponse.java

@@ -15,44 +15,55 @@ import java.util.Collection;
  * Window>Preferences>Java>Code Generation>Code and Comments
  */
 public class DbResponse implements java.io.Serializable {
-static final long serialVersionUID = -3L;
+    static final long serialVersionUID = -3L;
-private Collection result;
-private boolean OK;
-private Exception exception;
-private int updatedRowsCount;
 
-/**
+    private Collection result;
-* 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) {
+    private boolean OK;
-	this.updatedRowsCount = updatedRowsCount;
+
-}
+    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;
+    }
 
 }

src/de/memtext/db/DbRmiClient.java

@@ -21,90 +21,85 @@ import java.util.List;
  * Window>Preferences>Java>Code Generation>Code and Comments
  */
 public class DbRmiClient {
-	private DbServerI dbServerI= null;
+    private DbServerI dbServerI = null;
-	String name="DbServer"; //"//localhost/DbServer"
+
-public DbRmiClient()
+    String name = "DbServer"; //"//localhost/DbServer"
-{
+
-	if (System.getSecurityManager() == null) {
+    public DbRmiClient() {
-					System.setSecurityManager(new RMISecurityManager());
+        if (System.getSecurityManager() == null) {
-				}
+            System.setSecurityManager(new RMISecurityManager());
-	try {
+        }
-		dbServerI = (DbServerI)Naming.lookup(name);
+        try {
-	} catch (MalformedURLException e) {
+            dbServerI = (DbServerI) Naming.lookup(name);
-		e.printStackTrace();
+        } catch (MalformedURLException e) {
-	} catch (RemoteException e) {
+            e.printStackTrace();
-		e.printStackTrace();
+        } catch (RemoteException e) {
-	} catch (NotBoundException e) {
+            e.printStackTrace();
-		e.printStackTrace();
+        } catch (NotBoundException e) {
-	}
+            e.printStackTrace();
-}
+        }
-public void test()
+    }
-{
+
-			testUpdate();
+    public void test() {
-	testQuery();
+        testUpdate();
-}
+        testQuery();
-private void testUpdate() {
+    }
-	try {
+
-			
+    private void testUpdate() {
-		DbRequest dbRequest=new DbRequest("update dummy set col2=99");
+        try {
-		DbResponse dbResponse=dbServerI.execute(dbRequest);
+
-		if (dbResponse.isOK())
+            DbRequest dbRequest = new DbRequest("update dummy set col2=99");
-		{
+            DbResponse dbResponse = dbServerI.execute(dbRequest);
-			System.out.println("OK - updated rows :" + dbResponse.getUpdatedRowsCount());
+            if (dbResponse.isOK()) {
-		}
+                System.out.println("OK - updated rows :" + dbResponse.getUpdatedRowsCount());
-		else
+            } else {
-		{
+                System.out.println("failed :" + dbResponse.getException());
-			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();
 
+        } 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();
+
+
+    }
+
+}

src/de/memtext/db/DbServerI.java

@@ -16,8 +16,11 @@ import java.rmi.RemoteException;
  * Window>Preferences>Java>Code Generation>Code and Comments
  */
 public interface DbServerI extends Remote {
-	public DbResponse execute(String sql) throws RemoteException;
+    public DbResponse execute(String sql) throws RemoteException;
-	public DbResponse executeQuery(String sql) throws RemoteException;
+
-public DbResponse execute(DbRequest dbRequest) throws RemoteException;
+    public DbResponse executeQuery(String sql) throws RemoteException;
-public DbResponse executeQuery(DbRequest dbRequest) throws RemoteException;
+
+    public DbResponse execute(DbRequest dbRequest) throws RemoteException;
+
+    public DbResponse executeQuery(DbRequest dbRequest) throws RemoteException;
 }

src/de/memtext/db/DbServerImpl.java

@@ -22,96 +22,105 @@ import java.util.List;
  * To change the template for this generated type comment go to
  * Window>Preferences>Java>Code Generation>Code and Comments
  */
-public class DbServerImpl
+public class DbServerImpl extends UnicastRemoteObject implements de.memtext.db.DbServerI {
-	extends UnicastRemoteObject
+    private String dbDriver = "org.hsqldb.jdbcDriver";
-	implements de.memtext.db.DbServerI {
+
-	private String dbDriver = "org.hsqldb.jdbcDriver";
+    private String dbURL = "jdbc:hsqldb:hsql://localhost:9000";
-	private String dbURL = "jdbc:hsqldb:hsql://localhost:9000";
+
-	private String userid = "SA";
+    private String userid = "SA";
-	private String passwd = "";
+
-	private int updateRowCount;
+    private String passwd = "";
-	private Connection con;
+
-	private Statement stmt;
+    private int updateRowCount;
-	public DbServerImpl() throws RemoteException {
+
-		super();
+    private Connection con;
-		ConnectionCreator.loadClass(dbDriver);
+
-		try {
+    private Statement stmt;
-			con = ConnectionCreator.getConnection(dbURL, userid, passwd);
+
-			stmt = con.createStatement();
+    public DbServerImpl() throws RemoteException {
-		} catch (Exception e) {
+        super();
-			e.printStackTrace();
+        ConnectionCreator.loadClass(dbDriver);
-			throw new RemoteException("Couldn't connect to DB" + e.toString());
+        try {
-		}
+            con = ConnectionCreator.getConnection(dbURL, userid, passwd);
-	}
+            stmt = con.createStatement();
-	public DbResponse execute(String sql) throws RemoteException {
+        } catch (Exception e) {
-		DbResponse result = new DbResponse(null, true, null);
+            e.printStackTrace();
-		try {
+            throw new RemoteException("Couldn't connect to DB" + e.toString());
-			updateRowCount = stmt.executeUpdate(sql);
+        }
-			result.setUpdatedRowsCount(updateRowCount);
+    }
-			result.setOK(true);
+
-		} catch (SQLException e) {
+    @Override
-			e.printStackTrace();
+    public DbResponse execute(String sql) throws RemoteException {
-			result.setOK(false);
+        DbResponse result = new DbResponse(null, true, null);
-			result.setException(e);
+        try {
-		}
+            updateRowCount = stmt.executeUpdate(sql);
-		return result;
+            result.setUpdatedRowsCount(updateRowCount);
-	}
+            result.setOK(true);
-	
+        } catch (SQLException e) {
-	/* (non-Javadoc)
+            e.printStackTrace();
-	 * @see de.mbisping.db.DbServerI#execute(de.mbisping.db.DbRequest)
+            result.setOK(false);
-	 */
+            result.setException(e);
-	public DbResponse execute(DbRequest dbRequest) throws RemoteException {
+        }
-		DbResponse result = new DbResponse(null, true, null);
+        return result;
-		if (dbRequest.getSql() != null)
+    }
-			result = execute(dbRequest.getSql());
+
-
+    /* (non-Javadoc)
-		return result;
+     * @see de.mbisping.db.DbServerI#execute(de.mbisping.db.DbRequest)
-	}
+     */
-
+    @Override
-	public DbResponse executeQuery(String sql) throws RemoteException {
+    public DbResponse execute(DbRequest dbRequest) throws RemoteException {
-		DbResponse result = new DbResponse(null, true, null);
+        DbResponse result = new DbResponse(null, true, null);
-		try {
+        if (dbRequest.getSql() != null) result = execute(dbRequest.getSql());
-			ResultSet rs=stmt.executeQuery(sql);
+
-			List list=DbUtils.toResultList(rs);
+        return result;
-			result.setResult(list);
+    }
-			result.setOK(true);
+
-		} catch (SQLException e) {
+    @Override
-			e.printStackTrace();
+    public DbResponse executeQuery(String sql) throws RemoteException {
-			result.setOK(false);
+        DbResponse result = new DbResponse(null, true, null);
-			result.setException(e);
+        try {
-		}
+            ResultSet rs = stmt.executeQuery(sql);
-		return result;
+            List list = DbUtils.toResultList(rs);
-		}
+            result.setResult(list);
-	/* (non-Javadoc)
+            result.setOK(true);
-	 * @see de.mbisping.db.DbServerI#executeQuery(de.mbisping.db.DbRequest)
+        } catch (SQLException e) {
-	 */
+            e.printStackTrace();
-	public DbResponse executeQuery(DbRequest dbRequest)
+            result.setOK(false);
-		throws RemoteException {
+            result.setException(e);
-		DbResponse result = new DbResponse(null, true, null);
+        }
-		result.setUpdatedRowsCount(20);
+        return result;
-		return result;
+    }
-	}
+
-
+    /* (non-Javadoc)
-	public static void main(String args[]) {
+     * @see de.mbisping.db.DbServerI#executeQuery(de.mbisping.db.DbRequest)
-
+     */
-		// Create and install a security manager
+    @Override
-		if (System.getSecurityManager() == null) {
+    public DbResponse executeQuery(DbRequest dbRequest) throws RemoteException {
-			System.setSecurityManager(new RMISecurityManager());
+        DbResponse result = new DbResponse(null, true, null);
-		}
+        result.setUpdatedRowsCount(20);
-
+        return result;
-		try {
+    }
-
+
-			DbServerImpl obj = new DbServerImpl();
+    public static void main(String args[]) {
-			//String name="//localhost/DbServer";
+
-			String name = "DbServer";
+        // Create and install a security manager
-			// Bind this object instance to the name "HelloServer"
+        if (System.getSecurityManager() == null) {
-			Naming.rebind(name, obj);
+            System.setSecurityManager(new RMISecurityManager());
-
+        }
-			System.out.println(name + " bound in registry");
+
-		} catch (Exception e) {
+        try {
-			System.out.println("DbServerImpl err: " + e.getMessage());
+
-			e.printStackTrace();
+            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();
+        }
+    }
 
 }

src/de/memtext/db/DbUtils.java

@@ -1,12 +1,9 @@
 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;
@@ -16,162 +13,87 @@ import java.util.List;
  */
 public class DbUtils {
 
-	/**
+    /**
-	 * 
+     * 
-	 */
+     */
-	private DbUtils() {
+    private DbUtils() {
-	}
+    }
-
+
-	/*
+    /*	private Vector toResultVector(ResultSet rs) throws SQLException
-	 * private Vector toResultVector(ResultSet rs) throws SQLException { Vector help
+    	{
-	 * = new Vector(); ResultSetMetaData rsmd = rs.getMetaData(); int
+    			Vector help = new Vector();
-	 * numberOfColumns = rsmd.getColumnCount();
+    		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); }
+    		Vector row = null;
-	 * rs.close(); return help;
+    		while (rs.next()) {
-	 * 
+    			row = new Vector();
-	 * }
+    			for (int i = 1; i <= numberOfColumns; i++) {
-	 */
+    				row.add(rs.getObject(i));
-	public static List toResultList(ResultSet rs) throws SQLException {
+    			}
-		List help = new LinkedList();
+    			help.add(row);
-		ResultSetMetaData rsmd = rs.getMetaData();
+    		}
-		int numberOfColumns = rsmd.getColumnCount();
+    		rs.close();
-
+    		return help;
-		List row = null;
+    
-		while (rs.next()) {
+    	}*/
-			row = new LinkedList();
+    public static List toResultList(ResultSet rs) throws SQLException {
-			for (int i = 1; i <= numberOfColumns; i++) {
+        List help = new LinkedList();
-				row.add(rs.getObject(i));
+        ResultSetMetaData rsmd = rs.getMetaData();
-			}
+        int numberOfColumns = rsmd.getColumnCount();
-			help.add(row);
+
-		}
+        List row = null;
-		rs.close();
+        while (rs.next()) {
-		return help;
+            row = new LinkedList();
-	}
+            for (int i = 1; i <= numberOfColumns; i++) {
-
+                row.add(rs.getObject(i));
-	public static void grantRightToAllTables() {
+            }
-		String url = "jdbc:hsqldb:hsql://localhost:9999";
+            help.add(row);
-		String user = "";
+        }
-		String right = "select";
+        rs.close();
-		try {
+        return help;
-			Class.forName("org.hsqldb.jdbcDriver");
+    }
-		} catch (ClassNotFoundException e) {
+
-			e.printStackTrace();
+    public static void grantRightToAllTables() throws SQLException {
-		}
+        String url = "jdbc:hsqldb:hsql://localhost:9999";
-
+        String user = "";
-		try {
+        String right = "select";
-			DBAccess.addConnection("dbConn", DriverManager.getConnection(url, "admin", "hatschi3000"));
+        try {
-		} catch (SQLException e1) {
+            Class.forName("org.hsqldb.jdbcDriver");
-			e1.printStackTrace();
+        } catch (ClassNotFoundException e) {
-		} catch (Exception e1) {
+            e.printStackTrace();
-			e1.printStackTrace();
+        }
-		}
+
-		List tablist = DBAccess.get("dbConn").getTableList();
+        try {
-		StringBuffer buf = new StringBuffer();
+            DBAccess.addConnection("dbConn", DriverManager.getConnection(url, "admin", "hatschi3000"));
-		for (Iterator it = tablist.iterator(); it.hasNext();) {
+        } catch (SQLException e1) {
-			String tabname = (String) it.next();
+            e1.printStackTrace();
-			buf.append("grant " + right + " on " + tabname + " to " + user + ";");
+        } catch (Exception e1) {
-
+            e1.printStackTrace();
-		}
+        }
-		DBAccess.get("dbConn").execute(buf.toString());
+        List tablist = DBAccess.get("dbConn").getTableList();
-
+        StringBuffer buf = new StringBuffer();
-		DBAccess.closeConnection("dbConn");
+        for (Iterator it = tablist.iterator(); it.hasNext();) {
-
+            String tabname = (String) it.next();
-	}
+            buf.append("grant " + right + " on " + tabname + " to " + user + ";");
-
+
-	/**
+        }
-	 * Places Object in inverted single commas if it isn't null
+        DBAccess.get("dbConn").execute(buf.toString());
-	 * 
+
-	 * @param val
+
-	 * @return either "null" if val is null or "'val'"
+
-	 */
+        DBAccess.closeConnection("dbConn");
-	public static String placeInInvertedCommas(Object val) {
+
-		if (val == null)
+    }
-			return "null";
+
-		return "'" + val + "'";
+    /**
-	}
+     * Places Object in inverted single commas if it isn't null
-
+     * @param val
-	
+     * @return either "null" if val is null or "'val'"
-	public static int getInt(Statement stm, String query) throws SQLException {
+     */
-		int result = -1;
+    public static String placeInInvertedCommas(Object val) {
-		ResultSet rs = stm.executeQuery(query); 
+        if (val == null) return "null";
-		while (rs.next()) {
+        return "'" + val + "'";
-			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

src/de/memtext/db/HsqlProcedures.java

@@ -12,112 +12,58 @@ import java.sql.Statement;
  */
 public class HsqlProcedures {
 
-	/**
+    /**
-	 * Constructor for HsqlProcedures.
+     * Constructor for HsqlProcedures.
-	 */
+     */
-	private HsqlProcedures() {
+    private HsqlProcedures() {
-		super();
+        super();
-	}
+    }
 
-	public static Integer get1()
+    public static Integer get1() {
-	{
+        return Integer.valueOf(1);
-		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 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();
-		}
 
-	}
+    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();
+        }
+
+    }
 
 }

src/de/memtext/db/HsqlStandaloneMgr.java

@@ -65,9 +65,8 @@ public class HsqlStandaloneMgr {
     private static void initResources() {
         String mypackage = "";
         //if you place the Resources classes in some package, define it like this
-         mypackage="de.memtext.db.";
+        mypackage = "de.memtext.db.";
-        resources = (AbstractHsqlStandaloneMgrResources) ResourceBundle
+        resources = (AbstractHsqlStandaloneMgrResources) ResourceBundle.getBundle(mypackage + "HsqlStandaloneMgrResources");
-                .getBundle(mypackage + "HsqlStandaloneMgrResources");
     }
 
 
@@ -83,7 +82,7 @@ public class HsqlStandaloneMgr {
      * @return true if database is already opened
      */
     public static boolean isDatabaseOpen(String path, String databasename) {
-        File lckFile = new File(getAdaptedPath(path)+databasename+".lck");
+        File lckFile = new File(getAdaptedPath(path) + databasename + ".lck");
         return lckFile.exists();
     }
 
@@ -98,26 +97,21 @@ public class HsqlStandaloneMgr {
      * @param String
      *            databasename - of the original database, no _TMP_COPY appendix
      */
-    public static void deleteTmpFiles(String url, String path,
+    public static void deleteTmpFiles(String url, String path, String databasename) {
-            String databasename) {
+        if (databasename.indexOf("_TMP_COPY") > -1) throw new IllegalArgumentException("Please specifiy the name of the original database without _TMP_COPY");
-        if (databasename.indexOf("_TMP_COPY") > -1)
+        path = getAdaptedPath(path);
-            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())
+            if (f.exists()) f.delete();
-                f.delete();
         } else {
             //delete files for temp. connection
             String tmp = url.substring(tmpPos);
-          if (path==null||path.equals("")) path=".";
+            if (path == null || path.equals("")) path = ".";
             File fpath = new File(path);
-            File tmpFiles[] = fpath.listFiles(new TmpFileFilter(databasename
+            File tmpFiles[] = fpath.listFiles(new TmpFileFilter(databasename + tmp));
-                    + tmp));
             for (int i = 0; i < tmpFiles.length; i++) {
                 tmpFiles[i].delete();
             }
@@ -140,12 +134,11 @@ public class HsqlStandaloneMgr {
      */
     public static int askUser(Component parentComponent, String path,
 
-    String databasename, boolean isReadOnlyCopyWanted) {
+                              String databasename, boolean isReadOnlyCopyWanted) {
-        if (resources == null)
+        if (resources == null) initResources();
-            initResources();
 
         String username = null;
-        File f = new File(getAdaptedPath(path) +  databasename + "_user.properties");
+        File f = new File(getAdaptedPath(path) + databasename + "_user.properties");
         if (f.exists()) {
             Properties p = new Properties();
             FileInputStream fis;
@@ -155,25 +148,18 @@ public class HsqlStandaloneMgr {
                 username = p.getProperty("user");
                 fis.close();
             } catch (Exception e) {
-                System.err.println(resources
+                System.err.println(resources.getString("Couldn't read user name"));
-                        .getString("Couldn't read user name"));
                 e.printStackTrace();
             }
 
         }
-        StringBuffer msg = new StringBuffer(resources.getDbInUseBy(
+        StringBuffer msg = new StringBuffer(resources.getDbInUseBy(databasename, username));
-                databasename, username));
 
         if (isReadOnlyCopyWanted)
-            msg
+            msg.append(resources.getString("Would you like to open a temporary copy in read-only mode?"));
-                    .append(resources
-                            .getString("Would you like to open a temporary copy in read-only mode?"));
         else
-            msg
+            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!"));
-                    .append(resources
+        return JOptionPane.showConfirmDialog(parentComponent, msg, "HSQLDB", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
-                            .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);
 
     }
 
@@ -200,12 +186,9 @@ public class HsqlStandaloneMgr {
      * @throws SQLException
      * @throws IOException
      */
-    public static Connection getTmpConnection(Component parentComponent,
+    public static Connection getTmpConnection(Component parentComponent, String path, String databasename, String username, String password, boolean isReadOnlyCopyWanted)
-            String path, String databasename, String username, String password,
+                    throws ClassNotFoundException, SQLException, IOException {
-            boolean isReadOnlyCopyWanted) throws ClassNotFoundException,
+        if (resources == null) initResources();
-            SQLException, IOException {
-        if (resources == null)
-            initResources();
         Class.forName("org.hsqldb.jdbcDriver");
         path = getAdaptedPath(path);
 
@@ -214,46 +197,33 @@ public class HsqlStandaloneMgr {
         try {
             copyDatabaseFiles(path, databasename, tmpInstanceNumber);
         } catch (IOException e) {
-            JOptionPane.showMessageDialog(parentComponent, resources
+            JOptionPane.showMessageDialog(parentComponent, resources.getString("Could not create temporary copy of database.)") + "\n" + e, "HSQLDB", JOptionPane.WARNING_MESSAGE);
-                    .getString("Could not create temporary copy of database.)")
-                    + "\n" + e, "HSQLDB", JOptionPane.WARNING_MESSAGE);
             throw e;
         }
 
         if (isReadOnlyCopyWanted) {
             try {
-                setReadonly(path +  databasename + "_TMP_COPY"
+                setReadonly(path + databasename + "_TMP_COPY" + tmpInstanceNumber + ".properties");
-                        + tmpInstanceNumber + ".properties");
             } catch (IOException e) {
-                JOptionPane
+                JOptionPane.showMessageDialog(parentComponent, resources.getString("Could not set temporary copy of database to readonly mode.") + "\n" + e, "HSQLDB",
-                        .showMessageDialog(
+                                              JOptionPane.WARNING_MESSAGE);
-                                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
+        String url = "jdbc:hsqldb:file:" + path + databasename + "_TMP_COPY" + tmpInstanceNumber;
-                + "_TMP_COPY" + tmpInstanceNumber;
 
-        Connection con = java.sql.DriverManager.getConnection(url, username,
+        Connection con = java.sql.DriverManager.getConnection(url, username, password);
-                password);
 
         if (!isReadOnlyCopyWanted) {
             Statement stmt = con.createStatement();
-            ResultSet rs = stmt
+            ResultSet rs = stmt.executeQuery("select count(*) from system_tables where hsqldb_type='TEXT'");
-                    .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(
+                throw new SQLException(resources.getString("Handling non read-only temporary database with text tables is not supported"));
-                        resources
-                                .getString("Handling non read-only temporary database with text tables is not supported"));
             }
             rs.close();
             stmt.close();
@@ -263,8 +233,7 @@ public class HsqlStandaloneMgr {
 
     private static int checkNumber(String path, String databasename) {
         int result = 1;
-        while (new File(path + databasename + "_TMP_COPY" + result
+        while (new File(path + databasename + "_TMP_COPY" + result + ".script").exists())
-                + ".script").exists())
             result++;
         return result;
     }
@@ -287,22 +256,19 @@ public class HsqlStandaloneMgr {
      * @throws SQLException
      * @throws IOException
      */
-    public static Connection getConnection(String path, String databasename,
+    public static Connection getConnection(String path, String databasename, String username, String password) throws ClassNotFoundException, SQLException, IOException {
-            String username, String password) throws ClassNotFoundException,
-            SQLException, IOException {
         Class.forName("org.hsqldb.jdbcDriver");
-        String url=null;
+        String url = null;
-        if (path==null)
+        if (path == null)
-            url="jdbc:hsqldb:"+databasename;
+            url = "jdbc:hsqldb:" + databasename;
         else
-             url = "jdbc:hsqldb:file:" + getAdaptedPath(path) + databasename;
+            url = "jdbc:hsqldb:file:" + getAdaptedPath(path) + databasename;
 
-        Connection con = java.sql.DriverManager.getConnection(url, username,
+        Connection con = java.sql.DriverManager.getConnection(url, username, password);
-                password);
 
         Properties p = new Properties();
         p.put("user", System.getProperty("user.name"));
-        String filename=(path!=null?path+"/"+databasename+"_user.properties":databasename+"_user.properties");
+        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();
@@ -318,9 +284,8 @@ public class HsqlStandaloneMgr {
      * @return adapted path String
      */
     private static String getAdaptedPath(String path) {
-        if (path == null)  path = "";
+        if (path == null) path = "";
-        if ((path.equals(".")||path.length()>1)&&!(path.endsWith("/")||path.endsWith("\\")))
+        if ((path.equals(".") || path.length() > 1) && !(path.endsWith("/") || path.endsWith("\\"))) path += File.separator;
-            path+=File.separator;
 
         return path;
     }
@@ -350,20 +315,15 @@ public class HsqlStandaloneMgr {
      *            databasename
      * @throws IOException
      */
-    private static void copyDatabaseFiles(String path, String databasename,
+    private static void copyDatabaseFiles(String path, String databasename, int number) throws IOException {
-            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())
+        if (new File(s + ".log").exists()) copyFile(s + ".log", s + "_TMP_COPY" + number + ".log");
-            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 + ".data").exists())
+        if (new File(s + ".backup").exists()) copyFile(s + ".backup", s + "_TMP_COPY" + number + ".backup");
-            copyFile(s + ".data", s + "_TMP_COPY" + number + ".data");
+        if (new File(s + ".nio").exists()) copyFile(s + ".nio", s + "_TMP_COPY" + number + ".nio");
-        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");
     }
 
     /**
@@ -375,8 +335,7 @@ public class HsqlStandaloneMgr {
      *            target - target file name (incl. path if necessary)
      * @throws IOException
      */
-    static public void copyFile(String source, String target)
+    static public void copyFile(String source, String target) throws IOException {
-            throws IOException {
 
         try {
             FileInputStream is = new FileInputStream(source);
@@ -399,8 +358,7 @@ public class HsqlStandaloneMgr {
             os.close();
 
         } catch (IOException e) {
-            throw new IOException("Couldn't copy file " + source + ": "
+            throw new IOException("Couldn't copy file " + source + ": " + e.toString());
-                    + e.toString());
         }
     }
 
@@ -411,6 +369,7 @@ public class HsqlStandaloneMgr {
             this.tmpName = tmpName;
         }
 
+        @Override
         public boolean accept(File dir, String name) {
             return name.indexOf(tmpName) > -1;
         }

src/de/memtext/db/HsqlStandaloneMgrResources.java

@@ -29,40 +29,36 @@
  */
 
 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
+public class HsqlStandaloneMgrResources extends AbstractHsqlStandaloneMgrResources {
-        AbstractHsqlStandaloneMgrResources {
+    @Override
     public Object[][] getContents() {
         return contents;
     }
 
     static final Object[][] contents = {
 
-            { "Couldn't read user name", "Couldn't read user name" },
+                                         { "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 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!" },
-                    "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." },
-                    "Would you like to open a temporary copy?\nAttention - any changes to the database will be lost after closing the program!" },
+                                         { "Could not set temporary copy of database to readonly mode.", "Could not set temporary copy of database to readonly mode." },
-            { "Could not create temporary copy of database.",
+                                         { "Handling non read-only temporary database with text tables is not supported",
-                    "Could not create temporary copy of database." },
+                                           "Handling non read-only temporary database with text tables is not supported" }
-            { "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)
+        if (user != null) result += " by user " + user;
-            result += " by user " + user;
         result += ".\n";
         return result;
     }

src/de/memtext/db/HsqlStandaloneMgrResources_de.java

@@ -29,38 +29,33 @@
  */
 
 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
+public class HsqlStandaloneMgrResources_de extends AbstractHsqlStandaloneMgrResources {
-        AbstractHsqlStandaloneMgrResources {
+    @Override
     public Object[][] getContents() {
         return contents;
     }
 
-    static final Object[][] contents = {
+    static final Object[][] contents = { { "Couldn't read user name", "Konnte Usernamen nicht lesen" },
-            { "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 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!",
-                    "Möchten Sie eine schreibgeschützte Kopie öffnen?" },
+                                           "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." },
-                    "Would you like to open a temporary copy?\nAttention - any changes to the database will be lost after closing the program!",
+                                         { "Could not set temporary copy of database to readonly mode.", "Konnte die temp. Kopie nicht auf schreibgeschützt setzen" },
-                    "Möchten Sie eine temporäre Kopie öffnen?\nAchtung, wenn Sie das Programm beenden, gehen alle Änderungen, die Sie vorgenommen haben, verloren!" },
+                                         { "Handling non read-only temporary database with text tables is not supported",
-            { "Could not create temporary copy of database.",
+                                           "Nicht schreibgeschützte Datenbanken mit Text-Tables werden nicht unterstützt" }
-                    "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)
+        if (user != null) result += " vom User " + user;
-            result += " vom User " + user;
         result += ".\n";
         return result;
     }

src/de/memtext/db/Library2.java

@@ -4,6 +4,7 @@ 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.
@@ -18,74 +19,65 @@ import java.sql.Statement;
  * CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"
  */
 public class Library2 {
-	private Library2() {
+    private Library2() {
-		super();
+        super();
-	}
+    }
-	/**
+
-	 * Fills regular tables with values from a CSV-file.
+    /**
-	 * Similar to Postgres COPY FROM command.
+     * 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
+     * If you want to fill your table TEST with data from test.csv
-	 * GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC and
+     * make sure that this class in the classpath and that
-	 * CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"
+     * GRANT ALL ON CLASS "org.hsqldb.Library2" TO PUBLIC and
-	 * has been called in your database at some point.
+     * CREATE ALIAS COPYFROM FOR "org.hsqldb.Library2.copyFrom"
+     * has been called in your database at some point.
     
-	 *  * Then execute   
+     *  * Then execute   
-	 * COPYFROM("TEST","test.csv",null)
+     * COPYFROM("TEST","test.csv",null)
-	 * 
+     * 
-	 * if your not using , but | as a field separator
+     * if your not using , but | as a field separator
-	  COPYFROM("TEST","test.csv","fs=|")
+      COPYFROM("TEST","test.csv","fs=|")
     
-	 * 
+     * 
-	 * @param con - Connection is automatically handed over by HSQL
+     * @param con - Connection is automatically handed over by HSQL
-	 * @param table - the name of the table that is to be filled
+     * @param table - the name of the table that is to be filled
-	 * 				  if your table isn't found capital letters may be required
+     * 				  if your table isn't found capital letters may be required
-	 * @param file - the filename of the CSV-file
+     * @param file - the filename of the CSV-file
-	 * @param options - you can specify options separated by ; 
+     * @param options - you can specify options separated by ; 
-	 * which are described in the text table documentation e.g.
+     * which are described in the text table documentation e.g.
-	 * fs=| to use pipe instead of default comma as field separator or
+     * fs=| to use pipe instead of default comma as field separator or
-	 * or 
+     * or 
-	 * fs=|;vs=.;lvs=~" varchar separator, longvarchar separator
+     * fs=|;vs=.;lvs=~" varchar separator, longvarchar separator
-	 * ignore_first=true; ignore first line
+     * ignore_first=true; ignore first line
-	 * all_quoted=true or
+     * all_quoted=true or
-	 * encoding=UTF-8 if you don't have ASCII
+     * encoding=UTF-8 if you don't have ASCII
-	 * @throws SQLException
+     * @throws SQLException
-	 */
+     */
-	public static void copyFrom(
+    public static void copyFrom(Connection con, String table, String file, String options) throws SQLException {
-		Connection con,
+        StringBuffer buf = new StringBuffer("create text table TMP_SOURCE_" + table + " (");
-		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);
+        ResultSet rs = con.getMetaData().getColumns(null, null, table, null);
-		String colname, coltype;
+        String colname, coltype;
-		boolean tableFound = false;
+        boolean tableFound = false;
-		while (rs.next()) {
+        while (rs.next()) {
-			tableFound = true;
+            tableFound = true;
-			colname = rs.getObject(4).toString();
+            colname = rs.getObject(4).toString();
-			coltype = rs.getObject(6).toString();
+            coltype = rs.getObject(6).toString();
-			buf.append(colname + " " + coltype + ",");
+            buf.append(colname + " " + coltype + ",");
-		}
+        }
-		rs.close();
+        rs.close();
-		if (!tableFound)
+        if (!tableFound) throw new IllegalArgumentException("Copy from failed - table " + table + " not found");
-			throw new IllegalArgumentException(
+        buf.deleteCharAt(buf.lastIndexOf(","));
-				"Copy from failed - table " + table + " not found");
+        buf.append("); SET TABLE TMP_SOURCE_" + table + " SOURCE \"" + file);
-		buf.deleteCharAt(buf.lastIndexOf(","));
+        if (options != null) buf.append(";" + options);
-		buf.append("); SET TABLE TMP_SOURCE_" + table + " SOURCE \"" + file);
+        buf.append("\";");
-		if (options != null)
+        buf.append("insert into " + table + " select * from TMP_SOURCE_" + table);
-			buf.append(";" + options);
+        Statement stmt = con.createStatement();
-		buf.append("\";");
+        try {
-		buf.append(
+            stmt.execute(buf.toString());
-			"insert into " + table + " select * from TMP_SOURCE_" + table);
+        } finally {
-		Statement stmt = con.createStatement();
+            stmt.execute("drop table TMP_SOURCE_" + table + " IF EXISTS");
-		try {
+        }
-			stmt.execute(buf.toString());
+    }
-		} finally {
-			stmt.execute("drop table TMP_SOURCE_" + table + " IF EXISTS");
-		}
-	}
 }

src/de/memtext/db/MemtextPool.java

@@ -1,262 +0,0 @@
-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

src/de/memtext/db/MemtextPools.java

@@ -1,197 +0,0 @@
-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

src/de/memtext/db/NichtAngemeldetException.java

@@ -1,4 +1,5 @@
 package de.memtext.db;
+
 public class NichtAngemeldetException extends Exception {
 
     public NichtAngemeldetException() {

src/de/memtext/db/ProcedureSql.java

@@ -1,6 +1,7 @@
 package de.memtext.db;
 
 import de.memtext.util.StringUtils;
+
 /**
  * Hilfsklasse zum Erstellen von Prozeduraufrüfen für verschd. 
  * Datenbanken.
@@ -14,87 +15,85 @@ import de.memtext.util.StringUtils;
  */
 public class ProcedureSql {
 
-	private DB dbsystem;
+    private DB dbsystem;
-	private boolean isAddPossible = true,isNameSet, isFinished;
+
-	private String finalSelect = "";
+    private boolean isAddPossible = true, isNameSet, isFinished;
-
+
-	private StringBuffer result = new StringBuffer();
+    private String finalSelect = "";
-
+
-	public ProcedureSql(DB db) {
+    private StringBuffer result = new StringBuffer();
-		this.dbsystem = db;
+
-		if (dbsystem.equals(DB.INFORMIX))
+    public ProcedureSql(DB db) {
-			result.append("execute procedure ");
+        this.dbsystem = db;
-		if (dbsystem.equals(DB.POSTGRES))
+        if (dbsystem.equals(DB.INFORMIX)) result.append("execute procedure ");
-			result.append("select ");
+        if (dbsystem.equals(DB.POSTGRES)) result.append("select ");
-
+
-	}
+    }
-
+
-	public ProcedureSql(DB dbsystem, String procname) {
+    public ProcedureSql(DB dbsystem, String procname) {
-		this(dbsystem);
+        this(dbsystem);
-		result.append(procname + ("("));
+        result.append(procname + ("("));
-		isNameSet=true;
+        isNameSet = true;
-	}
+    }
-	public void setName(String procName) {
+
-		if (isNameSet)throw new IllegalStateException("Name wurde schon gesetzt");
+    public void setName(String procName) {
-		result.append(procName+("("));
+        if (isNameSet) throw new IllegalStateException("Name wurde schon gesetzt");
-		isNameSet=true;
+        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");
+    public void addParam(String param) {
-		result.append(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");
+    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.INFORMIX)) result.append("date");
-		if (dbsystem.equals(DB.POSTGRES))
+        if (dbsystem.equals(DB.POSTGRES)) result.append("date_val");
-			result.append("date_val");
+        result.append("('" + param + "'),");
-		result.append("('" + param + "'),");
+    }
-	}
+
-	public void setFinalSelect(String sel) {
+    public void setFinalSelect(String sel) {
-		finalSelect = sel;
+        finalSelect = sel;
-	}
+    }
-
+
-	public String getFinishedCall() {
+    public String getFinishedCall() {
-		if (!isFinished)
+        if (!isFinished) finish();
-			finish();
+        return result.toString();
-		return result.toString();
+    }
-	}
+
-
+    private void finish() {
-	private void finish() {
+        addClosingBracket();
-		addClosingBracket();
+        result.append(finalSelect);
-		result.append(finalSelect);
+        isAddPossible = false;
-		isAddPossible = false;
+        isFinished = true;
-		isFinished = true;
+    }
-	}
+
-
+    private void addClosingBracket() {
-	private void addClosingBracket() {
+        char lc = result.charAt(result.length() - 1);// StringUtils.getLastChar(result);
-		char lc=result.charAt(result.length()-1);// StringUtils.getLastChar(result);
+        if (lc == ',') StringUtils.deleteLastChar(result);
-		if (lc==',')
+        result.append(");");
-			StringUtils.deleteLastChar(result);
+    }
-		result.append(");");
+
-	}
+    public void addParam(Integer integer) {
-
+        addParam(integer.toString());
-	public void addParam(Integer integer) {
+    }
-		addParam(integer.toString());
+
-	}
+    public void addParam(int in) {
-
+        addParam(Integer.valueOf(in).toString());
-	public void addParam(int in) {
+    }
-		addParam(new Integer(in).toString());
+
-	}
+    public void addParam(Object param) {
-
+        addParam(param.toString());
-	public void addParam(Object param) {
+    }
-		addParam(param.toString());
+
-	}
+    public static void main(String args[]) {
-
+        ProcedureSql p = new ProcedureSql(DB.POSTGRES, "test");
-	public static void main(String args[]) {
+        p.addParam(23);
-		ProcedureSql p=new ProcedureSql(DB.POSTGRES,"test");
+        System.out.println(p.getFinishedCall());
-		p.addParam(23);
+    }
-		System.out.println(p.getFinishedCall());
-	}
 }
 
 

src/de/memtext/db/PropDescriptor.java

@@ -1,19 +1,23 @@
 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
+    //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;
 
 
@@ -22,7 +26,7 @@ public class PropDescriptor extends NamedIdObject {
     }
 
     public PropDescriptor(Object id, String name) {
-        super(id,name);
+        super(id, name);
     }
 
     public String getColname() {
@@ -60,11 +64,13 @@ public class PropDescriptor extends NamedIdObject {
     public int getSortnr() {
         return sortnr;
     }
+
     public void setSortnr(int sortnr) {
         this.sortnr = sortnr;
     }
-    public String toString()
+
-    {
+    @Override
+    public String toString() {
         return getName();
     }
 }

src/de/memtext/db/PropsReader.java

@@ -1,79 +1,49 @@
 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 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,
+    private static byte key[] = { (byte) 255, (byte) 221, (byte) 127, (byte) 109, (byte) 129 };
-            (byte) 109, (byte) 129 };
+
-    private static int keyLength = key.length;
+    /*
-/*
+     * 
- * 
+     * 28.10.08 EInfache Verschlüsselungsmethode wird nicht mehr unterstützt
- * 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 {
-        else {
+            result = d;
-        	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,
+    public static Properties prepareProps(File propfile) throws IOException, FileNotFoundException, Exception {
-            FileNotFoundException, Exception {
         Properties props = new Properties();
         if (!propfile.exists()) {
             throw new IOException("Datei nicht gefunden: " + propfile);
         }
         InputStream is = new FileInputStream(propfile);
-
+        props.load(is);
-        if (is != null) {
+        is.close();
-            props.load(is);
-            is.close();
-        } else {
-            throw new IOException("cannot open " + propfile);
-        }
         String mandantenID = props.getProperty("MandantenID");
-        if (mandantenID == null)
+        if (mandantenID == null) mandantenID = DEFAULT_MANDANTEN_ID;
-            mandantenID = "default";
         props.put("user", props.getProperty("connectionName"));
-        props.put("password", check(mandantenID, props
+        props.put("password", check(mandantenID, props.getProperty("connectionPassword")));
-                .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)
 

src/de/memtext/db/RestrictionCollector.java

@@ -1,90 +1,97 @@
 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 StringBuffer restrict = new StringBuffer();
-	
+
-	private int count=0;
+    private int count = 0;
-	public RestrictionCollector() {
+
-	}
+    public RestrictionCollector() {
-	public RestrictionCollector(String restriction) {
+    }
-		restrict.append(restriction);
+
-		count = 1;
+    public RestrictionCollector(String restriction) {
-
+        restrict.append(restriction);
-	}
+        count = 1;
-	public boolean isSomethingAdded()
+
-	{
+    }
-		return count>0;
+
-	}
+    public boolean isSomethingAdded() {
-	public void addAndRestriction(StringBuffer restriction) {
+        return count > 0;
-		addAndRestriction(restriction.toString());
+    }
-	}
+
-	public void addAndRestriction(String restriction) {
+    public void addAndRestriction(StringBuffer restriction) {
-		if (restriction==null||restriction.length()<3)
+        addAndRestriction(restriction.toString());
-		throw new IllegalArgumentException("Not OK:"+restriction);
+    }
-		boolean isNewlineAtStart=restriction.startsWith("\n");
+
-		restriction = restriction.trim();
+    public void addAndRestriction(String restriction) {
-		if (isNewlineAtStart) restriction="\n"+restriction;
+        if (restriction == null || restriction.length() < 3) throw new IllegalArgumentException("Not OK:" + restriction);
-		if (restriction.substring(0, 3).equalsIgnoreCase("and"))
+        boolean isNewlineAtStart = restriction.startsWith("\n");
-			restriction = restriction.substring(3);
+        restriction = restriction.trim();
-		if (count>0)
+        if (isNewlineAtStart) restriction = "\n" + restriction;
-			restrict.append(" and " + restriction + " ");
+        if (restriction.substring(0, 3).equalsIgnoreCase("and")) restriction = restriction.substring(3);
-		else
+        if (count > 0)
-			restrict.append(restriction + " ");
+            restrict.append(" and " + restriction + " ");
-		count++;
+        else
-	}
+            restrict.append(restriction + " ");
-
+        count++;
-	public void addOrRestriction(StringBuffer restriction) {
+    }
-		addOrRestriction(restriction.toString());
+
-	}
+    public void addOrRestriction(StringBuffer restriction) {
-	public void addOrRestriction(String restriction) {
+        addOrRestriction(restriction.toString());
-		if (restriction==null||restriction.length()<3)
+    }
-			throw new IllegalArgumentException("Not OK:"+restriction);
+
-	
+    public void addOrRestriction(String restriction) {
-		restriction = restriction.trim();
+        if (restriction == null || restriction.length() < 3) throw new IllegalArgumentException("Not OK:" + restriction);
-		if (restriction.substring(0, 3).equalsIgnoreCase("or "))
+
-			restriction = restriction.substring(3);
+        restriction = restriction.trim();
-		
+        if (restriction.substring(0, 3).equalsIgnoreCase("or ")) restriction = restriction.substring(3);
-		if (count>0)
+
-			restrict.append(" or " + restriction + " ");
+        if (count > 0)
-		else
+            restrict.append(" or " + restriction + " ");
-			restrict.append(restriction + " ");
+        else
-		count++;
+            restrict.append(restriction + " ");
-	}
+        count++;
-	public void addOrRestriction(RestrictionCollector collector) {
+    }
-		addOrRestriction(collector.toString());
+
-	}
+    public void addOrRestriction(RestrictionCollector collector) {
-	public String toString() {
+        addOrRestriction(collector.toString());
-		if (count>0)
+    }
-			return restrict.toString();
+
-		else
+    @Override
-			return "";
+    public String toString() {
-	}
+        if (count > 0)
-	public String toStringInclusiveWhere()
+            return restrict.toString();
-	{
+        else
-		if (count>0)
+            return "";
-		return " where "+restrict;
+    }
-		else
+
-		return "";
+    public String toStringInclusiveWhere() {
-	}
+        if (count > 0)
-	public int getArgumentCount()
+            return " where " + restrict;
-	{
+        else
-		return count;
+            return "";
-	}
+    }
-	public void addAndRestriction(RestrictionCollector collector) {
+
-		if (collector.getArgumentCount()>1)
+    public int getArgumentCount() {
-		addAndRestriction( collector.toString());
+        return count;
-		else
+    }
-		addAndRestriction( collector.toString() );
+
-	}
+    public void addAndRestriction(RestrictionCollector collector) {
-	public static void main(String[] args) {
+        if (collector.getArgumentCount() > 1)
-		RestrictionCollector r = new RestrictionCollector();
+            addAndRestriction(collector.toString());
-		r.addAndRestriction("   AND 1=1");
+        else
-		r.addAndRestriction("2=2");
+            addAndRestriction(collector.toString());
-		System.out.println(r);
+    }
-	}
+
+    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

src/de/memtext/db/SampleApp.java

@@ -43,28 +43,30 @@ 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 "
+        JLabel lbl = new JLabel("got a connection to " + con.getMetaData().getURL());
-                + 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();
+                    String url = con.getMetaData().getURL();
-                   Statement stmt= con.createStatement();
+                    Statement stmt = con.createStatement();
                     stmt.execute("shutdown");
                     stmt.close();
                     con.close();
                     //delete all temporary files that may exists
-                    HsqlStandaloneMgr.deleteTmpFiles( url,path, dbname);
+                    HsqlStandaloneMgr.deleteTmpFiles(url, path, dbname);
                 } catch (SQLException e) {
                     e.printStackTrace();
                 }
@@ -74,16 +76,14 @@ public class SampleApp extends JFrame {
 
     }
 
-    private void initDb() throws ClassNotFoundException, SQLException,
+    private void initDb() throws ClassNotFoundException, SQLException, IOException {
-            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
+            stmt.execute("drop table test if exists;create table test( col1 integer);insert into test values(1);checkpoint;");
-                    .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
@@ -92,14 +92,11 @@ public class SampleApp extends JFrame {
             //if not, all changes to the database will be lost after closing
             // the connection
             boolean isReadOnlyModeWanted = true;
-            int result = HsqlStandaloneMgr.askUser(this, path, dbname,
+            int result = HsqlStandaloneMgr.askUser(this, path, dbname, isReadOnlyModeWanted);
-                    isReadOnlyModeWanted);
             if (result == JOptionPane.YES_OPTION) {
-                con = HsqlStandaloneMgr.getTmpConnection(this, path, dbname,
+                con = HsqlStandaloneMgr.getTmpConnection(this, path, dbname, "sa", "", isReadOnlyModeWanted);
-                        "sa", "", isReadOnlyModeWanted);
+            } else {
-            } else 
+                //              opening of temp. copy not wanted
-            {
-//              opening of temp. copy not wanted
                 System.exit(0);
             }
         }

src/de/memtext/db/SchemaReader.java

@@ -7,7 +7,7 @@ import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import de.memtext.util.StringUtils;
+import org.apache.commons.io.FileUtils;
 
 public class SchemaReader {
 
@@ -17,7 +17,7 @@ public class SchemaReader {
             System.exit(1);
         }
         try {
-            Connection con = ConnectionCreator.getConnectionCryptPassword(args[0],"driverName","connectionURL","connectionName","connectionPassword");
+            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();
@@ -27,13 +27,12 @@ public class SchemaReader {
                     result.append("TABLE " + tabname + "\n");
                     ResultSet cols = md.getColumns(null, null, tabname, null);
                     while (cols.next()) {
-                        result.append(cols.getString(4) + ":"
+                        result.append(cols.getString(4) + ":" + cols.getObject(5) + "\n");
-                                + cols.getObject(5) + "\n");
                     }
                     result.append("----\n");
                 }
             }
-            StringUtils.write(new File("schema.txt"),result.toString());
+            FileUtils.writeStringToFile(new File("schema.txt"), result.toString());
 
         } catch (IOException e) {
             e.printStackTrace();

src/de/memtext/db/ValueRandomizer.java

@@ -1,4 +1,5 @@
 package de.memtext.db;
+
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.sql.Connection;
@@ -9,6 +10,7 @@ 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
@@ -19,248 +21,197 @@ import java.util.Vector;
  * to console, not performed
  * */
 public class ValueRandomizer {
-	//private static String driver = "org.hsqldb.jdbcDriver";
+    //private static String driver = "org.hsqldb.jdbcDriver";
-	private static String driver = "org.postgresql.Driver";
+    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 dbUrl = "jdbc:hsqldb:hsql://localhost:9999";
-	private static String username = "superx"; //"joolap";
+    private static String dbUrl = "jdbc:postgresql://localhost:5432/superx";
-	private static String password = ""; //"loopja3000";
+
-	private static String tablename = "cob_busa";
+    private static String username = "superx"; //"joolap";
-	private static String colname = "betrag"; //"value";
+
-	private static String datenart = "DOUBLE"; //or "INTEGER";
+    private static String password = ""; //"loopja3000";
-
+
-	private static double minFactor = 0.6;
+    private static String tablename = "cob_busa";
-	private static double maxFactor = 1.8;
+
-
+    private static String colname = "betrag"; //"value";
-	private static boolean printOutOnly = false;
+
-	private static Statement stat;
+    private static String datenart = "DOUBLE"; //or "INTEGER";
-	private static Random r = new Random();
+
-	public static void main(String args[]) {
+    private static double minFactor = 0.6;
-	
+
-		try {
+    private static double maxFactor = 1.8;
-			Class.forName(driver);
+
-			Connection conn;
+    private static boolean printOutOnly = false;
-			System.out.println("establishing connection to " + dbUrl);
+
-			conn = DriverManager.getConnection(dbUrl, username, password);
+    private static Statement stat;
-			stat = conn.createStatement();
+
-			System.out.println("done.");
+    private static Random r = new Random();
-			out();
+
-			stat.close();
+    public static void main(String args[]) {
-						conn.close();
+
-				System.exit(-1);
+        try {
-				
+            Class.forName(driver);
-				
+            Connection conn;
-			//alle werte einlesen
+            System.out.println("establishing connection to " + dbUrl);
-			Vector werte = readDistinctValues();
+            conn = DriverManager.getConnection(dbUrl, username, password);
-			if (datenart.toUpperCase().equalsIgnoreCase("DOUBLE")) {
+            stat = conn.createStatement();
-				//massiveRandomizeDouble(werte);
+            System.out.println("done.");
-				randomize(werte);
+            out();
-			} else //integer
+            stat.close();
-				{
+            conn.close();
-				massiveRandomizeInteger(werte);
+            System.exit(-1);
-			}
+
-			
+
-			System.out.println("Randomizierung erfolgreich beendet");
+            //alle werte einlesen
-		} catch (Exception e) {
+            Vector werte = readDistinctValues();
-			System.out.println(e.toString());
+            if (datenart.toUpperCase().equalsIgnoreCase("DOUBLE")) {
-			System.exit(0);
+                //massiveRandomizeDouble(werte);
-		}
+                randomize(werte);
-
+            } else //integer
-	}
+            {
-	/**
+                massiveRandomizeInteger(werte);
-	 * randomizes in categories of values 
+            }
-	 * only for double
+
-	 * @param werte
+            System.out.println("Randomizierung erfolgreich beendet");
-	 */
+        } catch (Exception e) {
-	private static void randomize(Vector werte) {
+            System.out.println(e.toString());
-		int categories = 15;
+            System.exit(0);
-		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))
+     * randomizes in categories of values 
-					.doubleValue();
+     * only for double
-			updates.append(
+     * @param werte
-				"update "
+     */
-					+ tablename
+    private static void randomize(Vector werte) {
-					+ " set "
+        int categories = 15;
-					+ colname
+        int valuesPerCategory = (int) werte.size() / categories;
-					+ "="
+        StringBuffer updates = new StringBuffer();
-					+ colname
+        float limit = 0, limit2;
-					+ "*"
+        for (int i = 1; i < categories; i++) {
-					+ getRndFactor()
+            limit = (float) ((Double) werte.get(i * valuesPerCategory)).doubleValue();
-					+ " where "
+            updates.append("update " + tablename + " set " + colname + "=" + colname + "*" + getRndFactor() + " where " + colname + ">" + limit);
-					+ colname
+            if (i > 1) {
-					+ ">"
+                limit2 = (float) ((Double) werte.get((i - 1) * valuesPerCategory)).doubleValue();
-					+ limit);
+                updates.append(" and " + colname + "<" + limit2);
-			if (i > 1) {
+            }
-				limit2 =
+            updates.append(";\n");
-					(float) ((Double) werte.get((i - 1) * valuesPerCategory))
+        }
-						.doubleValue();
+        limit = (float) ((Double) werte.get((categories - 1) * valuesPerCategory)).doubleValue();
-				updates.append(" and " + colname + "<" + limit2);
+        updates.append("update " + tablename + " set " + colname + "=" + colname + "*" + getRndFactor() + " where " + colname + "<" + limit + ";");
-			}
+
-			updates.append(";\n");
+        System.out.println(updates);
-		}
+    }
-		limit =
+
-			(float) ((Double) werte.get((categories - 1) * valuesPerCategory))
+    /**
-				.doubleValue();
+     *  * multiplies all occurences of a single value (e.g. 150) with a factor between
-		updates.append(
+    * minFactor and maxFactor (e.g. 150*1.1 -> all entries with 150 become 165)
-			"update "
+    
-				+ tablename
+     * @param werte
-				+ " set "
+     * @throws SQLException
-				+ colname
+     */
-				+ "="
+    private static void massiveRandomizeInteger(Vector werte) throws SQLException {
-				+ colname
+        Integer einWert;
-				+ "*"
+        String upd = null;
-				+ getRndFactor()
+        for (Enumeration en = werte.elements(); en.hasMoreElements();) {
-				+ " where "
+            einWert = (Integer) en.nextElement();
-				+ colname
+            int neuerwert = (int) (einWert.intValue() * getRndFactor());
-				+ "<"
+            upd = "update " + tablename + " set " + colname + "=" + neuerwert + " where " + colname + "=" + einWert.toString() + ";";
-				+ limit
+
-				+ ";");
+            if (printOutOnly)
-
+                System.out.println(upd);
-		System.out.println(updates);
+            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
+     *  * 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)
-	private static void massiveRandomizeInteger(Vector werte)
+    
-		throws SQLException {
+     * @param werte
-		Integer einWert;
+     * @throws SQLException
-		String upd = null;
+     */
-		for (Enumeration en = werte.elements(); en.hasMoreElements();) {
+    private static void massiveRandomizeDouble(Vector werte) throws SQLException {
-			einWert = (Integer) en.nextElement();
+        Double einWert;
-			int neuerwert = (int) (einWert.intValue() * getRndFactor());
+        double zufallswert;
-			upd =
+        String upd;
-				"update "
+        int i = 0;
-					+ tablename
+        int count = werte.size();
-					+ " set "
+        for (Enumeration en = werte.elements(); en.hasMoreElements();) {
-					+ colname
+            einWert = (Double) en.nextElement();
-					+ "="
+            i++;
-					+ neuerwert
+            zufallswert = einWert.doubleValue() * getRndFactor();
-					+ " where "
+            upd = "update " + tablename + " set " + colname + "=" + zufallswert + " where " + colname + "=" + einWert + ";";
-					+ colname
+            if (printOutOnly)
-					+ "="
+                System.out.println(upd);
-					+ einWert.toString()
+            else {
-					+ ";";
+                stat.executeUpdate(upd);
-
+                if (i % 20 == 0) System.out.println("Done " + i + " updates of " + count);
-			if (printOutOnly)
+            }
-				System.out.println(upd);
+
-			else
+        }
-				stat.executeUpdate(upd);
+    }
-		}
+
-
+    private static float getRndFactor() {
-	}
+        double rnd = Math.abs(r.nextDouble());
-	/**
+        while (rnd < minFactor)
-	 *  * multiplies all occurences of a single value (e.g. 150) with a factor between
+            rnd += minFactor;
-	 * minFactor and maxFactor (e.g. 150*1.1 -> all entries with 150 become 165)
+        while (rnd > maxFactor)
-	
+            rnd -= 0.05;
-	 * @param werte
+        return (float) rnd;
-	 * @throws SQLException
+    }
-	 */
+
-	private static void massiveRandomizeDouble(Vector werte)
+    private static Vector readDistinctValues() throws SQLException {
-		throws SQLException {
+        Vector werte = new Vector();
-		Double einWert;
+        ResultSet rs = null;
-		double zufallswert;
+        Object item;
-		String upd;
+        System.out.println("Alle werte einlesen:" + "select distinct " + colname + " from " + tablename + " order by 1 DESC");
-		int i = 0;
+
-		int count = werte.size();
+        rs = stat.executeQuery("select distinct " + colname + " from " + tablename + " order by " + colname + " DESC");
-		for (Enumeration en = werte.elements(); en.hasMoreElements();) {
+        while (rs.next()) {
-			einWert = (Double) en.nextElement();
+            item = rs.getObject(1);
-			i++;
+            werte.add(item);
-			zufallswert = einWert.doubleValue() * getRndFactor();
+        }
-			upd =
+        rs.close();
-				"update "
+        return werte;
-					+ tablename
+    }
-					+ " set "
+
-					+ colname
+    private static void out() {
-					+ "="
+        try {
-					+ zufallswert
+            FileWriter fw = new FileWriter("c:\\cygwin\\home\\superx\\cob_busa.unl");
-					+ " where "
+            BufferedWriter bw = new BufferedWriter(fw);
-					+ colname
+            StringBuffer buf = new StringBuffer();
-					+ "="
+
-					+ einWert
+            ResultSet rs = stat.executeQuery("select * from cob_busa");
-					+ ";";
+
-			if (printOutOnly)
+            int cols = 20;
-				System.out.println(upd);
+            String s;
-			else {
+            Object o;
-				stat.executeUpdate(upd);
+            while (rs.next()) {
-				if (i % 20 == 0)
+                for (int i = 1; i <= cols; i++) {
-					System.out.println("Done " + i + " updates of " + count);
+                    o = rs.getObject(i);
-			}
+                    if (o == null)
-
+                        s = "";
-		}
+                    else
-	}
+                        s = o.toString();
-	private static float getRndFactor() {
+
-		double rnd = Math.abs(r.nextDouble());
+                    buf.append(s.trim() + "^");
-		while (rnd < minFactor)
+                }
-			rnd += minFactor;
+                buf.append("^\n");
-		while (rnd > maxFactor)
+
-			rnd -= 0.05;
+            }
-		return (float) rnd;
+            rs.close();
-	}
+
-	private static Vector readDistinctValues() throws SQLException {
+            bw.write(buf.toString());
-		Vector werte = new Vector();
+            bw.close();
-		ResultSet rs = null;
+            fw.close();
-		Object item;
+        } catch (Exception e) {
-		System.out.println(
+            e.printStackTrace();
-			"Alle werte einlesen:"
+        }
-				+ "select distinct "
+        System.out.println("done");
-				+ 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");
-	}
 }

src/de/memtext/db/dataexchange/MyRequest.java

@@ -6,64 +6,62 @@ package de.memtext.db.dataexchange;
  * @author: 
  */
 public class MyRequest implements java.io.Serializable {
-static final long serialVersionUID = -2L;
+    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()
+    static final int NORMAL = 1;
-{
-return type;
-}
 
-public void setType(int type)
+    static final int EXPECT_ONE_UPDATE = 2;
-{
-this.type=type;
-}
-public String getName()
-{
-return name;
-}
 
-public void setName(String name)
+    private String sql;
-{
-this.name=name;
-}
 
-public Object[] getParams()
+    private String name;
-{
-return params;
-}
 
-public void setParams(Object[] params)
+    private Object[] params;
-{
-this.params=params;
-}
 
-public String getSql()
+    private int type;
-{
-return sql;
-}
 
-public void setSql(String sql)
+    public MyRequest(String name, String sql, Object[] params) {
-{
+        this(name, sql, params, NORMAL);
-this.sql=sql;
+    }
-}
+
+    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;
+    }
 
 }
 

src/de/memtext/db/dataexchange/MyServletResponse.java

@@ -1,6 +1,7 @@
 package de.memtext.db.dataexchange;
 
 import java.util.Vector;
+
 /**
  * Insert the type's description here.
  * Creation date: (28.11.2002 19:25:34)
@@ -8,9 +9,13 @@ import java.util.Vector;
  */
 public class MyServletResponse implements java.io.Serializable {
     static final long serialVersionUID = -3L;
+
     private Vector result;
+
     private boolean OK;
+
     private Exception exception;
+
     private int updatedRowsCount;
 
     /**
@@ -21,24 +26,31 @@ public class MyServletResponse implements java.io.Serializable {
         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;
     }

src/de/memtext/dlg/AboutDialog.java

@@ -12,37 +12,34 @@ import de.memtext.util.WindowUtils;
 import de.memtext.widgets.VerticalBox;
 
 public class AboutDialog extends OkDlg {
-	private JLabel infoLbl, homepageLabel;
+    private JLabel infoLbl, homepageLabel;
-	public AboutDialog(
+
-		Frame parent,
+    public AboutDialog(Frame parent, String title, String infoText, String homePageLink, final String homepageUrl) throws HeadlessException {
-		String title,
+        super(parent, title);
-		String infoText,
+        infoLbl = new JLabel(infoText);
-		String homePageLink,
+        homepageLabel = new JLabel("<html><u>" + homePageLink);
-		final String homepageUrl)
+        homepageLabel.addMouseListener(new java.awt.event.MouseAdapter() {
-		throws HeadlessException {
+
-		super(parent, title);
+            @Override
-		infoLbl = new JLabel(infoText);
+            public void mouseClicked(java.awt.event.MouseEvent evt) {
-		homepageLabel = new JLabel("<html><u>" + homePageLink);
+
-		homepageLabel.addMouseListener(new java.awt.event.MouseAdapter() {
+                try {
-			public void mouseClicked(java.awt.event.MouseEvent evt) {
+                    BrowserLauncher.openURL(homepageUrl);
-
+                } catch (IOException e) {
-				try {
+                    e.printStackTrace();
-					BrowserLauncher.openURL(homepageUrl);
+                }
-				} catch (IOException e) {
+            }
-					e.printStackTrace();
+        });
-				}
+
-			}
+        VerticalBox vbox = new VerticalBox();
-		});
+        vbox.addWithCenterAlignment(infoLbl);
-
+        vbox.addWithCenterAlignment(homepageLabel);
-		VerticalBox vbox = new VerticalBox();
+        setCenter(vbox);
-		vbox.addWithCenterAlignment(infoLbl);
+        pack();
-		vbox.addWithCenterAlignment(homepageLabel);
+        Dimension size = this.getSize();
-		setCenter(vbox);
+        setSize(size.width + 30, size.height + 30);
-		pack();
+        WindowUtils.center(this);
-		Dimension size = this.getSize();
+    }
-		setSize(size.width + 30, size.height + 30);
-		WindowUtils.center(this);
-	}
 
 }
 

src/de/memtext/dlg/DialogWithExit.java

@@ -13,101 +13,94 @@ import javax.swing.JDialog;
 
 public class DialogWithExit extends JDialog {
 
-	public DialogWithExit() throws HeadlessException {
+    public DialogWithExit() throws HeadlessException {
-		super();
+        super();
-		initMe();
+        initMe();
-	}
+    }
-
+
-	public DialogWithExit(Frame owner) throws HeadlessException {
+    public DialogWithExit(Frame owner) throws HeadlessException {
-		super(owner);
+        super(owner);
-		initMe();
+        initMe();
-	}
+    }
-
+
-	public DialogWithExit(Frame owner, boolean arg1) throws HeadlessException {
+    public DialogWithExit(Frame owner, boolean arg1) throws HeadlessException {
-		super(owner, arg1);
+        super(owner, arg1);
-		initMe();
+        initMe();
-	}
+    }
-
+
-	public DialogWithExit(Frame owner, String arg1) throws HeadlessException {
+    public DialogWithExit(Frame owner, String arg1) throws HeadlessException {
-		super(owner, arg1);
+        super(owner, arg1);
-		initMe();
+        initMe();
-	}
+    }
-
+
-	public DialogWithExit(Frame owner, String arg1, boolean arg2)
+    public DialogWithExit(Frame owner, String arg1, boolean arg2) throws HeadlessException {
-		throws HeadlessException {
+        super(owner, arg1, arg2);
-		super(owner, arg1, arg2);
+        initMe();
-		initMe();
+    }
-	}
+
-
+    public DialogWithExit(Frame owner, String arg1, boolean arg2, GraphicsConfiguration arg3) {
-	public DialogWithExit(
+        super(owner, arg1, arg2, arg3);
-		Frame owner,
+        initMe();
-		String arg1,
+    }
-		boolean arg2,
+
-		GraphicsConfiguration arg3) {
+    public DialogWithExit(Dialog owner) throws HeadlessException {
-		super(owner, arg1, arg2, arg3);
+        super(owner);
-		initMe();
+        initMe();
-	}
+    }
-
+
-	public DialogWithExit(Dialog owner) throws HeadlessException {
+    public DialogWithExit(Dialog owner, boolean arg1) throws HeadlessException {
-		super(owner);
+        super(owner, arg1);
-		initMe();
+        initMe();
-	}
+    }
-
+
-	public DialogWithExit(Dialog owner, boolean arg1) throws HeadlessException {
+    public DialogWithExit(Dialog owner, String arg1) throws HeadlessException {
-		super(owner, arg1);
+        super(owner, arg1);
-		initMe();
+        initMe();
-	}
+    }
-
+
-	public DialogWithExit(Dialog owner, String arg1) throws HeadlessException {
+    public DialogWithExit(Dialog owner, String arg1, boolean arg2) throws HeadlessException {
-		super(owner, arg1);
+        super(owner, arg1, arg2);
-		initMe();
+    }
-	}
+
-
+    public DialogWithExit(Dialog owner, String arg1, boolean arg2, GraphicsConfiguration arg3) throws HeadlessException {
-	public DialogWithExit(Dialog owner, String arg1, boolean arg2)
+        super(owner, arg1, arg2, arg3);
-		throws HeadlessException {
+        initMe();
-		super(owner, arg1, arg2);
+    }
-	}
+
-
+    private void initMe() {
-	public DialogWithExit(
+        addWindowListener(new WindowAdapter() {
-		Dialog owner,
+            @Override
-		String arg1,
+            public void windowClosing(WindowEvent we) {
-		boolean arg2,
+                exit();
-		GraphicsConfiguration arg3)
+            }
-		throws HeadlessException {
+        });
-		super(owner, arg1, arg2, arg3);
+    }
-		initMe();
+
-	}
+    /**
-	private void initMe(){
+    	 * called if window is closed, does nothing by default,
-	addWindowListener(new WindowAdapter() {
+    	 * subclasses can override
-		public void windowClosing(WindowEvent we) {
+    	 *
-			exit();
+    	 */
-		}
+    protected void exit() {
-	});
+    }
-}
+
-/**
+    //man könnte noch abfragen ob auch wirklich Borderlayout benutzt
-	 * called if window is closed, does nothing by default,
+    //wird
-	 * subclasses can override
+    /**
-	 *
+    	 * installs a component in the center of the dialog
-	 */
+    	 * @param comp
-protected void exit() {
+    	 */
-}
+    public void setCenter(JComponent comp) {
-
+        this.getContentPane().add(comp, BorderLayout.CENTER);
-//man könnte noch abfragen ob auch wirklich Borderlayout benutzt
+    }
-//wird
+
-/**
+    /**
-	 * installs a component in the center of the dialog
+    	 * installs a component in the notrh of the dialog
-	 * @param comp
+    	 * @param comp
-	 */
+    	 */
-public void setCenter(JComponent comp) {
+    public void setNorth(JComponent comp) {
-	this.getContentPane().add(comp, BorderLayout.CENTER);
+        this.getContentPane().add(comp, BorderLayout.NORTH);
-}
+    }
-/**
-	 * 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

src/de/memtext/dlg/EnterDateDlg.java

@@ -10,7 +10,9 @@ 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) {
@@ -19,17 +21,16 @@ public class EnterDateDlg {
         this.text = text;
     }
 
-    public boolean wasOkSelected()
+    public boolean wasOkSelected() {
-    {
+        return date != null;
-        return date!=null;
     }
+
     public void show() {
         date = null;
         String in;
         boolean ok = false;
         while (!ok) {
-            in = JOptionPane.showInputDialog(parentComp, text, title,
+            in = JOptionPane.showInputDialog(parentComp, text, title, JOptionPane.QUESTION_MESSAGE);
-                    JOptionPane.QUESTION_MESSAGE);
             if (in == null) {
                 date = null;
                 ok = true;
@@ -38,8 +39,7 @@ public class EnterDateDlg {
                     date = DateUtils.parse(in);
                     ok = true;
                 } catch (ParseException e) {
-                    WarningMessage.show(parentComp, "Ungültige Datumseingabe",
+                    WarningMessage.show(parentComp, "Ungültige Datumseingabe", title);
-                            title);
                 }
             }
         }

src/de/memtext/dlg/ImportDlg.java

@@ -11,53 +11,52 @@ import de.memtext.widgets.FileSelectionPanel;
 import de.memtext.widgets.VerticalBox;
 
 public class ImportDlg extends OkCancelDlg {
-	private JLabel lblTop = new JLabel();
+    private JLabel lblTop = new JLabel();
-	private FileSelectionPanel fsp = new FileSelectionPanel("Datei");
+
-
+    private FileSelectionPanel fsp = new FileSelectionPanel("Datei");
-	public ImportDlg(Frame owner, String title, String infoTxt) {
+
-		super(owner, title, true);
+    public ImportDlg(Frame owner, String title, String infoTxt) {
-		VerticalBox vbox = new VerticalBox();
+        super(owner, title, true);
-		lblTop.setText(infoTxt);
+        VerticalBox vbox = new VerticalBox();
-		vbox.add(lblTop);
+        lblTop.setText(infoTxt);
-		vbox.add(fsp);
+        vbox.add(lblTop);
-		setCenter(vbox);
+        vbox.add(fsp);
-		this.pack();
+        setCenter(vbox);
-		WindowUtils.center(this);
+        this.pack();
-
+        WindowUtils.center(this);
-	}
+
-	
+    }
-	public void setCurrentDir(File defaultdir)
+
-	{
+    public void setCurrentDir(File defaultdir) {
-		fsp.setCurrentDir(defaultdir);
+        fsp.setCurrentDir(defaultdir);
-	}
+    }
-	/**
+
-	
+    /**
-	 * @param endings
+    
-	 */
+     * @param endings
-	public void setFileFilter(String endings) {
+     */
-		fsp.setFileFilter(new FilenamesFilter("CSV oder XML Dateien", endings));
+    public void setFileFilter(String endings) {
-	}
+        fsp.setFileFilter(new FilenamesFilter("CSV oder XML Dateien", endings));
-
+    }
-	protected void performOk() {
+
-		this.dispose();
+    @Override
-	}
+    protected void performOk() {
-
+        this.dispose();
-	protected void performCancel() {
+    }
-		this.dispose();
+
-	}
+    @Override
-
+    protected void performCancel() {
-	public File getSelectedFile() {
+        this.dispose();
-		return fsp.getSelectedFile();
+    }
-	}
+
-
+    public File getSelectedFile() {
-	public static void main(String[] args) {
+        return fsp.getSelectedFile();
-		ImportDlg d =
+    }
-			new ImportDlg(
+
-				null,
+    public static void main(String[] args) {
-				"titl",
+        ImportDlg d = new ImportDlg(null, "titl", "Unfälle importieren aus CSV- oder XML-Datei (z.B. Universum Unfallanzeige 3.0)");
-				"Unfälle importieren aus CSV- oder XML-Datei (z.B. Universum Unfallanzeige 3.0)");
+        d.setFileFilter(".xml|.csv");
-		d.setFileFilter(".xml|.csv");
+        d.show();
-		d.show();
+    }
-	}
 }
 //Created on 19.02.2004 at 11:56:06

src/de/memtext/dlg/InputDialog.java

@@ -11,30 +11,24 @@ import javax.swing.JOptionPane;
  I.e. selection item from drop down (combobox)
  */
 public class InputDialog {
-	private String title, txt;
+    private String title, txt;
-	private ArrayList list;
+
-	
+    private ArrayList list;
-	public InputDialog(Collection col, String title, String txt) {
+
-		super();
+    public InputDialog(Collection col, String title, String txt) {
-		this.title = title;
+        super();
-		this.txt = txt;
+        this.title = title;
-		 list = new ArrayList();
+        this.txt = txt;
-		if (col==null||col.size()==0) throw new IllegalArgumentException("Collection mustn't be null or empty");
+        list = new ArrayList();
-		for (Iterator it = col.iterator(); it.hasNext();) {
+        if (col == null || col.size() == 0) throw new IllegalArgumentException("Collection mustn't be null or empty");
-			list.add(it.next());
+        for (Iterator it = col.iterator(); it.hasNext();) {
-		}
+            list.add(it.next());
-	}
+        }
-
+    }
-	public Object show() {
+
-		return JOptionPane.showInputDialog(
+    public Object show() {
-			null,
+        return JOptionPane.showInputDialog(null, txt, title, JOptionPane.QUESTION_MESSAGE, null, list.toArray(), null);
-			txt,
+    }
-			title,
-			JOptionPane.QUESTION_MESSAGE,
-			null,
-			list.toArray(),
-			null);
-	}
 }
 
 

src/de/memtext/dlg/LoginDlg.java

@@ -10,58 +10,65 @@ import de.memtext.widgets.MultilineEditPanel;
  A Login Dialog
  */
 public class LoginDlg extends OkCancelDlg {
-	private LabeledTextField lUser = new LabeledTextField("Kennung", 15);
+    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() {
+    private LabeledPasswordField lPass = new LabeledPasswordField("Passwort", 15);
-		MultilineEditPanel vbox = new MultilineEditPanel();
-		vbox.add(lUser);
-		vbox.add(lPass);
-		this.setCenter(vbox);
-		this.pack();
-	}
 
-	protected void performOk() {
+    public LoginDlg(JFrame frame, String title) {
-		this.hide();
+        super(frame, title, true);
-	}
+        initdlg();
-	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());
 
-	}
+    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());
+
+    }
 }

src/de/memtext/dlg/NodeSelectionDlg.java

@@ -18,96 +18,115 @@ import de.memtext.util.WindowUtils;
  * one node or to clear the selection
  */
 public class NodeSelectionDlg extends OkCancelClearDlg {
-	private JTree tree;
+    private JTree tree;
-	private Object selectedNode = null;
+
-	private String title;
+    private Object selectedNode = null;
-	public NodeSelectionDlg(Frame owner, String title, JTree tree) {
+
-		super(owner, title);
+    private String title;
-		this.tree = tree;
+
-		this.title=title;
+    public NodeSelectionDlg(Frame owner, String title, JTree tree) {
-		this.setCenter(new JScrollPane(tree));
+        super(owner, title);
-		selectedNode = null;
+        this.tree = tree;
-		if (tree.getLastSelectedPathComponent() != null)
+        this.title = title;
-			selectedNode = (TreeNode) tree.getLastSelectedPathComponent();
+        this.setCenter(new JScrollPane(tree));
-		this.pack();
+        selectedNode = null;
-		WindowUtils.center(this);
+        if (tree.getLastSelectedPathComponent() != null) selectedNode = (TreeNode) tree.getLastSelectedPathComponent();
-		addWindowListener(new WindowAdapter() {
+        this.pack();
-			public void windowClosing(WindowEvent we) {
+        WindowUtils.center(this);
-				exit();
+        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() {
+    	 * called if window is closed, does nothing by default,
-	}
+    	 * subclasses can override
-	
+    	 *
-	public NodeSelectionDlg(
+    	 */
-		Frame owner,
+    @Override
-		String title,
+    protected void exit() {
-		DefaultTreeModel treeModel) {
+    }
-		this(owner, title, new JTree(treeModel));
+
-	}
+    public NodeSelectionDlg(Frame owner, String title, DefaultTreeModel treeModel) {
-	public NodeSelectionDlg(Frame owner, String title, TreeNode node) {
+        this(owner, title, new JTree(treeModel));
-		this(owner, title, new JTree(node));
+    }
-	}
+
-	/**
+    public NodeSelectionDlg(Frame owner, String title, TreeNode node) {
-	 * can be overriden by subclasses to perform a check if
+        this(owner, title, new JTree(node));
-	 * the selected node is OK
+    }
-	 * @return
+
-	 */
+    /**
-	protected boolean isSelectedNodeOk(TreeNode testme)
+     * can be overriden by subclasses to perform a check if
-	{
+     * the selected node is OK
-		return true;
+     * @return
-	}
+     */
-	protected void performOk() {
+    protected boolean isSelectedNodeOk(TreeNode testme) {
-		if (!isSelectedNodeOk((TreeNode)tree.getLastSelectedPathComponent())) return;
+        return true;
-		selectedNode = tree.getLastSelectedPathComponent();
+    }
-		this.setVisible(false);
+
-	}
+    @Override
-
+    protected void performOk() {
-	protected void performCancel() {
+        if (!isSelectedNodeOk((TreeNode) tree.getLastSelectedPathComponent())) return;
-		this.setVisible(false);
+        selectedNode = tree.getLastSelectedPathComponent();
-	}
+        this.setVisible(false);
-	public TreeNode getSelectedNode() {
+    }
-		return selectedNode == null ? null : (TreeNode) selectedNode;
+
-	}
+    @Override
-	protected void performClear() {
+    protected void performCancel() {
-		selectedNode = null;
+        this.setVisible(false);
-		tree.clearSelection();
+    }
-		this.setVisible(false);
+
-	}
+    public TreeNode getSelectedNode() {
-	public void setSize(Dimension dim) {
+        return selectedNode == null ? null : (TreeNode) selectedNode;
-		super.setSize(dim);
+    }
-		WindowUtils.center(this);
+
-	}
+    @Override
-	public void setSize(int x, int y) {
+    protected void performClear() {
-		super.setSize(x, y);
+        selectedNode = null;
-		WindowUtils.center(this);
+        tree.clearSelection();
-	}
+        this.setVisible(false);
-	public static void main(String a[]) {
+    }
-		NodeSelectionDlg t = new NodeSelectionDlg(null, "adsf", new JTree());
+
-		t.pack();
+    @Override
-		t.show();
+    public void setSize(Dimension dim) {
-		System.out.println(t.getSelectedNode());
+        super.setSize(dim);
-		t.show();
+        WindowUtils.center(this);
-		System.out.println(t.getSelectedNode());
+    }
-	}
+
-	public void setNode(TreeNode node) {
+    @Override
-		tree.setModel(new DefaultTreeModel(node));
+    public void setSize(int x, int y) {
-		selectedNode=null;
+        super.setSize(x, y);
-	}
+        WindowUtils.center(this);
-	public void setCellRenderer(TreeCellRenderer renderer) {
+    }
-		tree.setCellRenderer(renderer);
+
-	}
+    public static void main(String a[]) {
-	public String getTitle() {
+        NodeSelectionDlg t = new NodeSelectionDlg(null, "adsf", new JTree());
-		return title;
+        t.pack();
-	}
+        t.show();
-	public String getInfoText() {
+        System.out.println(t.getSelectedNode());
-		return title;
+        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;
+    }
 }
 //Created on 17.11.2003

src/de/memtext/dlg/ObjectCheckBoxDlg.java

@@ -8,46 +8,48 @@ import java.util.List;
 
 import javax.swing.JScrollPane;
 
+import de.memtext.util.WindowUtils;
 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 boxList = new LinkedList();
-	private List selectedObjectsList;
+
-	public ObjectCheckBoxDlg(Frame frame, String title, List itemList,boolean selected)
+    private List selectedObjectsList;
-		throws HeadlessException {
+
-		super(frame, title);
+    public ObjectCheckBoxDlg(Frame frame, String title, List itemList, boolean selected) throws HeadlessException {
-		VerticalBox vbox = new VerticalBox();
+        super(frame, title);
-		for (Iterator it = itemList.iterator(); it.hasNext();) {
+        VerticalBox vbox = new VerticalBox();
-			Object element = (Object) it.next();
+        for (Iterator it = itemList.iterator(); it.hasNext();) {
-			ObjectCheckBox cb = new ObjectCheckBox(element,selected);
+            Object element = (Object) it.next();
-			boxList.add(cb);
+            ObjectCheckBox cb = new ObjectCheckBox(element, selected);
-			vbox.add(cb);
+            boxList.add(cb);
-		}
+            vbox.add(cb);
-		this.setCenter(new JScrollPane(vbox));
+        }
-		this.pack();
+        this.setCenter(new JScrollPane(vbox));
-		WindowUtils.center(this);
+        this.pack();
-	}
+        WindowUtils.center(this);
-
+    }
-	protected void performOk() {
+
-		selectedObjectsList=new LinkedList();
+    @Override
-		for (Iterator it = boxList.iterator(); it.hasNext();) {
+    protected void performOk() {
-			ObjectCheckBox element = (ObjectCheckBox) it.next();
+        selectedObjectsList = new LinkedList();
-			if (element.isSelected())
+        for (Iterator it = boxList.iterator(); it.hasNext();) {
-			 selectedObjectsList.add(element.getObject());
+            ObjectCheckBox element = (ObjectCheckBox) it.next();
-		}
+            if (element.isSelected()) selectedObjectsList.add(element.getObject());
-		this.hide();
+        }
-	}
+        this.hide();
-
+    }
-	protected void performCancel() {
+
-		selectedObjectsList=new LinkedList();
+    @Override
-		this.hide();
+    protected void performCancel() {
-	}
+        selectedObjectsList = new LinkedList();
-
+        this.hide();
-	public List getSelectedObjectsList() {
+    }
-		return selectedObjectsList;
+
-	}
+    public List getSelectedObjectsList() {
+        return selectedObjectsList;
+    }
 
 }
 

src/de/memtext/dlg/OkCancelClearDlg.java

@@ -18,55 +18,63 @@ import javax.swing.JLabel;
  getContentPane().setLayout(new BorderLayout()) or something like that,
  because that will cause southPanel to disappear
  */
-public abstract class OkCancelClearDlg
+public abstract class OkCancelClearDlg extends OkCancelDlg {
-	extends OkCancelDlg
+    private boolean wasClearSelected;
-	 {
+
-	private boolean wasClearSelected;
+    protected JButton btnClear = new JButton("Leeren");
-	protected JButton btnClear = new JButton("Leeren");
+
-	/**
+    /**
-	 * Constructor for OkCancelClearDlg.
+     * Constructor for OkCancelClearDlg.
-	 * @param arg0
+     * @param arg0
-	 * @param arg1
+     * @param arg1
-	 * @throws HeadlessException
+     * @throws HeadlessException
-	 */
+     */
-	public OkCancelClearDlg(Frame arg0, String title)
+    public OkCancelClearDlg(Frame arg0, String title) throws HeadlessException {
-		throws HeadlessException {
+        super(arg0, title, true);
-		super(arg0, title, true);
+        initOkCancelClearDlg();
-		initOkCancelClearDlg();
+    }
-	}
+
-
+    private void initOkCancelClearDlg() {
-	private void initOkCancelClearDlg() {
+
-		
+        btnClear.setActionCommand("Clear");
-		btnClear.setActionCommand("Clear");
+        btnClear.addActionListener(new ActionListener() {
-		btnClear.addActionListener(new ActionListener() {
+           
-			public void actionPerformed(ActionEvent ae) {
+            @Override
-				wasOkSelected = false;
+            public void actionPerformed(ActionEvent ae) {
-				wasClearSelected = true;
+                wasOkSelected = false;
-				performClear();
+                wasClearSelected = true;
-			}
+                performClear();
-		});
+            }
-		addAfterCancel(btnClear);
+        });
-	}
+        addAfterCancel(btnClear);
-	public boolean wasClearSelected() {
+    }
-		return wasClearSelected;
+
-	}
+    public boolean wasClearSelected() {
-	protected abstract void performClear();
+        return wasClearSelected;
-	public static void main(String[] args) {
+    }
-
+
-		OkCancelClearDlg dlg = new OkCancelClearDlg(new JFrame(), "test") {
+    protected abstract void performClear();
-			protected void performOk() {
+
-			}
+    public static void main(String[] args) {
-
+
-			protected void performCancel() {
+        OkCancelClearDlg dlg = new OkCancelClearDlg(new JFrame(), "test") {
-			}
+            
-
+            @Override
-			protected void performClear() {
+            protected void performOk() {
-			}
+            }
-		};
+
-
+            @Override
-		//		dlg.addAboveOK(new JLabel("bla"));
+            protected void performCancel() {
-		dlg.setCenter(new JLabel("cnter"));
+            }
-		dlg.pack();
+            
-		dlg.show();
+            @Override
-	}
+            protected void performClear() {
+            }
+        };
+
+        //		dlg.addAboveOK(new JLabel("bla"));
+        dlg.setCenter(new JLabel("cnter"));
+        dlg.pack();
+        dlg.show();
+    }
 }

src/de/memtext/dlg/OkCancelDlg.java

@@ -23,178 +23,183 @@ import de.memtext.widgets.VerticalBox;
  getContentPane().setLayout(new BorderLayout()) or something like that,
  because that will cause southPanel to disappear
  */
-public abstract class OkCancelDlg
+public abstract class OkCancelDlg extends DialogWithExit {
-	extends DialogWithExit
+    private OkCancelPanel pOkCancel;
-	 {
+
-	private OkCancelPanel pOkCancel;
+    private HorizontalBox boxAboverOkCancel = new HorizontalBox();
-	private HorizontalBox boxAboverOkCancel = new HorizontalBox();
+
-	protected boolean wasOkSelected,wasCancelSelected;
+    protected boolean wasOkSelected, wasCancelSelected;
-	public OkCancelDlg(Frame owner, String title, boolean isModal) {
+
-		super(owner, title, isModal);
+    public OkCancelDlg(Frame owner, String title, boolean isModal) {
-		initOkCancelDlg();
+        super(owner, title, isModal);
-	}
+        initOkCancelDlg();
-
+    }
-	/**
+
-	 * Constructor for OkCancelDlg.
+    /**
-	 * @param arg0
+     * Constructor for OkCancelDlg.
-	 * @param arg1
+     * @param arg0
-	 * @param arg2
+     * @param arg1
-	 * @throws HeadlessException
+     * @param arg2
-	 */
+     * @throws HeadlessException
-	public OkCancelDlg(Frame frame, String title) throws HeadlessException {
+     */
-		super(frame, title, true);
+    public OkCancelDlg(Frame frame, String title) throws HeadlessException {
-		initOkCancelDlg();
+        super(frame, title, true);
-	}
+        initOkCancelDlg();
-
+    }
-	/**
+
-	 * Constructor for OkCancelDlg.
+    /**
-	 * @param arg0
+     * Constructor for OkCancelDlg.
-	 * @throws HeadlessException
+     * @param arg0
-	 */
+     * @throws HeadlessException
-	public OkCancelDlg(Dialog arg0) throws HeadlessException {
+     */
-		super(arg0, true);
+    public OkCancelDlg(Dialog arg0) throws HeadlessException {
-		initOkCancelDlg();
+        super(arg0, true);
-	}
+        initOkCancelDlg();
-
+    }
-	/**
+
-	 * Constructor for OkCancelDlg.
+    /**
-	 * @param arg0
+     * Constructor for OkCancelDlg.
-	 * @param arg1
+     * @param arg0
-	 * @throws HeadlessException
+     * @param arg1
-	 */
+     * @throws HeadlessException
-	public OkCancelDlg(Dialog arg0, String arg1) throws HeadlessException {
+     */
-		super(arg0, arg1, true);
+    public OkCancelDlg(Dialog arg0, String arg1) throws HeadlessException {
-		initOkCancelDlg();
+        super(arg0, arg1, true);
-	}
+        initOkCancelDlg();
-
+    }
-	private void initOkCancelDlg() {
+
-		//this.setContentPane(new OneTimeInitContentPane());
+    private void initOkCancelDlg() {
-		VerticalBox pSouth = new VerticalBox();
+        //this.setContentPane(new OneTimeInitContentPane());
-		pOkCancel = new OkCancelPanel();
+        VerticalBox pSouth = new VerticalBox();
-		pSouth.add(boxAboverOkCancel);
+        pOkCancel = new OkCancelPanel();
-		pSouth.add(pOkCancel);
+        pSouth.add(boxAboverOkCancel);
-
+        pSouth.add(pOkCancel);
-		this.getContentPane().add(pSouth, BorderLayout.SOUTH);
+
-		pOkCancel.addActionListener(new ActionListener(){
+        this.getContentPane().add(pSouth, BorderLayout.SOUTH);
-            public void actionPerformed(ActionEvent ae)
+        pOkCancel.addActionListener(new ActionListener() {
-            {
+           
+            @Override
+            public void actionPerformed(ActionEvent ae) {
                 String cmd = ae.getActionCommand();
-        		if (cmd.equals("OK")) {
+                if (cmd.equals("OK")) {
-        			wasOkSelected = true;
+                    wasOkSelected = true;
-        			wasCancelSelected=false;
+                    wasCancelSelected = false;
-        			performOk();
+                    performOk();
-        		}
+                }
-
+
-        		if (cmd.equals("Cancel")) {
+                if (cmd.equals("Cancel")) {
-        			wasOkSelected = false;
+                    wasOkSelected = false;
-        			wasCancelSelected=true;
+                    wasCancelSelected = true;
-        			performCancel();
+                    performCancel();
-        		}
+                }
             }
         });
-		this.getRootPane().setDefaultButton(pOkCancel.getBtnOk());
+        this.getRootPane().setDefaultButton(pOkCancel.getBtnOk());
-	}
+    }
-	public void addAboveOK(JComponent comp) {
+
-		boxAboverOkCancel.add(comp);
+    public void addAboveOK(JComponent comp) {
-	}
+        boxAboverOkCancel.add(comp);
-	
+    }
-	public boolean wasOkSelected() {
+
-		return wasOkSelected;
+    public boolean wasOkSelected() {
-	}
+        return wasOkSelected;
-	public boolean wasCancelSelected() {
+    }
+
+    public boolean wasCancelSelected() {
         return wasCancelSelected;
     }
-	/**
+
-	 * subclasses must implement this method and specify commands
+    /**
-	 * to be executed when OK was clicked
+     * subclasses must implement this method and specify commands
-	  */
+     * to be executed when OK was clicked
-	protected abstract void performOk();
+      */
-	/**
+    protected abstract void performOk();
-	 * subclasses must implement this method and specify commands
+
-	 * to be executed when Cancel was clicked
+    /**
-	 *
+     * 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
+    protected abstract void performCancel();
-	 * @param comp
+
-	 */
+    /**
-	public void addBeforeOK(JComponent comp) {
+     * Adds a Component before the OK button
-		int pos =
+     * @param comp
-			de.memtext.util.ComponentUtils.getPositionOnComponent(
+     */
-				pOkCancel.getBtnOk(),
+    public void addBeforeOK(JComponent comp) {
-				pOkCancel);
+        int pos = de.memtext.util.ComponentUtils.getPositionOnComponent(pOkCancel.getBtnOk(), pOkCancel);
-		pOkCancel.add(comp, pos);
+        pOkCancel.add(comp, pos);
-	}
+    }
-	/**
+
-			 * Adds a component right of the OK Button
+    /**
-			 * @param comp
+    		 * Adds a component right of the OK Button
-			 */
+    		 * @param comp
-	public void addAfterOK(JComponent comp) {
+    		 */
-		int pos =
+    public void addAfterOK(JComponent comp) {
-			de.memtext.util.ComponentUtils.getPositionOnComponent(
+        int pos = de.memtext.util.ComponentUtils.getPositionOnComponent(pOkCancel.getBtnOk(), pOkCancel);
-				pOkCancel.getBtnOk(),
+        pOkCancel.add(comp, pos + 1);
-				pOkCancel);
+    }
-		pOkCancel.add(comp, pos + 1);
+
-	}
+    /**
-	/**
+     * Adds a component right of the Cancel Button
-	 * Adds a component right of the Cancel Button
+     * @param comp
-	 * @param comp
+     */
-	 */
+    public void addAfterCancel(JComponent comp) {
-	public void addAfterCancel(JComponent comp) {
+        int pos = de.memtext.util.ComponentUtils.getPositionOnComponent(pOkCancel.getBtnCancel(), pOkCancel);
-		int pos =
+        pOkCancel.add(comp, pos + 1);
-			de.memtext.util.ComponentUtils.getPositionOnComponent(
+    }
-				pOkCancel.getBtnCancel(),
+    /*	class OneTimeInitContentPane extends Container {
-				pOkCancel);
+    		private int setLayoutCount=0;
-		pOkCancel.add(comp, pos + 1);
+    		public void setLayout(LayoutManager manager) {
-	}
+    			if (!(manager instanceof BorderLayout)) {
-	/*	class OneTimeInitContentPane extends Container {
+    				throw new IllegalArgumentException("OKCancel Dlg must have BorderLayout");
-			private int setLayoutCount=0;
+    			}
-			public void setLayout(LayoutManager manager) {
+    			super.setLayout(manager);
-				if (!(manager instanceof BorderLayout)) {
+    			setLayoutCount++;
-					throw new IllegalArgumentException("OKCancel Dlg must have BorderLayout");
+    			if (setLayoutCount > 0) {
-				}
+    				System.out.println(
-				super.setLayout(manager);
+    					"changing layout may cause problems in OKCancelDlg");
-				setLayoutCount++;
+    				
-				if (setLayoutCount > 0) {
+    			}
-					System.out.println(
+    		}
-						"changing layout may cause problems in OKCancelDlg");
+    	}*/
-					
+
-				}
+    public void setOkVisible(boolean b) {
-			}
+        pOkCancel.setOkVisible(b);
-		}*/
+    }
-
+
-	public void setOkVisible(boolean b) {
+    public void setCancelVisible(boolean b) {
-		pOkCancel.setOkVisible(b);
+        pOkCancel.setCancelVisible(b);
-	}
+    }
-	public void setCancelVisible(boolean b) {
+
-		pOkCancel.setCancelVisible(b);
+    public boolean requestFocusForOK() {
-	}
+        return pOkCancel.getBtnOk().requestFocusInWindow();
-	public boolean requestFocusForOK() {
+    }
-		return pOkCancel.getBtnOk().requestFocusInWindow();
+
-	}
+    public void setOkBold(boolean b) {
-	public void setOkBold(boolean b) {
+        pOkCancel.setOkBold(b);
-		pOkCancel.setOkBold(b);
+    }
-	}
+
-
+    public void setOkDefaultButton() {
-	public void setOkDefaultButton() {
+        this.getRootPane().setDefaultButton(pOkCancel.getBtnOk());
-		this.getRootPane().setDefaultButton(pOkCancel.getBtnOk());
+    }
-	}
+
-	
+    public static void main(String[] args) {
-	public static void main(String[] args) {
+
-
+        OkCancelDlg dlg = new OkCancelDlg(new JFrame(), "test") {
-		OkCancelDlg dlg = new OkCancelDlg(new JFrame(), "test") {
+            @Override
-			protected void performOk() {
+            protected void performOk() {
-			}
+            }
-
+            
-			protected void performCancel() {
+            @Override
-			}
+            protected void performCancel() {
-		};
+            }
-
+        };
-		//	dlg.addAboveOK(new JLabel("bla"));
+
-		dlg.setCenter(new JLabel("cnter"));
+        //	dlg.addAboveOK(new JLabel("bla"));
-		dlg.pack();
+        dlg.setCenter(new JLabel("cnter"));
-		dlg.show();
+        dlg.pack();
-	}
+        dlg.show();
+    }
 
 }

src/de/memtext/dlg/OkCancelPanel.java

@@ -10,47 +10,52 @@ import javax.swing.JPanel;
 A Panel with an OK and a Cancel button.
  */
 public class OkCancelPanel extends JPanel {
-	protected JButton btnOk, btnCancel;
+    protected JButton btnOk, btnCancel;
-	public OkCancelPanel() {
+
-		btnOk = new JButton("OK");
+    public OkCancelPanel() {
-		btnCancel = new JButton("Abbrechen");
+        btnOk = new JButton("OK");
-		btnCancel.setActionCommand("Cancel");
+        btnCancel = new JButton("Abbrechen");
-		add(btnOk);
+        btnCancel.setActionCommand("Cancel");
-		add(btnCancel);
+        add(btnOk);
-
+        add(btnCancel);
-	}
+
-	public void addActionListener(ActionListener al) {
+    }
-		btnOk.addActionListener(al);
+
-		btnCancel.addActionListener(al);
+    public void addActionListener(ActionListener al) {
-	}
+        btnOk.addActionListener(al);
-
+        btnCancel.addActionListener(al);
-	/**
+    }
-	 * Returns the btnCancel.
+
-	 * @return JButton
+    /**
-	 */
+     * Returns the btnCancel.
-	public JButton getBtnCancel() {
+     * @return JButton
-		return btnCancel;
+     */
-	}
+    public JButton getBtnCancel() {
-
+        return btnCancel;
-	/**
+    }
-	 * Returns the btnOk.
+
-	 * @return JButton
+    /**
-	 */
+     * Returns the btnOk.
-	public JButton getBtnOk() {
+     * @return JButton
-		return btnOk;
+     */
-	}
+    public JButton getBtnOk() {
-	public void setOkVisible(boolean b) {
+        return btnOk;
-		btnOk.setVisible(b);
+    }
-	}
+
-	public void setCancelVisible(boolean b) {
+    public void setOkVisible(boolean b) {
-		btnCancel.setVisible(b);
+        btnOk.setVisible(b);
-	}
+    }
-	public void setOkBold(boolean b) {
+
-		Font f=btnOk.getFont();
+    public void setCancelVisible(boolean b) {
-		if (b)
+        btnCancel.setVisible(b);
-		btnOk.setFont(f.deriveFont(Font.BOLD));
+    }
-		else
+
-		btnOk.setFont(f.deriveFont(Font.PLAIN));
+    public void setOkBold(boolean b) {
-	}
+        Font f = btnOk.getFont();
+        if (b)
+            btnOk.setFont(f.deriveFont(Font.BOLD));
+        else
+            btnOk.setFont(f.deriveFont(Font.PLAIN));
+    }
 
 }

src/de/memtext/dlg/OkDlg.java

@@ -11,6 +11,7 @@ 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.
  * 
@@ -20,87 +21,89 @@ import javax.swing.JPanel;
  *
  */
 
-public class OkDlg extends DialogWithExit  {
+public class OkDlg extends DialogWithExit {
-	private JPanel psouth = new JPanel();
+    private JPanel psouth = new JPanel();
-	protected JButton ok = new JButton("OK");
+
-	
+    protected JButton ok = new JButton("OK");
-	/**
+
-	 * Constructor for OkDlg.
+    /**
-	 * @param arg0
+     * Constructor for OkDlg.
-	 * @throws HeadlessException
+     * @param arg0
-	 */
+     * @throws HeadlessException
-	public OkDlg(Frame owner) throws HeadlessException {
+     */
-		super(owner,true);
+    public OkDlg(Frame owner) throws HeadlessException {
-		initSouth();
+        super(owner, true);
-	}
+        initSouth();
-	public OkDlg(Frame owner, String title, boolean isModal) {
+    }
-		super(owner,title,isModal);
+
-		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 OkDlg(Frame owner, String title) throws HeadlessException {
-	}
+        super(owner, title, true);
-
+        initSouth();
-
+    }
-	public JButton getOkBtn()
+
-	{
+
-		return ok;
+    public JButton getOkBtn() {
-	}
+        return ok;
-	
+    }
-	
+
-	/**
+
-	 * Constructor for OkDlg.
+    /**
-	 * @param arg0
+     * Constructor for OkDlg.
-	 * @throws HeadlessException
+     * @param arg0
-	 */
+     * @throws HeadlessException
-	public OkDlg(Dialog arg0) throws HeadlessException {
+     */
-		super(arg0,true);
+    public OkDlg(Dialog arg0) throws HeadlessException {
-		initSouth();
+        super(arg0, true);
-	}
+        initSouth();
-
+    }
-
+
-	private void initSouth() {
+
-
+    private void initSouth() {
-		ok.addActionListener(new ActionListener(){
+
-            public void actionPerformed(ActionEvent ae)
+        ok.addActionListener(new ActionListener() {
-            {
+            
+            @Override
+            public void actionPerformed(ActionEvent ae) {
                 performOk();
             }
         });
-		psouth.add(ok);
+        psouth.add(ok);
-		
+
-		Container cp = this.getContentPane();
+        Container cp = this.getContentPane();
-		cp.add(psouth, BorderLayout.SOUTH);
+        cp.add(psouth, BorderLayout.SOUTH);
-		this.getRootPane().setDefaultButton(ok);
+        this.getRootPane().setDefaultButton(ok);
-
+
-	}
+    }
-	
+
-	
+
-
+
-	
+
-	public void addBeforeOK(JComponent comp) {
+    public void addBeforeOK(JComponent comp) {
-		int pos =
+        int pos = de.memtext.util.ComponentUtils.getPositionOnComponent(ok, psouth);
-			de.memtext.util.ComponentUtils.getPositionOnComponent(ok, psouth);
+        psouth.add(comp, pos);
-		psouth.add(comp, pos);
+    }
-	}
+
-	public void addAfterOK(JComponent comp) {
+    public void addAfterOK(JComponent comp) {
-			int pos =
+        int pos = de.memtext.util.ComponentUtils.getPositionOnComponent(ok, psouth);
-				de.memtext.util.ComponentUtils.getPositionOnComponent(ok, psouth);
+        psouth.add(comp, pos + 1);
-			psouth.add(comp, pos+1);
+    }
-		}
+
-	/**
+    /**
-	 * subclasses can override this method and specify commands
+     * subclasses can override this method and specify commands
-	 * to be executed when OK was clicked
+     * to be executed when OK was clicked
-	  */
+      */
-	protected  void performOk()
+    protected void performOk() {
-	{
+        this.hide();
-		this.hide();
+    }
-	}
+
-	public static void main(String args[]) {
+    public static void main(String args[]) {
-	    OkDlg d=new OkDlg(new javax.swing.JFrame());
+        OkDlg d = new OkDlg(new javax.swing.JFrame());
-	    d.show();
+        d.show();
     }
 }

src/de/memtext/dlg/OkDoneDlg.java

@@ -17,169 +17,161 @@ 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  {
+public abstract class OkDoneDlg extends DialogWithExit {
-	/**
+    /**
-	 * Constructor for OkDoneDlg.
+     * Constructor for OkDoneDlg.
-	 * @throws HeadlessException
+     * @throws HeadlessException
-	 */
+     */
-	public OkDoneDlg() throws HeadlessException {
+    public OkDoneDlg() throws HeadlessException {
-		super();
+        super();
-		initSouth();
+        initSouth();
-	}
+    }
-
+
-	/**
+    /**
-	 * Constructor for OkDoneDlg.
+     * Constructor for OkDoneDlg.
-	 * @param arg0
+     * @param arg0
-	 * @throws HeadlessException
+     * @throws HeadlessException
-	 */
+     */
-	public OkDoneDlg(Frame arg0) throws HeadlessException {
+    public OkDoneDlg(Frame arg0) throws HeadlessException {
-		super(arg0);
+        super(arg0);
-		initSouth();
+        initSouth();
-	}
+    }
-
+
-	/**
+    /**
-	 * Constructor for OkDoneDlg.
+     * Constructor for OkDoneDlg.
-	 * @param arg0
+     * @param arg0
-	 * @param arg1
+     * @param arg1
-	 * @throws HeadlessException
+     * @throws HeadlessException
-	 */
+     */
-	public OkDoneDlg(Frame arg0, boolean arg1) throws HeadlessException {
+    public OkDoneDlg(Frame arg0, boolean arg1) throws HeadlessException {
-		super(arg0, arg1);
+        super(arg0, arg1);
-		initSouth();
+        initSouth();
-	}
+    }
-
+
-	/**
+    /**
-	 * Constructor for OkDoneDlg.
+     * Constructor for OkDoneDlg.
-	 * @param arg0
+     * @param arg0
-	 * @param arg1
+     * @param arg1
-	 * @throws HeadlessException
+     * @throws HeadlessException
-	 */
+     */
-	public OkDoneDlg(Frame arg0, String arg1) throws HeadlessException {
+    public OkDoneDlg(Frame arg0, String arg1) throws HeadlessException {
-		super(arg0, arg1);
+        super(arg0, arg1);
-		initSouth();
+        initSouth();
-	}
+    }
-
+
-	/**
+    /**
-	 * Constructor for OkDoneDlg.
+     * Constructor for OkDoneDlg.
-	 * @param arg0
+     * @param arg0
-	 * @param arg1
+     * @param arg1
-	 * @param arg2
+     * @param arg2
-	 * @throws HeadlessException
+     * @throws HeadlessException
-	 */
+     */
-	public OkDoneDlg(Frame arg0, String arg1, boolean arg2)
+    public OkDoneDlg(Frame arg0, String arg1, boolean arg2) throws HeadlessException {
-		throws HeadlessException {
+        super(arg0, arg1, arg2);
-		super(arg0, arg1, arg2);
+        initSouth();
-		initSouth();
+    }
-	}
+
-
+    /**
-	/**
+     * Constructor for OkDoneDlg.
-	 * Constructor for OkDoneDlg.
+     * @param arg0
-	 * @param arg0
+     * @param arg1
-	 * @param arg1
+     * @param arg2
-	 * @param arg2
+     * @param arg3
-	 * @param arg3
+     */
-	 */
+    public OkDoneDlg(Frame arg0, String arg1, boolean arg2, GraphicsConfiguration arg3) {
-	public OkDoneDlg(
+        super(arg0, arg1, arg2, arg3);
-		Frame arg0,
+        initSouth();
-		String arg1,
+    }
-		boolean arg2,
+
-		GraphicsConfiguration arg3) {
+    /**
-		super(arg0, arg1, arg2, arg3);
+     * Constructor for OkDoneDlg.
-		initSouth();
+     * @param arg0
-	}
+     * @throws HeadlessException
-
+     */
-	/**
+    public OkDoneDlg(Dialog arg0) throws HeadlessException {
-	 * Constructor for OkDoneDlg.
+        super(arg0);
-	 * @param arg0
+        initSouth();
-	 * @throws HeadlessException
+    }
-	 */
+
-	public OkDoneDlg(Dialog arg0) throws HeadlessException {
+    /**
-		super(arg0);
+     * Constructor for OkDoneDlg.
-		initSouth();
+     * @param arg0
-	}
+     * @param arg1
-
+     * @throws HeadlessException
-	/**
+     */
-	 * Constructor for OkDoneDlg.
+    public OkDoneDlg(Dialog arg0, boolean arg1) throws HeadlessException {
-	 * @param arg0
+        super(arg0, arg1);
-	 * @param arg1
+        initSouth();
-	 * @throws HeadlessException
+    }
-	 */
+
-	public OkDoneDlg(Dialog arg0, boolean arg1) throws HeadlessException {
+    /**
-		super(arg0, arg1);
+     * Constructor for OkDoneDlg.
-		initSouth();
+     * @param arg0
-	}
+     * @param arg1
-
+     * @throws HeadlessException
-	/**
+     */
-	 * Constructor for OkDoneDlg.
+    public OkDoneDlg(Dialog arg0, String arg1) throws HeadlessException {
-	 * @param arg0
+        super(arg0, arg1);
-	 * @param arg1
+        initSouth();
-	 * @throws HeadlessException
+    }
-	 */
+
-	public OkDoneDlg(Dialog arg0, String arg1) throws HeadlessException {
+    /**
-		super(arg0, arg1);
+     * Constructor for OkDoneDlg.
-		initSouth();
+     * @param arg0
-	}
+     * @param arg1
-
+     * @param arg2
-	/**
+     * @throws HeadlessException
-	 * Constructor for OkDoneDlg.
+     */
-	 * @param arg0
+    public OkDoneDlg(Dialog arg0, String arg1, boolean arg2) throws HeadlessException {
-	 * @param arg1
+        super(arg0, arg1, arg2);
-	 * @param arg2
+        initSouth();
-	 * @throws HeadlessException
+    }
-	 */
+
-	public OkDoneDlg(Dialog arg0, String arg1, boolean arg2)
+    /**
-		throws HeadlessException {
+     * Constructor for OkDoneDlg.
-		super(arg0, arg1, arg2);
+     * @param arg0
-		initSouth();
+     * @param arg1
-	}
+     * @param arg2
-
+     * @param arg3
-	/**
+     * @throws HeadlessException
-	 * Constructor for OkDoneDlg.
+     */
-	 * @param arg0
+    public OkDoneDlg(Dialog arg0, String arg1, boolean arg2, GraphicsConfiguration arg3) throws HeadlessException {
-	 * @param arg1
+        super(arg0, arg1, arg2, arg3);
-	 * @param arg2
+        initSouth();
-	 * @param arg3
+    }
-	 * @throws HeadlessException
+
-	 */
+    private void initSouth() {
-	public OkDoneDlg(
+        OkCancelPanel ocp = new OkCancelPanel();
-		Dialog arg0,
+        Container cp = this.getContentPane();
-		String arg1,
+        cp.add(ocp, BorderLayout.SOUTH);
-		boolean arg2,
+        ocp.addActionListener(new ActionListener() {
-		GraphicsConfiguration arg3)
+            
-		throws HeadlessException {
+            @Override
-		super(arg0, arg1, arg2, arg3);
+            public void actionPerformed(ActionEvent ae) {
-		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")) {
+                if (cmd.equals("OK")) {
-        			performOk();
+                    performOk();
-        		}
+                }
 
-        		if (cmd.equals("Done")) {
+                if (cmd.equals("Done")) {
-        			performDone();
+                    performDone();
-        		}
+                }
             }
-        });;
+        });
-	}
+        ;
+    }
 
 
-	/**
+    /**
-		 * subclasses must implement this method and specify commands
+    	 * subclasses must implement this method and specify commands
-		 * to be executed when OK was clicked
+    	 * to be executed when OK was clicked
-		  */
+    	  */
-	 protected abstract void performOk();
+    protected abstract void performOk();
-	/**
-		 * subclasses must implement this method and specify commands
-		 * to be executed when DONE was clicked
-		  */ 
 
-	 protected abstract void performDone();
+    /**
+    	 * subclasses must implement this method and specify commands
+    	 * to be executed when DONE was clicked
+    	  */
+
+    protected abstract void performDone();
 }

src/de/memtext/dlg/OkDonePanel.java

@@ -14,19 +14,19 @@ import javax.swing.JPanel;
  * Window>Preferences>Java>Code Generation.
  */
 public class OkDonePanel extends JPanel {
-JButton btnOk,btnDone;
+    JButton btnOk, btnDone;
-public OkDonePanel()
+
-{
+    public OkDonePanel() {
-	btnOk=new JButton("OK");
+        btnOk = new JButton("OK");
-	btnDone=new JButton("Fertig");
+        btnDone = new JButton("Fertig");
-	add(btnOk);
+        add(btnOk);
-	add(btnDone);
+        add(btnDone);
-}
+    }
-public void addActionListener(ActionListener al)
+
-{
+    public void addActionListener(ActionListener al) {
-	btnOk.addActionListener(al);
+        btnOk.addActionListener(al);
-	btnDone.addActionListener(al);
+        btnDone.addActionListener(al);
-}
+    }
 
 
 }

src/de/memtext/dlg/PasswdChangeDlg.java

@@ -18,168 +18,182 @@ import de.memtext.widgets.HorizontalBox;
 import de.memtext.widgets.WarningMessage;
 
 public abstract class PasswdChangeDlg extends OkCancelDlg {
-	private JLabel lblInfoDummy=new JLabel();
+    private JLabel lblInfoDummy = new JLabel();
-	private NewPasswordChecker newPasswordChecker;
+
-	private boolean isCheckOldPasswdWanted = true,isNewPasswordRequired=true;
+    private NewPasswordChecker newPasswordChecker;
-	private JTextField usernameField = new JTextField(20);
+
-	private KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
+    private boolean isCheckOldPasswdWanted = true, isNewPasswordRequired = true;
-    private JLabel lblInfo=new JLabel();
+
-	private JLabel lbl0 = new JLabel("Username:", JLabel.RIGHT);
+    private JTextField usernameField = new JTextField(20);
-	private JLabel lbl1 = new JLabel("altes Passwort:", JLabel.RIGHT);
+
-	private JPasswordField oldpasswField = new JPasswordField(30);
+    private KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
-	private JLabel lbl2 = new JLabel("neues Passwort:", JLabel.RIGHT);
+
-	private JPasswordField newpasswField = new JPasswordField(30);
+    private JLabel lblInfo = new JLabel();
-	private JLabel lbl3 = new JLabel("wiederholen:", JLabel.RIGHT);
+
-	private JPasswordField newpasswField2 = new JPasswordField(30);
+    private JLabel lbl0 = new JLabel("Username:", JLabel.RIGHT);
-
+
-	public PasswdChangeDlg(Frame frame, String title) {
+    private JLabel lbl1 = new JLabel("altes Passwort:", JLabel.RIGHT);
-		super(frame, title, true);
+
-		JPanel p=new JPanel();
+    private JPasswordField oldpasswField = new JPasswordField(30);
-		p.add(lblInfo);
+
-		HorizontalBox hbox = new HorizontalBox();
+    private JLabel lbl2 = new JLabel("neues Passwort:", JLabel.RIGHT);
-		JPanel lblPanel = new JPanel(new GridLayout(0, 1));
+
-		lblPanel.setMaximumSize(new Dimension(150, 100));
+    private JPasswordField newpasswField = new JPasswordField(30);
-		
+
-		
+    private JLabel lbl3 = new JLabel("wiederholen:", JLabel.RIGHT);
-		lblPanel.add(lbl0);
+
-		lblPanel.add(lbl1);
+    private JPasswordField newpasswField2 = new JPasswordField(30);
-		lblPanel.add(lbl2);
+
-		lblPanel.add(lbl3);
+    public PasswdChangeDlg(Frame frame, String title) {
-		
+        super(frame, title, true);
-		lblInfo.setVisible(false);
+        JPanel p = new JPanel();
-		hbox.add(lblPanel);
+        p.add(lblInfo);
-		JPanel fieldPanel = new JPanel(new GridLayout(0, 1));
+        HorizontalBox hbox = new HorizontalBox();
-		
+        JPanel lblPanel = new JPanel(new GridLayout(0, 1));
-		fieldPanel.add(usernameField);
+        lblPanel.setMaximumSize(new Dimension(150, 100));
-		usernameField.getKeymap().removeKeyStrokeBinding(enter);
+
-
+
-		fieldPanel.add(oldpasswField);
+        lblPanel.add(lbl0);
-		oldpasswField.getKeymap().removeKeyStrokeBinding(enter);
+        lblPanel.add(lbl1);
-		fieldPanel.add(newpasswField);
+        lblPanel.add(lbl2);
-		newpasswField.getKeymap().removeKeyStrokeBinding(enter);
+        lblPanel.add(lbl3);
-		fieldPanel.add(newpasswField2);
+
-		newpasswField2.getKeymap().removeKeyStrokeBinding(enter);
+        lblInfo.setVisible(false);
-		hbox.add(fieldPanel);
+        hbox.add(lblPanel);
-		this.setCenter(hbox);
+        JPanel fieldPanel = new JPanel(new GridLayout(0, 1));
-		this.setNorth(p);
+
-		this.pack();
+        fieldPanel.add(usernameField);
-		WindowUtils.center(this);
+        usernameField.getKeymap().removeKeyStrokeBinding(enter);
-	}
+
-	public void setNewPasswordChecker(NewPasswordChecker newPasswordChecker)
+        fieldPanel.add(oldpasswField);
-	{
+        oldpasswField.getKeymap().removeKeyStrokeBinding(enter);
-	    this.newPasswordChecker=newPasswordChecker;
+        fieldPanel.add(newpasswField);
-	}
+        newpasswField.getKeymap().removeKeyStrokeBinding(enter);
-	public void setUsername(String username) {
+        fieldPanel.add(newpasswField2);
-		usernameField.setText(username);
+        newpasswField2.getKeymap().removeKeyStrokeBinding(enter);
-	}
+        hbox.add(fieldPanel);
-	public void clear() {
+        this.setCenter(hbox);
-		usernameField.setText("");
+        this.setNorth(p);
-		oldpasswField.setText("");
+        this.pack();
-		newpasswField.setText("");
+        WindowUtils.center(this);
-		newpasswField2.setText("");
+    }
-	}
+
-	protected abstract boolean isOldPasswordOK(String username, String passwd);
+    public void setNewPasswordChecker(NewPasswordChecker newPasswordChecker) {
-
+        this.newPasswordChecker = newPasswordChecker;
-	/**
+    }
-	 * wenn OK geklickt wird wird automatisch geprüft ob die Länge des neuen
+
-	 * Passwort passt und beide gleich sind
+    public void setUsername(String username) {
-	 */
+        usernameField.setText(username);
-	protected final void performOk() {
+    }
-	    String new1 = new String(newpasswField.getPassword());
+
-		if (new1==null||new1.length()<4   )
+    public void clear() {
-		{
+        usernameField.setText("");
-		    WarningMessage.show(this,
+        oldpasswField.setText("");
-					"Das neue Passwort ist zu kurz.",
+        newpasswField.setText("");
-					"Achtung");
+        newpasswField2.setText("");
-				return;
+    }
-		}
+
-	    
+    protected abstract boolean isOldPasswordOK(String username, String passwd);
-	    String new2 = new String(newpasswField2.getPassword());
+
-		String oldPassword = new String(oldpasswField.getPassword());
+    /**
-		if (!new1.equals(new2)) {
+     * wenn OK geklickt wird wird automatisch geprüft ob die Länge des neuen
-			WarningMessage.show(this,
+     * Passwort passt und beide gleich sind
-				"Die beiden neuen Passwörter stimmen nicht überein",
+     */
-				"Achtung");
+    @Override
-			return;
+    protected final void performOk() {
-		}
+        String new1 = new String(newpasswField.getPassword());
-		String faults=null;
+        if (new1 == null || new1.length() < 4) {
-		if (newPasswordChecker!=null) faults=newPasswordChecker.checkForFaults(getUsername(),new String(newpasswField.getPassword()));
+            WarningMessage.show(this, "Das neue Passwort ist zu kurz.", "Achtung");
-		
+            return;
-	    if (faults!=null) {
+        }
-			WarningMessage.show(this,
+
-				faults,
+        String new2 = new String(newpasswField2.getPassword());
-				"Achtung");
+        String oldPassword = new String(oldpasswField.getPassword());
-			return;
+        if (!new1.equals(new2)) {
-		}
+            WarningMessage.show(this, "Die beiden neuen Passwörter stimmen nicht überein", "Achtung");
-		
+            return;
-		if (isNewPasswordRequired&&new1.equals(oldPassword))
+        }
-		{
+        String faults = null;
-			WarningMessage.show(this,"Sie müssen ein neues Passwort eingeben","Achtung");
+        if (newPasswordChecker != null) faults = newPasswordChecker.checkForFaults(getUsername(), new String(newpasswField.getPassword()));
-			return;
+
-		}
+        if (faults != null) {
-		
+            WarningMessage.show(this, faults, "Achtung");
-		if (isCheckOldPasswdWanted
+            return;
-			&& !isOldPasswordOK(usernameField.getText(),
+        }
-				oldPassword)) {
+
-			WarningMessage.show(this,"Das alte Passwort stimmt nicht", "Achtung");
+        if (isNewPasswordRequired && new1.equals(oldPassword)) {
-			return;
+            WarningMessage.show(this, "Sie müssen ein neues Passwort eingeben", "Achtung");
-		}
+            return;
-		this.hide();
+        }
-	}
+
-
+        if (isCheckOldPasswdWanted && !isOldPasswordOK(usernameField.getText(), oldPassword)) {
-	protected void performCancel() {
+            WarningMessage.show(this, "Das alte Passwort stimmt nicht", "Achtung");
-		this.hide();
+            return;
-	}
+        }
-
+        this.hide();
-
+    }
-	public void setUsernameFieldEnabled(boolean b) {
+
-		usernameField.setEnabled(b);
+    @Override
-	}
+    protected void performCancel() {
-	public void setOldPassword(String passw) {
+        this.hide();
-		oldpasswField.setText(passw);
+    }
-		}
+
-	public String getUsername() {
+
-		return usernameField.getText();
+    public void setUsernameFieldEnabled(boolean b) {
-	}
+        usernameField.setEnabled(b);
-	public String getOldPasswd() {
+    }
-		return new String(oldpasswField.getPassword());
+
-	}
+    public void setOldPassword(String passw) {
-	public String getNewPasswd() {
+        oldpasswField.setText(passw);
-		return new String(newpasswField.getPassword());
+    }
-	}
+
-	public boolean isCheckOldPasswdWanted() {
+    public String getUsername() {
-		return isCheckOldPasswdWanted;
+        return usernameField.getText();
-	}
+    }
-
+
-	public void setCheckOldPasswdWanted(boolean b) {
+    public String getOldPasswd() {
-		isCheckOldPasswdWanted = b;
+        return new String(oldpasswField.getPassword());
-		lbl1.setVisible(b);
+    }
-		oldpasswField.setVisible(b);
+
-	}
+    public String getNewPasswd() {
-	public void setInfoLabel(String txt) {
+        return new String(newpasswField.getPassword());
-		lblInfo.setVisible(true);
+    }
-		lblInfo.setText(txt);
+
-		lblInfo.setFont(new Font("SansSerif",Font.BOLD,12));
+    public boolean isCheckOldPasswdWanted() {
-		}
+        return isCheckOldPasswdWanted;
-
+    }
-	public boolean isNewPasswordRequired() {
+
-		return isNewPasswordRequired;
+    public void setCheckOldPasswdWanted(boolean b) {
-	}
+        isCheckOldPasswdWanted = b;
-
+        lbl1.setVisible(b);
-	public void setNewPasswordRequired(boolean b) {
+        oldpasswField.setVisible(b);
-		isNewPasswordRequired = b;
+    }
-	}
+
-public static void main(String a[])
+    public void setInfoLabel(String txt) {
-{
+        lblInfo.setVisible(true);
-	PasswdChangeDlg dlg=new PasswdChangeDlg(null,"dummy"){
+        lblInfo.setText(txt);
-
+        lblInfo.setFont(new Font("SansSerif", Font.BOLD, 12));
-		protected boolean isOldPasswordOK(String username, String passwd) {
+    }
-			return false;
+
-		}}
+    public boolean isNewPasswordRequired() {
-	;
+        return isNewPasswordRequired;
-	dlg.setInfoLabel("bitte ändern");
+    }
-	dlg.show();
+
-}
+    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();
+    }
 }
 
 //Created on 09.01.2004 at 17:16:16

src/de/memtext/hbt/AbstractAriel.java

@@ -1,122 +0,0 @@
-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;
-		
-	}
-
-}

src/de/memtext/hbt/Checker.java

@@ -1,96 +0,0 @@
-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();
-		}
-
-	}
-
-}

src/de/memtext/hbt/NewHeartBeatAriel.java

@@ -1,293 +0,0 @@
-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...");
-	}
-
-	
-}

src/de/memtext/icons/ArrowDownIcon.java

@@ -3,8 +3,9 @@ package de.memtext.icons;
 import java.awt.Graphics;
 
 public class ArrowDownIcon extends BasicIcon {
-	public void myPaint(Graphics g) {
+    @Override
-		drawArrowDown(g, 6);
+    public void myPaint(Graphics g) {
-	}
+        drawArrowDown(g, 6);
+    }
 
 }

src/de/memtext/icons/ArrowRight.java

@@ -4,9 +4,10 @@ import java.awt.Graphics;
 
 public class ArrowRight extends BasicIcon {
 
-	void myPaint(Graphics g) {
+    @Override
-		drawArrowRight(g);
+    void myPaint(Graphics g) {
-	}
+        drawArrowRight(g);
+    }
 
 }
 

src/de/memtext/icons/ArrowUpIcon.java

@@ -6,9 +6,10 @@ import javax.swing.Icon;
 
 public class ArrowUpIcon extends BasicIcon implements Icon {
 
-	public void myPaint(Graphics g) {
+    @Override
-		drawArrowUp(g, 4);
+    public void myPaint(Graphics g) {
+        drawArrowUp(g, 4);
 
-	}
+    }
 
 }

src/de/memtext/icons/BasicIcon.java

@@ -8,92 +8,102 @@ import javax.swing.Icon;
 import javax.swing.JButton;
 
 public abstract class BasicIcon implements Icon {
-	private int iconWidth = 16, iconHeight = 16;
+    private int iconWidth = 16, iconHeight = 16;
-	private Color color = Color.black;
+
-	/**
+    private Color color = Color.black;
-	 * @see javax.swing.Icon#getIconWidth()
+
-	 */
+    /**
-	public int getIconWidth() {
+     * @see javax.swing.Icon#getIconWidth()
-		return iconWidth;
+     */
-	}
+    @Override
-
+    public int getIconWidth() {
-	/**
+        return iconWidth;
-	 * @see javax.swing.Icon#getIconHeight()
+    }
-	 */
+
-	public int getIconHeight() {
+    /**
-		return iconHeight;
+     * @see javax.swing.Icon#getIconHeight()
-	}
+     */
-	public void paintIcon(Component c, Graphics g, int x, int y) {
+    @Override
-		g.translate(x, y);
+    public int getIconHeight() {
-		if (c.isEnabled())
+        return iconHeight;
-			g.setColor(color);
+    }
-		else
+
-			g.setColor(Color.GRAY);
+    @Override
-		myPaint(g);
+    public void paintIcon(Component c, Graphics g, int x, int y) {
-		g.translate(-x, -y);
+        g.translate(x, y);
-	}
+        if (c.isEnabled())
-	abstract void myPaint(Graphics g);
+            g.setColor(color);
-	void drawDoubleLine(Graphics g, int y) {
+        else
-		if (y > getIconHeight() - 2)
+            g.setColor(Color.GRAY);
-			throw new IllegalArgumentException("can't draw that low");
+        myPaint(g);
-		g.drawLine(0, y, getIconWidth(), y);
+        g.translate(-x, -y);
-		g.drawLine(0, y + 1, getIconWidth(), y + 1);
+    }
-	}
+
-
+    abstract void myPaint(Graphics g);
-	void drawArrowRight(Graphics g) {
+
-		int midx = (int) Math.floor(getIconWidth() / 2);
+    void drawDoubleLine(Graphics g, int y) {
-		int midy = (int) Math.floor(getIconHeight() / 2);
+        if (y > getIconHeight() - 2) throw new IllegalArgumentException("can't draw that low");
-		//		mittellinie
+        g.drawLine(0, y, getIconWidth(), y);
-		g.drawLine(0, midy - 1, getIconWidth(), midy - 1);
+        g.drawLine(0, y + 1, getIconWidth(), y + 1);
-		g.drawLine(0, midy, getIconWidth(), midy);
+    }
-		g.drawLine(0, midy + 1, getIconWidth(), midy + 1);
+
-
+    void drawArrowRight(Graphics g) {
-		g.drawLine(midx + 1, 1, getIconWidth(), midy - 1);
+        int midx = (int) Math.floor(getIconWidth() / 2);
-		g.drawLine(midx + 1, 2, getIconWidth(), midy);
+        int midy = (int) Math.floor(getIconHeight() / 2);
-
+        //		mittellinie
-		g.drawLine(midx + 1, getIconHeight() - 1, getIconWidth(), midy + 1);
+        g.drawLine(0, midy - 1, getIconWidth(), midy - 1);
-		g.drawLine(midx + 1, getIconHeight() - 2, getIconWidth(), midy);
+        g.drawLine(0, midy, getIconWidth(), midy);
-
+        g.drawLine(0, midy + 1, getIconWidth(), midy + 1);
-	}
+
-
+        g.drawLine(midx + 1, 1, getIconWidth(), midy - 1);
-	void drawArrowUp(Graphics g, int y) {
+        g.drawLine(midx + 1, 2, getIconWidth(), midy);
-		int midx = (int) Math.floor(getIconWidth() / 2);
+
-		int midy = (int) Math.floor(getIconHeight() / 2);
+        g.drawLine(midx + 1, getIconHeight() - 1, getIconWidth(), midy + 1);
-		g.drawLine(0, y + midy, midx, y);
+        g.drawLine(midx + 1, getIconHeight() - 2, getIconWidth(), midy);
-		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 drawArrowUp(Graphics g, int y) {
-	}
+        int midx = (int) Math.floor(getIconWidth() / 2);
-	void drawArrowDown(Graphics g, int y) {
+        int midy = (int) Math.floor(getIconHeight() / 2);
-		int midx = (int) Math.floor(getIconWidth() / 2);
+        g.drawLine(0, y + midy, midx, y);
-		int midy = (int) Math.floor(getIconHeight() / 2);
+        g.drawLine(midx, y, getIconWidth(), y + midy);
-		g.drawLine(0, y, midx, midy + y);
+        g.drawLine(0, y + midy + 1, midx, y + 1);
-		g.drawLine(midx, y + midy, getIconWidth(), y);
+        g.drawLine(midx, y + 1, getIconWidth(), y + midy + 1);
-		g.drawLine(0, y + 1, midx, midy + y + 1);
+
-		g.drawLine(midx, y + midy + 1, getIconWidth(), y + 1);
+    }
-
+
-	}
+    void drawArrowDown(Graphics g, int y) {
-	public static void main(String[] args) {
+        int midx = (int) Math.floor(getIconWidth() / 2);
-		de.memtext.widgets.MBFrame f = new de.memtext.widgets.MBFrame("test");
+        int midy = (int) Math.floor(getIconHeight() / 2);
-		f.setCenter(new JButton("test", new ArrowRight()));
+        g.drawLine(0, y, midx, midy + y);
-		f.pack();
+        g.drawLine(midx, y + midy, getIconWidth(), y);
-		f.show();
+        g.drawLine(0, y + 1, midx, midy + y + 1);
-	}
+        g.drawLine(midx, y + midy + 1, getIconWidth(), y + 1);
-	public void setIconHeight(int i) {
+
-		iconHeight = i;
+    }
-	}
+
-
+    public static void main(String[] args) {
-	public void setIconWidth(int i) {
+        de.memtext.widgets.MBFrame f = new de.memtext.widgets.MBFrame("test");
-		iconWidth = i;
+        f.setCenter(new JButton("test", new ArrowRight()));
-	}
+        f.pack();
-
+        f.show();
-	public Color getColor() {
+    }
-		return color;
+
-	}
+    public void setIconHeight(int i) {
-
+        iconHeight = i;
-	public void setColor(Color color) {
+    }
-		this.color = color;
+
-	}
+    public void setIconWidth(int i) {
+        iconWidth = i;
+    }
+
+    public Color getColor() {
+        return color;
+    }
+
+    public void setColor(Color color) {
+        this.color = color;
+    }
 
 }

src/de/memtext/icons/DoubleArrowDownIcon.java

@@ -4,13 +4,13 @@ import java.awt.Graphics;
 
 
 public class DoubleArrowDownIcon extends BasicIcon {
-public void myPaint(Graphics g)
+    @Override
-{
+    public void myPaint(Graphics g) {
-drawArrowDown(g,2);
+        drawArrowDown(g, 2);
-drawArrowDown(g,6);
+        drawArrowDown(g, 6);
 
 
-} 
+    }
 
 }
 

src/de/memtext/icons/DoubleArrowDownLineIcon.java

@@ -11,13 +11,13 @@ import java.awt.Graphics;
  * Window>Preferences>Java>Code Generation.
  */
 public class DoubleArrowDownLineIcon extends BasicIcon {
-public void myPaint(Graphics g)
+    @Override
-{
+    public void myPaint(Graphics g) {
-drawArrowDown(g,0);
+        drawArrowDown(g, 0);
-drawArrowDown(g,4);
+        drawArrowDown(g, 4);
-drawDoubleLine(g,getIconHeight()-2);
+        drawDoubleLine(g, getIconHeight() - 2);
 
-} 
+    }
 
 }
 

src/de/memtext/icons/DoubleArrowUpIcon.java

@@ -11,12 +11,12 @@ import java.awt.Graphics;
  * Window>Preferences>Java>Code Generation.
  */
 public class DoubleArrowUpIcon extends BasicIcon {
-public void myPaint(Graphics g)
+    @Override
-{
+    public void myPaint(Graphics g) {
-drawArrowUp(g,0);
+        drawArrowUp(g, 0);
-drawArrowUp(g,4);
+        drawArrowUp(g, 4);
 
-} 
+    }
 
 }
 

src/de/memtext/icons/DoubleArrowUpLineIcon.java

@@ -11,13 +11,13 @@ import java.awt.Graphics;
  * Window>Preferences>Java>Code Generation.
  */
 public class DoubleArrowUpLineIcon extends BasicIcon {
-public void myPaint(Graphics g)
+    @Override
-{
+    public void myPaint(Graphics g) {
-drawDoubleLine(g,0);
+        drawDoubleLine(g, 0);
-drawArrowUp(g,2);
+        drawArrowUp(g, 2);
-drawArrowUp(g,6);
+        drawArrowUp(g, 6);
 
-} 
+    }
 
 }
 

src/de/memtext/icons/MBStandardIcons.java

@@ -10,92 +10,90 @@ import de.memtext.util.IconUtils;
  changed xxx
  */
 public class MBStandardIcons {
-	private static ImageIcon indexBox,
+    private static ImageIcon indexBox, newDoc, copyWin, searchWin, viewingGlass, table, delete, properties;
-		newDoc,
+
-		copyWin,
+    private static ClassLoader cl;
-		searchWin,
+
-		viewingGlass,
+    /**
-		table,
+     * Constructor for StandardIcons.
-		delete,
+     */
-		properties;
+    private MBStandardIcons() {
-	private static ClassLoader cl;
+
-	/**
+    }
-	 * Constructor for StandardIcons.
+
-	 */
+    public static ImageIcon get(String name) {
-	private MBStandardIcons() {
+        return IconUtils.get("de/memtext/icons/" + name);
-
+    }
-	}
+
-	public static ImageIcon get(String name) {
+    static {
-		return IconUtils.get("de/memtext/icons/" + name);
+        MBStandardIcons s = new MBStandardIcons();
-	}
+        cl = s.getClass().getClassLoader();
-	static {
+        copyWin = new ImageIcon(cl.getResource("de/memtext/icons/copyWindows.gif"));
-		MBStandardIcons s = new MBStandardIcons();
+        searchWin = new ImageIcon(cl.getResource("de/memtext/icons/searchWindows.gif"));
-		cl = s.getClass().getClassLoader();
+        viewingGlass = new ImageIcon(cl.getResource("de/memtext/icons/viewingGlass.gif"));
-		copyWin =
+        table = new ImageIcon(cl.getResource("de/memtext/icons/table.gif"));
-			new ImageIcon(cl.getResource("de/memtext/icons/copyWindows.gif"));
+        newDoc = new ImageIcon(cl.getResource("de/memtext/icons/newDoc.gif"));
-		searchWin =
+        delete = new ImageIcon(cl.getResource("de/memtext/icons/delete.gif"));
-			new ImageIcon(cl.getResource("de/memtext/icons/searchWindows.gif"));
+        properties = new ImageIcon(cl.getResource("de/memtext/icons/properties.gif"));
-		viewingGlass =
+        indexBox = new ImageIcon(cl.getResource("de/memtext/icons/indexBox.gif"));
-			new ImageIcon(cl.getResource("de/memtext/icons/viewingGlass.gif"));
+    }
-		table = new ImageIcon(cl.getResource("de/memtext/icons/table.gif"));
+
-		newDoc = new ImageIcon(cl.getResource("de/memtext/icons/newDoc.gif"));
+    public static ImageIcon getEntry() {
-		delete = new ImageIcon(cl.getResource("de/memtext/icons/delete.gif"));
+        return new ImageIcon(cl.getResource("de/memtext/icons/entry.gif"));
-		properties =
+    }
-			new ImageIcon(cl.getResource("de/memtext/icons/properties.gif"));
+
-		indexBox =
+    public static ImageIcon getCopy() {
-			new ImageIcon(cl.getResource("de/memtext/icons/indexBox.gif"));
+        return copyWin;
-	}
+    }
-	public static ImageIcon getEntry() {
+
-		return new ImageIcon(cl.getResource("de/memtext/icons/entry.gif"));
+    public static ImageIcon getSearch() {
-	}
+        return searchWin;
-	public static ImageIcon getCopy() {
+    }
-		return copyWin;
+
-	}
+    public static ImageIcon getDelete() {
-	public static ImageIcon getSearch() {
+        return delete;
-		return searchWin;
+    }
-	}
+
-	public static ImageIcon getDelete() {
+    public static ImageIcon getPrint() {
-		return delete;
+        return new ImageIcon(cl.getResource("de/memtext/icons/print.gif"));
-	}
+
-	public static ImageIcon getPrint()
+
-	{
+    }
-		return new ImageIcon(cl.getResource("de/memtext/icons/print.gif"));
+
-		
+    public static ImageIcon getProperties() {
-	
+        return properties;
-	}
+    }
-	public static ImageIcon getProperties() {
+
-		return properties;
+    /**
-	}
+     * Returns the table.
-	/**
+     * @return ImageIcon
-	 * Returns the table.
+     */
-	 * @return ImageIcon
+    public static ImageIcon getTable() {
-	 */
+        return table;
-	public static ImageIcon getTable() {
+    }
-		return table;
+
-	}
+    /**
-
+     * Returns the viewingGlass.
-	/**
+     * @return ImageIcon
-	 * Returns the viewingGlass.
+     */
-	 * @return ImageIcon
+    public static ImageIcon getViewingGlass() {
-	 */
+        return viewingGlass;
-	public static ImageIcon getViewingGlass() {
+    }
-		return viewingGlass;
+
-	}
+    /**
-
+     * Returns the newDoc.
-	/**
+     * @return ImageIcon
-	 * Returns the newDoc.
+     */
-	 * @return ImageIcon
+    public static ImageIcon getNewDoc() {
-	 */
+        return newDoc;
-	public static ImageIcon getNewDoc() {
+    }
-		return newDoc;
+
-	}
+    /**
-
+     * Returns the indexBox.
-	/**
+     * @return ImageIcon
-	 * Returns the indexBox.
+     */
-	 * @return ImageIcon
+    public static ImageIcon getIndexBox() {
-	 */
+        return indexBox;
-	public static ImageIcon getIndexBox() {
+    }
-		return indexBox;
-	}
 
 }

src/de/memtext/lang/SingOrPluralWord.java

@@ -1,28 +0,0 @@
-package de.memtext.lang;
-public class SingOrPluralWord {
-	public final static SingOrPluralWord SEIN=new SingOrPluralWord("ist","sind"); 
-private int count;
-private String singular,plural;
-	public SingOrPluralWord(String singular,String plural) {
-		this.singular=singular;
-		this.plural=plural;
-	}
-
-public static String format(int count,String sing,String plural)
-{
-	if (count==1) return count+" "+sing;
-	else
-	return count+" "+plural;
-}
-
-public String say(int count)
-{
-	if (count==1) return singular;
-	else
-	return plural;
-}
-
-
-}
-
-//Created on 12.12.2003 at 15:53:43

src/de/memtext/observ/DocumentListenerObserver.java

@@ -2,30 +2,35 @@ package de.memtext.observ;
 
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+
 /**
  * A document listener that will inform an observable about changes 
  * in the document
  */
 public class DocumentListenerObserver implements DocumentListener {
-private MyObservable observable;
+    private MyObservable observable;
-	public DocumentListenerObserver(MyObservable observable) {
+
-		this.observable= observable;
+    public DocumentListenerObserver(MyObservable observable) {
-	}
+        this.observable = observable;
-
+    }
-	public void insertUpdate(DocumentEvent e) {
+
-		observable.markChanged();
+    @Override
-		observable.notifyObservers();
+    public void insertUpdate(DocumentEvent e) {
-	}
+        observable.markChanged();
-
+        observable.notifyObservers();
-	public void removeUpdate(DocumentEvent e) {
+    }
-		observable.markChanged();
+
-				observable.notifyObservers();
+    @Override
-	}
+    public void removeUpdate(DocumentEvent e) {
-
+        observable.markChanged();
-	public void changedUpdate(DocumentEvent e) {
+        observable.notifyObservers();
-		observable.markChanged();
+    }
-				observable.notifyObservers();
+
-	}
+    @Override
+    public void changedUpdate(DocumentEvent e) {
+        observable.markChanged();
+        observable.notifyObservers();
+    }
 
 }
 

src/de/memtext/observ/MyObservable.java

@@ -10,8 +10,8 @@ import java.util.Observable;
 
 public class MyObservable extends Observable implements Serializable {
 
-	public void markChanged() {
+    public void markChanged() {
-		super.setChanged();
+        super.setChanged();
-	}
+    }
 
 }

src/de/memtext/rights/AllowableHierarchyUtil.java

@@ -11,107 +11,94 @@ import de.memtext.tree.TreeEntryI;
 
 public class AllowableHierarchyUtil {
 
-	/**
+    /**
-	 * Entfernt unerlaubte Blätter und Äste, in denen es gar keine erlaubten
+     * Entfernt unerlaubte Blätter und Äste, in denen es gar keine erlaubten
-	 * Knoten gibt
+     * Knoten gibt
-	 * 
+     * 
-	 * @param root
+     * @param root
-	 *            must also extend DefaultMutableTreeNode
+     *            must also extend DefaultMutableTreeNode
-	 */
+     */
-	public static void removeUnallowedNodes(AllowableHierarchy root) {
+    public static void removeUnallowedNodes(AllowableHierarchy root) {
-		if (!(root instanceof DefaultMutableTreeNode))
+        if (!(root instanceof DefaultMutableTreeNode)) throw new IllegalArgumentException(" must be a node!");
-			throw new IllegalArgumentException(" must be a node!");
+        DefaultMutableTreeNode rootNode = (DefaultMutableTreeNode) root;
-		DefaultMutableTreeNode rootNode = (DefaultMutableTreeNode) root;
+        boolean needAnotherRound = true, killedOne = false;
-		boolean needAnotherRound = true, killedOne = false;
 
-		while (needAnotherRound) {
+        while (needAnotherRound) {
-			killedOne = false;
+            killedOne = false;
-			for (Enumeration en = rootNode.breadthFirstEnumeration(); en
+            for (Enumeration en = rootNode.breadthFirstEnumeration(); en.hasMoreElements();) {
-					.hasMoreElements();) {
+                Object o = en.nextElement();
-				Object o = en.nextElement();
+                if (o == root) continue;
-				if (o == root)
+                AllowableHierarchy ah = (AllowableHierarchy) o;
-					continue;
-				AllowableHierarchy ah = (AllowableHierarchy) o;
 
-				if (!ah.isAnyDescendantAllowed()) {
+                if (!ah.isAnyDescendantAllowed()) {
-					// System.out.println("removing: "+ah);
+                    // System.out.println("removing: "+ah);
-					DefaultMutableTreeNode node = ((DefaultMutableTreeNode) ah);
+                    DefaultMutableTreeNode node = ((DefaultMutableTreeNode) ah);
-					markParentsAsNotAllowed(node);
+                    markParentsAsNotAllowed(node);
 
-					node.removeFromParent();
+                    node.removeFromParent();
-					killedOne = true;
+                    killedOne = true;
-					break;
+                    break;
-				}
+                }
-			}
+            }
-			if (killedOne == false)
+            if (killedOne == false) needAnotherRound = false;
-				needAnotherRound = false;
+        }
-		}
 
-	}
+    }
 
-	private static void markParentsAsNotAllowed(DefaultMutableTreeNode node) {
+    private static void markParentsAsNotAllowed(DefaultMutableTreeNode node) {
-		if (!node.isRoot()&& node instanceof Allowable) {
+        if (!node.isRoot() && node instanceof Allowable) {
-			Allowable al = null;
+            Allowable al = null;
-			if (node.getParent() instanceof Allowable)
+            if (node.getParent() instanceof Allowable) al = (Allowable) node.getParent();
-				al = (Allowable) node.getParent();
+            al.setAllowed(false);
-			al.setAllowed(false);
 
-				markParentsAsNotAllowed((DefaultMutableTreeNode) node
+            markParentsAsNotAllowed((DefaultMutableTreeNode) node.getParent());
-						.getParent());
+        }
-		}
 
-	}
+    }
 
-	/**
+    /**
-	 * Restrukturiert einen Baum, so dass nicht erlaubte "Zwischenäste" entfernt
+     * Restrukturiert einen Baum, so dass nicht erlaubte "Zwischenäste" entfernt
-	 * werden. root - noterl - erl3
+     * werden. root - noterl - erl3
-	 * 
+     * 
-	 * wird root - erl3
+     * wird root - erl3
-	 * 
+     * 
-	 * @param root
+     * @param root
-	 */
+     */
-	public static void reorg(AllowableHierarchy root) {
+    public static void reorg(AllowableHierarchy root) {
-		if (!(root instanceof DefaultMutableTreeNode))
+        if (!(root instanceof DefaultMutableTreeNode)) throw new IllegalArgumentException(" must be a node!");
-			throw new IllegalArgumentException(" must be a node!");
+        DefaultMutableTreeNode rootNode = (DefaultMutableTreeNode) root;
-		DefaultMutableTreeNode rootNode = (DefaultMutableTreeNode) root;
+        boolean needAnotherRound = true;
-		boolean needAnotherRound = true;
+        List nodeList = new LinkedList();
-		List nodeList = new LinkedList();
+        while (needAnotherRound) {
-		while (needAnotherRound) {
+            nodeList.clear();
-			nodeList.clear();
+            needAnotherRound = false;
-			needAnotherRound = false;
+            for (int i = 0; i < rootNode.getChildCount(); i++) {
-			for (int i = 0; i < rootNode.getChildCount(); i++) {
+                AllowableHierarchy ah = (AllowableHierarchy) rootNode.getChildAt(i);
-				AllowableHierarchy ah = (AllowableHierarchy) rootNode
+                if (!ah.isAllowed()) {
-						.getChildAt(i);
+                    needAnotherRound = true;
-				if (!ah.isAllowed()) {
+                    ((DefaultMutableTreeNode) ah).removeFromParent();
-					needAnotherRound = true;
+                    for (int i2 = 0; i2 < ((DefaultMutableTreeNode) ah).getChildCount(); i2++)
-					((DefaultMutableTreeNode) ah).removeFromParent();
+                        nodeList.add(((DefaultMutableTreeNode) ah).getChildAt(i2));
-					for (int i2 = 0; i2 < ((DefaultMutableTreeNode) ah)
+                }
-							.getChildCount(); i2++)
+            }
-						nodeList.add(((DefaultMutableTreeNode) ah)
+            for (Iterator it = nodeList.iterator(); it.hasNext();) {
-								.getChildAt(i2));
+                rootNode.add((DefaultMutableTreeNode) it.next());
-				}
+            }
-			}
+        }
-			for (Iterator it = nodeList.iterator(); it.hasNext();) {
+    }
-				rootNode.add((DefaultMutableTreeNode) it.next());
-			}
-		}
-	}
 
-	public static void markNotAllowedNodes(AllowableHierarchy root, String mark) {
+    public static void markNotAllowedNodes(AllowableHierarchy root, String mark) {
-		if (!(root instanceof DefaultMutableTreeNode))
+        if (!(root instanceof DefaultMutableTreeNode)) throw new IllegalArgumentException(" must be a node!");
-			throw new IllegalArgumentException(" must be a node!");
+        DefaultMutableTreeNode rootNode = (DefaultMutableTreeNode) root;
-		DefaultMutableTreeNode rootNode = (DefaultMutableTreeNode) root;
+        int i = 0;
-		int i = 0;
+        for (Enumeration en = rootNode.breadthFirstEnumeration(); en.hasMoreElements();) {
-		for (Enumeration en = rootNode.breadthFirstEnumeration(); en
+            AllowableHierarchy ah = (AllowableHierarchy) en.nextElement();
-				.hasMoreElements();) {
+            if (!ah.isAllowed()) {
-			AllowableHierarchy ah = (AllowableHierarchy) en.nextElement();
+                TreeEntryI te = (TreeEntryI) ah;
-			if (!ah.isAllowed()) {
+                if (!te.getName().endsWith(mark)) te.setName(te.getName() + mark);
-				TreeEntryI te = (TreeEntryI) ah;
+            }
-				if (!te.getName().endsWith(mark))
+        }
-					te.setName(te.getName() + mark);
+    }
-			}
-		}
-	}
 }
 
 // Created on 24.04.2005 at 08:05:45

src/de/memtext/rights/NewPasswordChecker.java

@@ -5,47 +5,41 @@ import java.io.Serializable;
 import de.memtext.util.PWChecker;
 
 public class NewPasswordChecker implements Serializable {
-private int minimumLength=0;
+    private int minimumLength = 0;
-private boolean isLowerAndUpperCaseNeeded=false;
-private boolean isNumberNeeded=false;
 
+    private boolean isLowerAndUpperCaseNeeded = false;
+
+    private boolean isNumberNeeded = false;
 
-public NewPasswordChecker(int minLaenge, int grossklein,int ziffernoetig)
-{
-    this.minimumLength=minLaenge;
-    isLowerAndUpperCaseNeeded=grossklein==1;
-    isNumberNeeded=ziffernoetig==1;
-}
 
-/**
+    public NewPasswordChecker(int minLaenge, int grossklein, int ziffernoetig) {
- * 
+        this.minimumLength = minLaenge;
- * @param check
+        isLowerAndUpperCaseNeeded = grossklein == 1;
- * @return null wenn alles OK
+        isNumberNeeded = ziffernoetig == 1;
- */
-public String checkForFaults(String username,String check)
-{
-    StringBuffer result=new StringBuffer();
-    if (check==null) 
-    {
-        result.append("Es wurde kein Passwort übermittelt.");
     }
-    else
+
-    {
+    /**
-        if (check.equals(username))
+     * 
-            result.append("Passwort darf nicht gleich Benutzername sein");
+     * @param check
-        if (minimumLength>0&&check.length()<minimumLength)
+     * @return null wenn alles OK
-            result.append("Passwort ist zu kurz (min. "+minimumLength+" Zeichen).");
+     */
-        if (isLowerAndUpperCaseNeeded&!PWChecker.hasLowerAndUpperCase(check))
+    public String checkForFaults(String username, String check) {
-                result.append("\nPasswort muss Groß- und Kleinbuchstaben enthalten.");
+        StringBuffer result = new StringBuffer();
-        if (isNumberNeeded&&!PWChecker.hasNumbers(check))
+        if (check == null) {
-            result.append("\nPasswort muss mindestens eine Ziffer enthalten.");
+            result.append("Es wurde kein Passwort übermittelt.");
-    //    if (oldShas.contains(CryptUtils.encodeSHA(check+CryptUtils.geheimnis1)))
+        } else {
-       //         result.append("Das Password wurde schon zuvor verwendet, bitte neues Password benutzen.");
+            if (check.equals(username)) result.append("Passwort darf nicht gleich Benutzername sein");
+            if (minimumLength > 0 && check.length() < minimumLength) result.append("Passwort ist zu kurz (min. " + minimumLength + " Zeichen).");
+            if (isLowerAndUpperCaseNeeded & !PWChecker.hasLowerAndUpperCase(check)) result.append("\nPasswort muss Groß- und Kleinbuchstaben enthalten.");
+            if (isNumberNeeded && !PWChecker.hasNumbers(check)) result.append("\nPasswort muss mindestens eine Ziffer enthalten.");
+            //    if (oldShas.contains(CryptUtils.encodeSHA(check+CryptUtils.geheimnis1)))
+            //         result.append("Das Password wurde schon zuvor verwendet, bitte neues Password benutzen.");
+        }
+        if (result.length() > 1)
+            return result.toString();
+        else
+            return null;
     }
-    if (result.length()>1) return result.toString();
-    else
-        return null;
-}
 }
 
 //Created on 20.11.2006 at 11:25:19