From d93c8bf2b0ef0a1aeaddb38c5060fb5c0f2b6565 Mon Sep 17 00:00:00 2001
From: Fabian Becker <fabian.becker@uni-tuebingen.de>
Date: Thu, 31 Jan 2013 15:56:53 +0000
Subject: [PATCH] refs #8

Further cleanup of logging.
---
 src/eva2/gui/BeanInspector.java       | 1971 ++++++++++++-------------
 src/eva2/gui/GOEPanel.java            |    3 +-
 src/eva2/gui/GenericObjectEditor.java |    4 +-
 src/eva2/gui/GraphWindow.java         |   16 +-
 src/eva2/gui/JExtMenu.java            |  157 +-
 src/eva2/server/ModuleServer.java     |   30 +-
 src/eva2/tools/Serializer.java        |  271 ++--
 7 files changed, 1194 insertions(+), 1258 deletions(-)

diff --git a/src/eva2/gui/BeanInspector.java b/src/eva2/gui/BeanInspector.java
index 4d0533fe..859c8336 100644
--- a/src/eva2/gui/BeanInspector.java
+++ b/src/eva2/gui/BeanInspector.java
@@ -1,5 +1,6 @@
 package eva2.gui;
 
+import eva2.client.EvAClient;
 import eva2.server.go.populations.Population;
 import eva2.server.go.strategies.GeneticAlgorithm;
 import eva2.tools.Pair;
@@ -15,1054 +16,1014 @@ import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
-
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
- * Some miscellaneous functions to help with Beans, reflection, conversion and generic display.
- * 
+ * Some miscellaneous functions to help with Beans, reflection, conversion and
+ * generic display.
+ *
  * @author mkron, Holger Ulmer, Felix Streichert, Hannes Planatscher
  *
  */
 public class BeanInspector {
-	public static boolean TRACE = false;
+    private static final Logger LOGGER = Logger.getLogger(BeanInspector.class.getName());
 
-	/**
-	 * Check for equality based on bean properties of two target objects.
-	 */
-	public static boolean equalProperties(Object obj_1, Object obj_2) {
-		if (obj_1 == null || obj_2 == null) {
-			System.out.println("");
-			return false;
-		}
-		System.out.println("equalProperties: " + obj_1.getClass().getName() + " " + obj_2.getClass().getName());
-		if (obj_1.getClass().getName().equals(obj_2.getClass().getName()) == false) {
-			System.out.println("");
-			return false;
-		}
-		// compare each of the properties !!
-		BeanInfo Info_1 = null;
-		BeanInfo Info_2 = null;
-		PropertyDescriptor[] Properties_1 = null;
-		PropertyDescriptor[] Properties_2 = null;
-		try {
+    /**
+     * Check for equality based on bean properties of two target objects.
+     */
+    public static boolean equalProperties(Object obj1, Object obj2) {
+        if (obj1 == null || obj2 == null) {
+            System.out.println("");
+            return false;
+        }
+        System.out.println("equalProperties: " + obj1.getClass().getName() + " " + obj2.getClass().getName());
+        if (obj1.getClass().getName().equals(obj2.getClass().getName()) == false) {
+            System.out.println("");
+            return false;
+        }
+        // compare each of the properties !!
+        BeanInfo beanInfo1;
+        BeanInfo beanInfo2;
+        PropertyDescriptor[] Properties_1 = null;
+        PropertyDescriptor[] Properties_2 = null;
+        try {
 
-			Info_1 = Introspector.getBeanInfo(obj_1.getClass());
-			Info_2 = Introspector.getBeanInfo(obj_2.getClass());
-			Properties_1 = Info_1.getPropertyDescriptors();
-			Properties_2 = Info_2.getPropertyDescriptors();
-			Info_1.getMethodDescriptors();
-		} catch (IntrospectionException ex) {
-			System.out.println("BeanTest: Couldn't introspect !!!!!!!!!");
-			return false;
-		}
-		boolean BeansInside = false;
-		boolean BeansEqual = true;
-		for (int i = 0; i < Properties_1.length; i++) {
-			if (Properties_1[i].isHidden() || Properties_1[i].isExpert()) {
-				continue;
-			}
-			//String name = Properties_1[i].getDisplayName(); //System.out.println("name = "+name );
-			//Class type = Properties_1[i].getPropertyType(); //System.out.println("type = "+type.getName() );
-			Method getter_1 = Properties_1[i].getReadMethod();
-			Method getter_2 = Properties_2[i].getReadMethod();
-			Method setter_1 = Properties_1[i].getWriteMethod();
-			// Only display read/write properties.
-			if (getter_1 == null || setter_1 == null) {
-				continue;
-			}
-			System.out.println("getter_1 = " + getter_1.getName() + " getter_2 = " + getter_2.getName());
-			//System.out.println("type = "+type.getName() );
-			Object args_1[] = {};
-			Object args_2[] = {};
-			//System.out.println("m_Target"+m_Target.toString());
-			try {
-				Object value_1 = getter_1.invoke(obj_1, args_1);
-				Object value_2 = getter_2.invoke(obj_2, args_2);
-				BeansInside = true;
-				if (BeanInspector.equalProperties(value_1, value_2) == false) {
-					BeansEqual = false;
-				}
-			} catch (Exception e) {
-				System.out.println(" BeanTest.equalProperties " + e.getMessage());
-			}
-		}
-		if (BeansInside == true) {
-			return BeansEqual;
-		}
-		// here we have Integer or Double ...
-		if (obj_1 instanceof Integer ||
-				obj_1 instanceof Boolean ||
-				obj_1 instanceof Float ||
-				obj_1 instanceof Double ||
-				obj_1 instanceof Long ||
-				obj_1 instanceof String) {
-			return obj_1.equals(obj_2);
-		}
-
-		System.err.println(" Attention no match !!!");
-		return true;
-	}
-
-	/**
-	 * Produce a String representation of an arbitrary object.
-	 * 
-	 * @see #toString(Object, char, boolean, String)
-	 * @param obj
-	 * @return
-	 */
-	public static String toString(Object obj) {
-		return toString(obj, ';', false, "", 1, false);
-	}
-	
-	/**
-	 * Produce a string with newlines and indentation (easier readable for if an object has many properties). 
-	 * @param obj
-	 * @return
-	 */
-	public static String niceToString(Object obj) {
-		return toString(obj, ';', false, "    ", 1, true);
-	}
-	
-	/**
-	 * Collect the accessible properties of an object and their values in a string with indentations.
-	 * Special cases: Arrays and Lists are concatenations of their elements, Population is excepted from lists.
-	 * If the object has its own toString method, this one is preferred. Hidden or expert properties are not
-	 * shown.
-	 * 
-	 * @param  obj an arbitrary object
-	 * @return a String description of the object
-	 */
-	public static String toString(Object obj, char delim, boolean tight, String indentStr) {
-		return toString(obj, delim, tight, indentStr, 1, false);
-	}
-	
-	/**
-	 * Collect the accessible properties of an object and their values in a string.
-	 * Special cases: Arrays and Lists are concatenations of their elements, Population is excepted from lists.
-	 * If the object has its own toString method, this one is preferred. Hidden or expert properties are not
-	 * shown.
-	 * 
-	 * @param  obj  Description of the Parameter
-	 * @return         Description of the Return Value
-	 */
-	private static String toString(Object obj, char delim, boolean tight, String indentStr, int indentDepth, boolean withNewlines) {
-		if (obj == null) {
-                return "null";
+            beanInfo1 = Introspector.getBeanInfo(obj1.getClass());
+            beanInfo2 = Introspector.getBeanInfo(obj2.getClass());
+            Properties_1 = beanInfo1.getPropertyDescriptors();
+            Properties_2 = beanInfo2.getPropertyDescriptors();
+            beanInfo1.getMethodDescriptors();
+        } catch (IntrospectionException ex) {
+            LOGGER.log(Level.FINEST, "Could not introspect object.", ex);
+            return false;
+        }
+        boolean BeansInside = false;
+        boolean BeansEqual = true;
+        for (int i = 0; i < Properties_1.length; i++) {
+            if (Properties_1[i].isHidden() || Properties_1[i].isExpert()) {
+                continue;
             }
-		// try the object itself
-		if (obj instanceof String) {
-                return (String)obj;
-            } // directly return a string object
-		Class<? extends Object> type = obj.getClass();
+            //String name = Properties_1[i].getDisplayName(); //System.out.println("name = "+name );
+            //Class type = Properties_1[i].getPropertyType(); //System.out.println("type = "+type.getName() );
+            Method getter_1 = Properties_1[i].getReadMethod();
+            Method getter_2 = Properties_2[i].getReadMethod();
+            Method setter_1 = Properties_1[i].getWriteMethod();
+            // Only display read/write properties.
+            if (getter_1 == null || setter_1 == null) {
+                continue;
+            }
+            System.out.println("getter_1 = " + getter_1.getName() + " getter_2 = " + getter_2.getName());
+            //System.out.println("type = "+type.getName() );
+            Object args_1[] = {};
+            Object args_2[] = {};
+            //System.out.println("m_Target"+m_Target.toString());
+            try {
+                Object value_1 = getter_1.invoke(obj1, args_1);
+                Object value_2 = getter_2.invoke(obj2, args_2);
+                BeansInside = true;
+                if (BeanInspector.equalProperties(value_1, value_2) == false) {
+                    BeansEqual = false;
+                }
+            } catch (Exception e) {
+                System.out.println(" BeanTest.equalProperties " + e.getMessage());
+            }
+        }
+        if (BeansInside == true) {
+            return BeansEqual;
+        }
+        // here we have Integer or Double ...
+        if (obj1 instanceof Integer
+                || obj1 instanceof Boolean
+                || obj1 instanceof Float
+                || obj1 instanceof Double
+                || obj1 instanceof Long
+                || obj1 instanceof String) {
+            return obj1.equals(obj2);
+        }
 
-		if (type.isArray()) { // handle the array case
-			StringBuffer sbuf = new StringBuffer();
-			sbuf.append("[");
-			if (!tight) {
-                        sbuf.append(" ");
-                    }
-			int len = Array.getLength(obj);
-			for (int i=0; i<len; i++) {
+        System.err.println(" Attention no match !!!");
+        return true;
+    }
+
+    /**
+     * Produce a String representation of an arbitrary object.
+     *
+     * @see #toString(Object, char, boolean, String)
+     * @param obj
+     * @return
+     */
+    public static String toString(Object obj) {
+        return toString(obj, ';', false, "", 1, false);
+    }
+
+    /**
+     * Produce a string with newlines and indentation (easier readable for if an
+     * object has many properties).
+     *
+     * @param obj
+     * @return
+     */
+    public static String niceToString(Object obj) {
+        return toString(obj, ';', false, "    ", 1, true);
+    }
+
+    /**
+     * Collect the accessible properties of an object and their values in a
+     * string with indentations. Special cases: Arrays and Lists are
+     * concatenations of their elements, Population is excepted from lists. If
+     * the object has its own toString method, this one is preferred. Hidden or
+     * expert properties are not shown.
+     *
+     * @param obj an arbitrary object
+     * @return a String description of the object
+     */
+    public static String toString(Object obj, char delim, boolean tight, String indentStr) {
+        return toString(obj, delim, tight, indentStr, 1, false);
+    }
+
+    /**
+     * Collect the accessible properties of an object and their values in a
+     * string. Special cases: Arrays and Lists are concatenations of their
+     * elements, Population is excepted from lists. If the object has its own
+     * toString method, this one is preferred. Hidden or expert properties are
+     * not shown.
+     *
+     * @param obj Description of the Parameter
+     * @return Description of the Return Value
+     */
+    private static String toString(Object obj, char delim, boolean tight, String indentStr, int indentDepth, boolean withNewlines) {
+        if (obj == null) {
+            return "null";
+        }
+        // try the object itself
+        if (obj instanceof String) {
+            return (String) obj;
+        } // directly return a string object
+        Class<? extends Object> type = obj.getClass();
+
+        if (type.isArray()) { // handle the array case
+            StringBuffer sbuf = new StringBuffer();
+            sbuf.append("[");
+            if (!tight) {
+                sbuf.append(" ");
+            }
+            int len = Array.getLength(obj);
+            for (int i = 0; i < len; i++) {
 //				sbuf.append(toString(Array.get(obj, i)));
-				if (withNewlines) {
-                                sbuf.append('\n');
-                            }
-				sbuf.append(toString(Array.get(obj, i), delim, tight, indentStr, indentDepth, withNewlines));
-				if (i<len-1) {
+                if (withNewlines) {
+                    sbuf.append('\n');
+                }
+                sbuf.append(toString(Array.get(obj, i), delim, tight, indentStr, indentDepth, withNewlines));
+                if (i < len - 1) {
 //					sbuf.append(delim);
-					if (!tight) {
-                                        sbuf.append(" ");
-                                    }
-				}
-			}
-			if (!tight) {
+                    if (!tight) {
                         sbuf.append(" ");
                     }
-			sbuf.append("]");
-			return sbuf.toString();
-		}
-		
-		if (type.isEnum()) {
-			return makeIndent(indentStr, indentDepth) + obj.toString();
-		}
+                }
+            }
+            if (!tight) {
+                sbuf.append(" ");
+            }
+            sbuf.append("]");
+            return sbuf.toString();
+        }
 
-		if (obj instanceof List && !(obj instanceof Population)) { // handle the list case
-			StringBuffer sbuf = new StringBuffer();
-			if (withNewlines) {
-                        sbuf.append('\n');
-                    }
-			addIndent(sbuf, indentStr, indentDepth);
-			sbuf.append("[");
-			if (!tight) {
-                        sbuf.append(" ");
-                    }
-			List<?> lst = (List<?>)obj;
-			for (Object o : lst) {
-				sbuf.append(o.toString());
-				sbuf.append(delim);
-				if (!tight) {
-                                sbuf.append(" ");
-                            }
-			}
-			if (!tight && (sbuf.charAt(sbuf.length()-2) == delim)) {
-                        sbuf.setCharAt(sbuf.length()-2, ' ');
-                    } // delete the delim
-			sbuf.setCharAt(sbuf.length()-1, ']');
-			return sbuf.toString();
-		}
+        if (type.isEnum()) {
+            return makeIndent(indentStr, indentDepth) + obj.toString();
+        }
 
-		Method[] methods = obj.getClass().getDeclaredMethods();
-		for (int ii = 0; ii < methods.length; ii++) { // check if the object has its own toString method, in this case use it
-			if ((methods[ii].getName().equals("toString") /*|| (methods[ii].getName().equals("getStringRepresentation"))*/) && (methods[ii].getParameterTypes().length == 0)) {
-				Object[] args = new Object[0];
-				//args[0] = obj;
-				try {
-					String ret = (String) methods[ii].invoke(obj, args);
-					if (TRACE) {
-                                        System.out.println("toString on "+ obj.getClass() + " gave me " + ret);
-                                    }
-					return makeIndent(indentStr, indentDepth) + ret;
-				} catch (Exception e) {
-					System.err.println(" ERROR +"+ e.getMessage());
-				}
-			}
-		}
-
-		// otherwise try introspection and collect all public properties as strings
-
-		Pair<String[],Object[]> nameVals = getPublicPropertiesOf(obj, true, true); 
-
-		StringBuffer sbuf = new StringBuffer();
-		if (withNewlines) {
+        if (obj instanceof List && !(obj instanceof Population)) { // handle the list case
+            StringBuffer sbuf = new StringBuffer();
+            if (withNewlines) {
                 sbuf.append('\n');
             }
-		addIndent(sbuf, indentStr, indentDepth);
-		sbuf.append(type.getName());
-		sbuf.append("{");
-		for (int i=0; i<nameVals.head.length; i++) {
-			if (nameVals.head[i]!=null) {
-				if (withNewlines) {
-                                sbuf.append('\n');
-                            } 
-				addIndent(sbuf, indentStr, indentDepth);
-				sbuf.append(nameVals.head[i]);
-				sbuf.append("=");
-				sbuf.append(toString(nameVals.tail[i], delim, tight, indentStr, indentDepth+1, withNewlines));
-				sbuf.append(delim);
-				if (!tight) {
-                                sbuf.append(" ");
-                            }
-			}
-		}
+            addIndent(sbuf, indentStr, indentDepth);
+            sbuf.append("[");
+            if (!tight) {
+                sbuf.append(" ");
+            }
+            List<?> lst = (List<?>) obj;
+            for (Object o : lst) {
+                sbuf.append(o.toString());
+                sbuf.append(delim);
+                if (!tight) {
+                    sbuf.append(" ");
+                }
+            }
+            if (!tight && (sbuf.charAt(sbuf.length() - 2) == delim)) {
+                sbuf.setCharAt(sbuf.length() - 2, ' ');
+            } // delete the delim
+            sbuf.setCharAt(sbuf.length() - 1, ']');
+            return sbuf.toString();
+        }
 
-		sbuf.append("}");
-		return sbuf.toString();
-	}
+        Method[] methods = obj.getClass().getDeclaredMethods();
+        for (int ii = 0; ii < methods.length; ii++) { // check if the object has its own toString method, in this case use it
+            if ((methods[ii].getName().equals("toString") /*|| (methods[ii].getName().equals("getStringRepresentation"))*/) && (methods[ii].getParameterTypes().length == 0)) {
+                Object[] args = new Object[0];
+                //args[0] = obj;
+                try {
+                    String ret = (String) methods[ii].invoke(obj, args);
+                    return makeIndent(indentStr, indentDepth) + ret;
+                } catch (Exception e) {
+                    System.err.println(" ERROR +" + e.getMessage());
+                }
+            }
+        }
 
-	private static void addIndent(StringBuffer sbuf, String indentStr, int indentDepth) {
-		if (indentStr!=null && (indentDepth>0)) {
-			for (int i=0; i<indentDepth; i++) {
+        // otherwise try introspection and collect all public properties as strings
+
+        Pair<String[], Object[]> nameVals = getPublicPropertiesOf(obj, true, true);
+
+        StringBuffer sbuf = new StringBuffer();
+        if (withNewlines) {
+            sbuf.append('\n');
+        }
+        addIndent(sbuf, indentStr, indentDepth);
+        sbuf.append(type.getName());
+        sbuf.append("{");
+        for (int i = 0; i < nameVals.head.length; i++) {
+            if (nameVals.head[i] != null) {
+                if (withNewlines) {
+                    sbuf.append('\n');
+                }
+                addIndent(sbuf, indentStr, indentDepth);
+                sbuf.append(nameVals.head[i]);
+                sbuf.append("=");
+                sbuf.append(toString(nameVals.tail[i], delim, tight, indentStr, indentDepth + 1, withNewlines));
+                sbuf.append(delim);
+                if (!tight) {
+                    sbuf.append(" ");
+                }
+            }
+        }
+
+        sbuf.append("}");
+        return sbuf.toString();
+    }
+
+    private static void addIndent(StringBuffer sbuf, String indentStr, int indentDepth) {
+        if (indentStr != null && (indentDepth > 0)) {
+            for (int i = 0; i < indentDepth; i++) {
                 sbuf.append(indentStr);
             }
-		}
-	}
-	
-	private static String makeIndent(String indentStr, int indentDepth) {
-		if (indentStr!=null) {
-			if (indentDepth<1) {
-                        return "";
-                    }
-			else {
-				StringBuffer sbuf = new StringBuffer(indentStr);
-				for (int i=2; i<=indentDepth; i++) {
+        }
+    }
+
+    private static String makeIndent(String indentStr, int indentDepth) {
+        if (indentStr != null) {
+            if (indentDepth < 1) {
+                return "";
+            } else {
+                StringBuffer sbuf = new StringBuffer(indentStr);
+                for (int i = 2; i <= indentDepth; i++) {
                     sbuf.append(indentStr);
                 }
-				return sbuf.toString();
-			}
-		} else {
-                return "";
+                return sbuf.toString();
             }
-	}
+        } else {
+            return "";
+        }
+    }
 
-	public static void main(String[] args) {
-		System.out.println(BeanInspector.toString(new String[]{"asdf", "jdksfl", "werljk"}));
-		
-		System.out.println(BeanInspector.toString(new Population()));
-		System.out.println(BeanInspector.toString(new GeneticAlgorithm()));
-		System.out.println("----");
-		System.out.println(BeanInspector.niceToString(new Population()));
-		System.out.println(BeanInspector.niceToString(new GeneticAlgorithm()));
-		System.out.println("----");
-		System.out.println(BeanInspector.toString(new Population(), ';', false, ">", 1, false));
-		System.out.println(BeanInspector.toString(new GeneticAlgorithm(), ';', false, ">", 1, false));
-		//		System.out.println(BeanInspector.toString(new Population(), ',', false, "\t"));
+    public static void main(String[] args) {
+        System.out.println(BeanInspector.toString(new String[]{"asdf", "jdksfl", "werljk"}));
+
+        System.out.println(BeanInspector.toString(new Population()));
+        System.out.println(BeanInspector.toString(new GeneticAlgorithm()));
+        System.out.println("----");
+        System.out.println(BeanInspector.niceToString(new Population()));
+        System.out.println(BeanInspector.niceToString(new GeneticAlgorithm()));
+        System.out.println("----");
+        System.out.println(BeanInspector.toString(new Population(), ';', false, ">", 1, false));
+        System.out.println(BeanInspector.toString(new GeneticAlgorithm(), ';', false, ">", 1, false));
+        //		System.out.println(BeanInspector.toString(new Population(), ',', false, "\t"));
 //		System.out.println(BeanInspector.toString(new GeneticAlgorithm(), ',', false, "\t"));
-	}
-	
-	/**
-	 * Retrieve names and values of instance fields which are accessible by getter method, optionally
-	 * by both getter and setter method. The returned arrays may contain null entries.
-	 * Properties marked as hidden or expert are skipped.
-	 *   
-	 * @param target
-	 * @return
-	 */
-	public static Pair<String[],Object[]> getPublicPropertiesOf(Object target, boolean requireSetter, boolean showHidden) {
-		BeanInfo Info = null;
-		PropertyDescriptor[] Properties = null;
-//		MethodDescriptor[] Methods = null;
-		try {
-			Info = Introspector.getBeanInfo(target.getClass());
-			Properties = Info.getPropertyDescriptors();
-			Info.getMethodDescriptors();
-		} catch (IntrospectionException ex) {
-			System.err.println("BeanTest: Couldn't introspect");
-			return null;
-		}
+    }
 
-		String[] nameArray = new String[Properties.length];
-		Object[] valArray = new Object[Properties.length];
-		for (int i = 0; i < Properties.length; i++) {
-			if ((Properties[i].isHidden() && !showHidden) || Properties[i].isExpert()) {
+    /**
+     * Retrieve names and values of instance fields which are accessible by
+     * getter method, optionally by both getter and setter method. The returned
+     * arrays may contain null entries. Properties marked as hidden or expert
+     * are skipped.
+     *
+     * @param target
+     * @return
+     */
+    public static Pair<String[], Object[]> getPublicPropertiesOf(Object target, boolean requireSetter, boolean showHidden) {
+        BeanInfo Info = null;
+        PropertyDescriptor[] Properties = null;
+//		MethodDescriptor[] Methods = null;
+        try {
+            Info = Introspector.getBeanInfo(target.getClass());
+            Properties = Info.getPropertyDescriptors();
+            Info.getMethodDescriptors();
+        } catch (IntrospectionException ex) {
+            System.err.println("BeanTest: Couldn't introspect");
+            return null;
+        }
+
+        String[] nameArray = new String[Properties.length];
+        Object[] valArray = new Object[Properties.length];
+        for (int i = 0; i < Properties.length; i++) {
+            if ((Properties[i].isHidden() && !showHidden) || Properties[i].isExpert()) {
 //				System.err.println(Properties[i].getDisplayName() + " is " + ( (Properties[i].isExpert())? "expert": "hidden"));
-				continue;
-			}
-			String name = Properties[i].getDisplayName();
-			//System.out.println("name = "+name );
-			//Class type = Properties[i].getPropertyType();
-			//System.out.println("type = "+type.getName() );
-			Method getter = Properties[i].getReadMethod();
-			Method setter = Properties[i].getWriteMethod();
-			// Only display read/write properties.
-			if (getter == null || (setter == null && requireSetter)) {
-				continue;
-			}
-			//System.out.println("name = "+name );
-			//System.out.println("type = "+type.getName() );
-			Object args[] = {};
-			//System.out.println("m_obj"+m_obj.toString());
+                continue;
+            }
+            String name = Properties[i].getDisplayName();
+            //System.out.println("name = "+name );
+            //Class type = Properties[i].getPropertyType();
+            //System.out.println("type = "+type.getName() );
+            Method getter = Properties[i].getReadMethod();
+            Method setter = Properties[i].getWriteMethod();
+            // Only display read/write properties.
+            if (getter == null || (setter == null && requireSetter)) {
+                continue;
+            }
+            //System.out.println("name = "+name );
+            //System.out.println("type = "+type.getName() );
+            Object args[] = {};
+            //System.out.println("m_obj"+m_obj.toString());
 
-			try {
-				nameArray[i]=name;
-				valArray[i] = getter.invoke(target, args);
-			} catch (Exception e) {
-				System.err.println("BeanTest ERROR +"+ e.getMessage());
-			}
-		}
-		Pair<String[],Object[]> nameVals = new Pair<String[],Object[]>(nameArray, valArray);
-		return nameVals;
-	}
-	
+            try {
+                nameArray[i] = name;
+                valArray[i] = getter.invoke(target, args);
+            } catch (Exception e) {
+                System.err.println("BeanTest ERROR +" + e.getMessage());
+            }
+        }
+        Pair<String[], Object[]> nameVals = new Pair<String[], Object[]>(nameArray, valArray);
+        return nameVals;
+    }
 
-	/**
-	 *@param  obj  Description of the Parameter
-	 */
-	public static void showInfo(Object obj) {
-		System.out.println("Inspecting " + obj.getClass().getName());
-		// object itself
-		try {
-			if (obj instanceof java.lang.Integer) {
-				System.out.println(" Prop = Integer" + obj.toString());
-			}
-			if (obj instanceof java.lang.Boolean) {
-				System.out.println(" Prop = Boolean" + obj.toString());
-			}
-			if (obj instanceof java.lang.Long) {
-				System.out.println(" Prop = Long" + obj.toString());
-			}
-			if (obj instanceof java.lang.Double) {
-				System.out.println(" Prop = Long" + obj.toString());
-			}
-		} catch (Exception e) {
-			//System.out.println(" ERROR +"+ e.getMessage());
-		}
-		// then the properties
-		BeanInfo Info = null;
-		PropertyDescriptor[] Properties = null;
+    /**
+     * @param obj Description of the Parameter
+     */
+    public static void showInfo(Object obj) {
+        System.out.println("Inspecting " + obj.getClass().getName());
+        // object itself
+        try {
+            if (obj instanceof java.lang.Integer) {
+                System.out.println(" Prop = Integer" + obj.toString());
+            }
+            if (obj instanceof java.lang.Boolean) {
+                System.out.println(" Prop = Boolean" + obj.toString());
+            }
+            if (obj instanceof java.lang.Long) {
+                System.out.println(" Prop = Long" + obj.toString());
+            }
+            if (obj instanceof java.lang.Double) {
+                System.out.println(" Prop = Long" + obj.toString());
+            }
+        } catch (Exception e) {
+            //System.out.println(" ERROR +"+ e.getMessage());
+        }
+        // then the properties
+        BeanInfo Info = null;
+        PropertyDescriptor[] Properties = null;
 //		MethodDescriptor[] Methods = null;
-		try {
-			Info = Introspector.getBeanInfo(obj.getClass());
-			Properties = Info.getPropertyDescriptors();
-			Info.getMethodDescriptors();
-		} catch (IntrospectionException ex) {
-			System.err.println("BeanTest: Couldn't introspect");
-			return;
-		}
+        try {
+            Info = Introspector.getBeanInfo(obj.getClass());
+            Properties = Info.getPropertyDescriptors();
+            Info.getMethodDescriptors();
+        } catch (IntrospectionException ex) {
+            System.err.println("BeanTest: Couldn't introspect");
+            return;
+        }
 
-		for (int i = 0; i < Properties.length; i++) {
-			if (Properties[i].isHidden() || Properties[i].isExpert()) {
-				continue;
-			}
-			String name = Properties[i].getDisplayName();
-			//System.out.println("name = "+name );
+        for (int i = 0; i < Properties.length; i++) {
+            if (Properties[i].isHidden() || Properties[i].isExpert()) {
+                continue;
+            }
+            String name = Properties[i].getDisplayName();
+            //System.out.println("name = "+name );
 //			Class type = Properties[i].getPropertyType();
-			//System.out.println("type = "+type.getName() );
-			Method getter = Properties[i].getReadMethod();
-			Method setter = Properties[i].getWriteMethod();
-			// Only display read/write properties.
-			if (getter == null || setter == null) {
-				continue;
-			}
-			//System.out.println("name = "+name );
-			//System.out.println("type = "+type.getName() );
-			Object args[] = {};
-			//System.out.println("m_Target"+m_Target.toString());
-			try {
-				Object value = getter.invoke(obj, args);
-				System.out.println("Inspecting name = " + name);
-				if (value instanceof Integer) {
-					Object args2[] = {new Integer(999)};
-					setter.invoke(obj, args2);
-				}
-				showInfo(value);
-			} catch (Exception e) {
-				System.out.println("BeanTest ERROR +" + e.getMessage());
-			}
-		}
-	}
+            //System.out.println("type = "+type.getName() );
+            Method getter = Properties[i].getReadMethod();
+            Method setter = Properties[i].getWriteMethod();
+            // Only display read/write properties.
+            if (getter == null || setter == null) {
+                continue;
+            }
+            //System.out.println("name = "+name );
+            //System.out.println("type = "+type.getName() );
+            Object args[] = {};
+            //System.out.println("m_Target"+m_Target.toString());
+            try {
+                Object value = getter.invoke(obj, args);
+                System.out.println("Inspecting name = " + name);
+                if (value instanceof Integer) {
+                    Object args2[] = {new Integer(999)};
+                    setter.invoke(obj, args2);
+                }
+                showInfo(value);
+            } catch (Exception e) {
+                System.out.println("BeanTest ERROR +" + e.getMessage());
+            }
+        }
+    }
 
-	/**
-	 * Call a method by a given name with given arguments, if the method is available.
-	 * Returns the return values of the call or null if it isnt found.
-	 * This of course means that the caller is unable to distinguish between "method not found"
-	 * and "method found and it returned null".
-	 * 
-	 * @param obj
-	 * @param mName
-	 * @param args
-	 * @return the return value of the called method or null
-	 */
-	public static Object callIfAvailable(Object obj, String mName, Object[] args) {
-		Method meth = hasMethod(obj, mName, toClassArray(args));
-		if (meth != null) {
-			try {
-				return meth.invoke(obj, args);
-			} catch(Exception e) {
-				System.err.println("Error on calling method "+mName + " on " + obj.getClass().getName());
-				System.err.println("Object: " + obj.toString() + ", method name: " + mName);
-				System.err.println("Arguments were " + BeanInspector.toString(args));
-				e.printStackTrace();
-				return null;
-			}
-		} else {
+    /**
+     * Call a method by a given name with given arguments, if the method is
+     * available. Returns the return values of the call or null if it isnt
+     * found. This of course means that the caller is unable to distinguish
+     * between "method not found" and "method found and it returned null".
+     *
+     * @param obj
+     * @param mName
+     * @param args
+     * @return the return value of the called method or null
+     */
+    public static Object callIfAvailable(Object obj, String mName, Object[] args) {
+        Method meth = hasMethod(obj, mName, toClassArray(args));
+        if (meth != null) {
+            try {
+                return meth.invoke(obj, args);
+            } catch (Exception e) {
+                System.err.println("Error on calling method " + mName + " on " + obj.getClass().getName());
+                System.err.println("Object: " + obj.toString() + ", method name: " + mName);
+                System.err.println("Arguments were " + BeanInspector.toString(args));
+                e.printStackTrace();
                 return null;
             }
-	}
+        } else {
+            return null;
+        }
+    }
 
-	/**
-	 * Produce an array of Class instances matching the types of 
-	 * the given object array.
-	 * 
-	 * @param o
-	 * @return
-	 */
-	public static Class[] toClassArray(Object[] o) {
-		if (o==null) {
-                return null;
-            }
-		Class[] clz = new Class[o.length];
-		for (int i=0; i<o.length; i++) {
-			clz[i]=o[i].getClass();
-		}
-		return clz;
-	}
-	
-	/**
-	 * Check whether an object has a method by the given name and with
-	 * matching signature considering the arguments. Return
-	 * it if found, or null if not.
-	 *  
-	 * @param obj
-	 * @param mName the method name
-	 * @param args the arguments, null allowed if the method takes no parameters
-	 * @return the method or null if it isn't found
-	 */
-	public static Method hasMethod(Object obj, String mName, Object[] args) {
-		return hasMethod(obj, mName, toClassArray(args));
-	}
-	
-	/**
-	 * Check whether an object has a method by the given name and
-	 * with the given parameter signature. Return
-	 * it if found, or null if not.
-	 *  
-	 * @param obj
-	 * @param mName the method name
-	 * @param paramTypes the parameter types, null allowed if no parameters are expected
-	 * @return the method or null if it isn't found
-	 */
-	public static Method hasMethod(Object obj, String mName, Class[] paramTypes) {
-		Class<?> cls = obj.getClass();
-		Method[] meths = cls.getMethods();
-		for (Method method : meths) {
-			if (method.getName().equals(mName)) { // name match
-				Class[] methParamTypes = method.getParameterTypes();
-				if (paramTypes==null && methParamTypes.length==0) {
-                                return method;
-                            } // full match
-				else {
-					if (paramTypes!=null && (methParamTypes.length==paramTypes.length)) {
-						boolean mismatch = false; int i=0;
-						while ((i<methParamTypes.length) && (!mismatch)) {
-							if (!methParamTypes[i].isAssignableFrom(paramTypes[i]) && !isBoxableFrom(methParamTypes[i], paramTypes[i])) {
-                                                        mismatch=true;
-                                                    }
-							i++;
-						} 
-						if (!mismatch) {
-                                                return method;
-                                            } // parameter match, otherwise search on
-					} // parameter mismatch, search on
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Check if the given first class is a primitive type and can be boxed to match the second class.
-	 * 
-	 * @param clz1
-	 * @param clz2
-	 * @return
-	 */
-	private static boolean isBoxableFrom(Class clz1, Class clz2) {
-		Class box = getBoxedType(clz1);
-		if (box!=null && (clz2.isAssignableFrom(box))) {
-			return true;
-		} else {
-                return false;
-            }
-	}
+    /**
+     * Produce an array of Class instances matching the types of the given
+     * object array.
+     *
+     * @param o
+     * @return
+     */
+    public static Class[] toClassArray(Object[] o) {
+        if (o == null) {
+            return null;
+        }
+        Class[] clz = new Class[o.length];
+        for (int i = 0; i < o.length; i++) {
+            clz[i] = o[i].getClass();
+        }
+        return clz;
+    }
 
-	/**
-	 * For a primitive type, return the boxed referenced type.
-	 * Return null for any non-primitive type.
-	 * 
-	 * @param clz1
-	 * @return
-	 */
-	public static Class getBoxedType(Class cls) {
-		if (cls.isPrimitive()) {
-			if (cls == double.class) {
-                        return Double.class;
-                    }
-			else if (cls == char.class) {  
-                        return Character.class;
-                    }  
-			else if (cls == int.class) {
-                        return Integer.class;
-                    }
-			else if (cls == boolean.class) {
-                        return Boolean.class;
-                    }
-			else if (cls == byte.class) { 
-                        return Byte.class;
-                    } 
-			else if (cls == short.class) {
-                        return Short.class;
-                    }
-			else if (cls == long.class) {
-                        return Long.class;
-                    }
-			else if (cls == float.class) {
-                        return Float.class;
-                    }
-			else {
-                        return Void.class;
-                    }
-		} else {
-                return null;
-            }
-	}
+    /**
+     * Check whether an object has a method by the given name and with matching
+     * signature considering the arguments. Return it if found, or null if not.
+     *
+     * @param obj
+     * @param mName the method name
+     * @param args the arguments, null allowed if the method takes no parameters
+     * @return the method or null if it isn't found
+     */
+    public static Method hasMethod(Object obj, String mName, Object[] args) {
+        return hasMethod(obj, mName, toClassArray(args));
+    }
 
-	/**
-	 * For a Java primitive wrapper class return the corresponding
-	 * primitive class.
-	 **/
-	public static Class getUnboxedType(Class cls) {
-		if (cls == Double.class) {
-                return double.class;
-            }
-		else if (cls == Character.class) {  
-                return char.class;
-            }  
-		else if (cls == Integer.class) {
-                return int.class;
-            }
-		else if (cls == Boolean.class) {
-                return boolean.class;
-            }
-		else if (cls == Byte.class) { 
-                return byte.class;
-            } 
-		else if (cls == Short.class) {
-                return short.class;
-            }
-		else if (cls == Long.class) {
-                return long.class;
-            }
-		else if (cls == Float.class) {
-                return float.class;
-            }
-		else if (cls == Void.class) {
-                return void.class;
-            }
-		else {
-                return null;
-            }
-	}
-	
-	/**
-	 * Just concatenates getClassDescription(obj) and getMemberDescriptions(obj, withValues).
-	 * 
-	 * @param obj	target object
-	 * @param withValues	if true, member values are displayed as well 
-	 * @return an info string about class and members of the given object
-	 */
-	public static String getDescription(Object obj, boolean withValues) {
-		StringBuffer sbuf = new StringBuffer(getClassDescription(obj));
-		sbuf.append("\n"); 
-		String[] mems = getMemberDescriptions(obj, withValues);
-		for (String str : mems) {
-			sbuf.append(str);
-		}
-		return sbuf.toString();
-	}
-	
-	/**
-	 * Check for info methods on the object to be provided by the developer
-	 * and return their text as String.
-	 * 
-	 * @param obj
-	 * @return String information about the object's class
-	 */
-	public static String getClassDescription(Object obj) {
-		StringBuffer infoBf = new StringBuffer("Type: ");
-		infoBf.append(obj.getClass().getName());
-		infoBf.append("\t");
-		
-		Object          args[]  = { };
-		Object ret; 
-		
-		for (String meth : new String[]{"getName", "globalInfo"}) {
-			ret = callIfAvailable(obj, meth, args);
-			if (ret != null) {
-				infoBf.append("\t");
-				infoBf.append((String)ret);
-			}
-		}
-		
-		return infoBf.toString();
-	}
-
-	/**
-	 * Return an info string on the members of the object class, containing name, type, optional
-	 * value and tool tip text if available. The type is accompanied by a tag "common" or "restricted",
-	 * indicating whether the member property is normal or hidden, meaning it may have effect depending
-	 * on settings of other members only, for instance.
-	 * 
-	 * @param obj	target object
-	 * @param withValues	if true, member values are displayed as well 
-	 * @return an info string about class and members of the given object
-	 */
-	public static String[] getMemberDescriptions(Object obj, boolean withValues) {
-		BeanInfo bi;    
-		try {
-			bi      = Introspector.getBeanInfo(obj.getClass());
-		} catch(IntrospectionException e) {
-			e.printStackTrace();
-			return null;
-		}
-		PropertyDescriptor[] 	m_Properties = bi.getPropertyDescriptors();
-		ArrayList<String> 				memberInfoList  = new ArrayList<String>();
-		
-		for (int i = 0; i < m_Properties.length; i++) {
-			if (m_Properties[i].isExpert()) {
-                        continue;
-                    }
-			
-			String  name    = m_Properties[i].getDisplayName();
-			if (TRACE) {
-                        System.out.println("PSP looking at "+ name);
-                    }
-
-			Method  getter  = m_Properties[i].getReadMethod();
-			Method  setter  = m_Properties[i].getWriteMethod();
-			// Only display read/write properties.
-			if (getter == null || setter == null) {
-                        continue;
-                    }
-			
-			try {
-				Object          args[]  = { };
-				Object          value   = getter.invoke(obj, args);
-
-				// Don't try to set null values:
-				if (value == null) {
-					// If it's a user-defined property we give a warning.
-					String getterClass = m_Properties[i].getReadMethod().getDeclaringClass().getName();
-					if (getterClass.indexOf("java.") != 0) {
-                                        System.err.println("Warning: Property \"" + name+ "\" has null initial value.  Skipping.");
-                                    }
-					continue;
-				}
-
-				StringBuffer memberInfoBf = new StringBuffer(40);
-				memberInfoBf.append("Member:\t");
-				memberInfoBf.append(name);
-				
-				memberInfoBf.append("\tType: ");
-				
-				if (m_Properties[i].isHidden()) {
-					memberInfoBf.append("restricted, ");
-				} else {
-					memberInfoBf.append("common, ");
-				}
-				String typeName = value.getClass().getName();
-				if (value instanceof SelectedTag) {
-					Tag[] tags = ((SelectedTag)value).getTags();
-					memberInfoBf.append("String in {");
-					for (int k=0; k<tags.length; k++) {
-						memberInfoBf.append(tags[k].getString());
-						if (k+1<tags.length) {
-                                                memberInfoBf.append(", ");
-                                            }
-					}
-					memberInfoBf.append("}");
-				} else {
-                                memberInfoBf.append(typeName);
+    /**
+     * Check whether an object has a method by the given name and with the given
+     * parameter signature. Return it if found, or null if not.
+     *
+     * @param obj
+     * @param mName the method name
+     * @param paramTypes the parameter types, null allowed if no parameters are
+     * expected
+     * @return the method or null if it isn't found
+     */
+    public static Method hasMethod(Object obj, String mName, Class[] paramTypes) {
+        Class<?> cls = obj.getClass();
+        Method[] meths = cls.getMethods();
+        for (Method method : meths) {
+            if (method.getName().equals(mName)) { // name match
+                Class[] methParamTypes = method.getParameterTypes();
+                if (paramTypes == null && methParamTypes.length == 0) {
+                    return method;
+                } // full match
+                else {
+                    if (paramTypes != null && (methParamTypes.length == paramTypes.length)) {
+                        boolean mismatch = false;
+                        int i = 0;
+                        while ((i < methParamTypes.length) && (!mismatch)) {
+                            if (!methParamTypes[i].isAssignableFrom(paramTypes[i]) && !isBoxableFrom(methParamTypes[i], paramTypes[i])) {
+                                mismatch = true;
                             }
-				
-				if (withValues) {
-					memberInfoBf.append('\t');
-					memberInfoBf.append("Value: \t");
-					memberInfoBf.append(toString(value));
-				}
-				
-				// now look for a TipText method for this property
-				Method tipTextMethod = hasMethod(obj, name + "TipText", null);
-				if (tipTextMethod == null) {
-					memberInfoBf.append("\tNo further hint.");
-				} else {
-					memberInfoBf.append("\tHint: ");
-					memberInfoBf.append(toString(tipTextMethod.invoke(obj, args)));
-				}
-				
-				memberInfoBf.append('\n');
-				memberInfoList.add(memberInfoBf.toString());
-			} catch (Exception ex) {
-				System.err.println("Skipping property "+name+" ; exception: " + ex.getMessage());
-				ex.printStackTrace();
-			} // end try
-		}	// end for
-		return memberInfoList.toArray(new String[1]);
-	}
-	
-	/**
-	 * Take an object of primitive type (like int, Integer etc) and convert it to double.
-	 * 
-	 * @param val
-	 * @return
-	 * @throws IllegalArgumentException
-	 */
-	public static double toDouble(Object val) throws IllegalArgumentException {
-		if (val instanceof Integer) {
-                return ((Integer)val).doubleValue();
+                            i++;
+                        }
+                        if (!mismatch) {
+                            return method;
+                        } // parameter match, otherwise search on
+                    } // parameter mismatch, search on
+                }
             }
-		else if (val instanceof Double) {
-                return ((Double)val).doubleValue();
+        }
+        return null;
+    }
+
+    /**
+     * Check if the given first class is a primitive type and can be boxed to
+     * match the second class.
+     *
+     * @param clz1
+     * @param clz2
+     * @return
+     */
+    private static boolean isBoxableFrom(Class clz1, Class clz2) {
+        Class box = getBoxedType(clz1);
+        if (box != null && (clz2.isAssignableFrom(box))) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * For a primitive type, return the boxed referenced type. Return null for
+     * any non-primitive type.
+     *
+     * @param clz1
+     * @return
+     */
+    public static Class getBoxedType(Class cls) {
+        if (cls.isPrimitive()) {
+            if (cls == double.class) {
+                return Double.class;
+            } else if (cls == char.class) {
+                return Character.class;
+            } else if (cls == int.class) {
+                return Integer.class;
+            } else if (cls == boolean.class) {
+                return Boolean.class;
+            } else if (cls == byte.class) {
+                return Byte.class;
+            } else if (cls == short.class) {
+                return Short.class;
+            } else if (cls == long.class) {
+                return Long.class;
+            } else if (cls == float.class) {
+                return Float.class;
+            } else {
+                return Void.class;
             }
-		else if (val instanceof Boolean) { 
-                return (((Boolean)val) ? 1. : 0.);
-            } 
-		else if (val instanceof Character) { 
-                return ((Character)val).charValue();
-            } 
-		else if (val instanceof Byte) { 
-                return ((Byte)val).doubleValue();
-            } 
-		else if (val instanceof Short) { 
-                return ((Short)val).doubleValue();
-            } 
-		else if (val instanceof Long) { 
-                return ((Long)val).doubleValue();
-            } 
-		else if (val instanceof Float) { 
-                return ((Float)val).doubleValue();
-            } 
-		else if (val instanceof Void) {
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * For a Java primitive wrapper class return the corresponding primitive
+     * class.
+	 *
+     */
+    public static Class getUnboxedType(Class cls) {
+        if (cls == Double.class) {
+            return double.class;
+        } else if (cls == Character.class) {
+            return char.class;
+        } else if (cls == Integer.class) {
+            return int.class;
+        } else if (cls == Boolean.class) {
+            return boolean.class;
+        } else if (cls == Byte.class) {
+            return byte.class;
+        } else if (cls == Short.class) {
+            return short.class;
+        } else if (cls == Long.class) {
+            return long.class;
+        } else if (cls == Float.class) {
+            return float.class;
+        } else if (cls == Void.class) {
+            return void.class;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Just concatenates getClassDescription(obj) and getMemberDescriptions(obj,
+     * withValues).
+     *
+     * @param obj	target object
+     * @param withValues	if true, member values are displayed as well
+     * @return an info string about class and members of the given object
+     */
+    public static String getDescription(Object obj, boolean withValues) {
+        StringBuffer sbuf = new StringBuffer(getClassDescription(obj));
+        sbuf.append("\n");
+        String[] mems = getMemberDescriptions(obj, withValues);
+        for (String str : mems) {
+            sbuf.append(str);
+        }
+        return sbuf.toString();
+    }
+
+    /**
+     * Check for info methods on the object to be provided by the developer and
+     * return their text as String.
+     *
+     * @param obj
+     * @return String information about the object's class
+     */
+    public static String getClassDescription(Object obj) {
+        StringBuffer infoBf = new StringBuffer("Type: ");
+        infoBf.append(obj.getClass().getName());
+        infoBf.append("\t");
+
+        Object args[] = {};
+        Object ret;
+
+        for (String meth : new String[]{"getName", "globalInfo"}) {
+            ret = callIfAvailable(obj, meth, args);
+            if (ret != null) {
+                infoBf.append("\t");
+                infoBf.append((String) ret);
+            }
+        }
+
+        return infoBf.toString();
+    }
+
+    /**
+     * Return an info string on the members of the object class, containing
+     * name, type, optional value and tool tip text if available. The type is
+     * accompanied by a tag "common" or "restricted", indicating whether the
+     * member property is normal or hidden, meaning it may have effect depending
+     * on settings of other members only, for instance.
+     *
+     * @param obj	target object
+     * @param withValues	if true, member values are displayed as well
+     * @return an info string about class and members of the given object
+     */
+    public static String[] getMemberDescriptions(Object obj, boolean withValues) {
+        BeanInfo bi;
+        try {
+            bi = Introspector.getBeanInfo(obj.getClass());
+        } catch (IntrospectionException e) {
+            e.printStackTrace();
+            return null;
+        }
+        PropertyDescriptor[] m_Properties = bi.getPropertyDescriptors();
+        ArrayList<String> memberInfoList = new ArrayList<String>();
+
+        for (int i = 0; i < m_Properties.length; i++) {
+            if (m_Properties[i].isExpert()) {
+                continue;
+            }
+
+            String name = m_Properties[i].getDisplayName();
+
+            Method getter = m_Properties[i].getReadMethod();
+            Method setter = m_Properties[i].getWriteMethod();
+            // Only display read/write properties.
+            if (getter == null || setter == null) {
+                continue;
+            }
+
+            try {
+                Object args[] = {};
+                Object value = getter.invoke(obj, args);
+
+                // Don't try to set null values:
+                if (value == null) {
+                    // If it's a user-defined property we give a warning.
+                    String getterClass = m_Properties[i].getReadMethod().getDeclaringClass().getName();
+                    if (getterClass.indexOf("java.") != 0) {
+                        System.err.println("Warning: Property \"" + name + "\" has null initial value.  Skipping.");
+                    }
+                    continue;
+                }
+
+                StringBuffer memberInfoBf = new StringBuffer(40);
+                memberInfoBf.append("Member:\t");
+                memberInfoBf.append(name);
+
+                memberInfoBf.append("\tType: ");
+
+                if (m_Properties[i].isHidden()) {
+                    memberInfoBf.append("restricted, ");
+                } else {
+                    memberInfoBf.append("common, ");
+                }
+                String typeName = value.getClass().getName();
+                if (value instanceof SelectedTag) {
+                    Tag[] tags = ((SelectedTag) value).getTags();
+                    memberInfoBf.append("String in {");
+                    for (int k = 0; k < tags.length; k++) {
+                        memberInfoBf.append(tags[k].getString());
+                        if (k + 1 < tags.length) {
+                            memberInfoBf.append(", ");
+                        }
+                    }
+                    memberInfoBf.append("}");
+                } else {
+                    memberInfoBf.append(typeName);
+                }
+
+                if (withValues) {
+                    memberInfoBf.append('\t');
+                    memberInfoBf.append("Value: \t");
+                    memberInfoBf.append(toString(value));
+                }
+
+                // now look for a TipText method for this property
+                Method tipTextMethod = hasMethod(obj, name + "TipText", null);
+                if (tipTextMethod == null) {
+                    memberInfoBf.append("\tNo further hint.");
+                } else {
+                    memberInfoBf.append("\tHint: ");
+                    memberInfoBf.append(toString(tipTextMethod.invoke(obj, args)));
+                }
+
+                memberInfoBf.append('\n');
+                memberInfoList.add(memberInfoBf.toString());
+            } catch (Exception ex) {
+                System.err.println("Skipping property " + name + " ; exception: " + ex.getMessage());
+                ex.printStackTrace();
+            } // end try
+        }	// end for
+        return memberInfoList.toArray(new String[1]);
+    }
+
+    /**
+     * Take an object of primitive type (like int, Integer etc) and convert it
+     * to double.
+     *
+     * @param val
+     * @return
+     * @throws IllegalArgumentException
+     */
+    public static double toDouble(Object val) throws IllegalArgumentException {
+        if (val instanceof Integer) {
+            return ((Integer) val).doubleValue();
+        } else if (val instanceof Double) {
+            return ((Double) val).doubleValue();
+        } else if (val instanceof Boolean) {
+            return (((Boolean) val) ? 1. : 0.);
+        } else if (val instanceof Character) {
+            return ((Character) val).charValue();
+        } else if (val instanceof Byte) {
+            return ((Byte) val).doubleValue();
+        } else if (val instanceof Short) {
+            return ((Short) val).doubleValue();
+        } else if (val instanceof Long) {
+            return ((Long) val).doubleValue();
+        } else if (val instanceof Float) {
+            return ((Float) val).doubleValue();
+        } else if (val instanceof Void) {
+            return 0;
+        }
+        throw new IllegalArgumentException("Illegal type, cant convert " + val.getClass() + " to double.");
+    }
+
+    /**
+     * Take a String and convert it to a destined data type using the
+     * appropriate function.
+     *
+     * @param str
+     * @param destType
+     * @return
+     */
+    public static Object stringToPrimitive(String str, Class<?> destType) throws NumberFormatException {
+        if ((destType == Integer.class) || (destType == int.class)) {
+            return Integer.valueOf(str);
+        } else if ((destType == Double.class) || (destType == double.class)) {
+            return Double.valueOf(str);
+        } else if ((destType == Boolean.class) || (destType == boolean.class)) {
+            return Boolean.valueOf(str);
+        } else if ((destType == Byte.class) || (destType == byte.class)) {
+            return Byte.valueOf(str);
+        } else if ((destType == Short.class) || (destType == short.class)) {
+            return Short.valueOf(str);
+        } else if ((destType == Long.class) || (destType == long.class)) {
+            return Long.valueOf(str);
+        } else if ((destType == Float.class) || (destType == float.class)) {
+            return Float.valueOf(str);
+        } else if ((destType == Character.class) || (destType == char.class)) {
+            return str.charAt(0);
+        } else {
+            // if (destType == Void.class)
+            System.err.println("warning, value interpreted as void type");
+            return 0;
+        }
+    }
+
+    /**
+     * Take a double value and convert it to a primitive object.
+     *
+     * @param d
+     * @param destType
+     * @return
+     */
+    public static Object doubleToPrimitive(Double d, Class<?> destType) {
+        if ((destType == Double.class) || (destType == double.class)) {
+            return d;
+        }
+        if ((destType == Integer.class) || (destType == int.class)) {
+            return new Integer(d.intValue());
+        } else if ((destType == Boolean.class) || (destType == boolean.class)) {
+            return (d != 0) ? Boolean.TRUE : Boolean.FALSE;
+        } else if ((destType == Byte.class) || (destType == byte.class)) {
+            return new Byte(d.byteValue());
+        } else if ((destType == Short.class) || (destType == short.class)) {
+            return new Short(d.shortValue());
+        } else if ((destType == Long.class) || (destType == long.class)) {
+            return new Long(d.longValue());
+        } else if ((destType == Float.class) || (destType == float.class)) {
+            return new Float(d.floatValue());
+        } else { // this makes hardly sense...
+            System.err.println("warning: converting from double to character or void...");
+            if ((destType == Character.class) || (destType == char.class)) {
+                return new Character(d.toString().charAt(0));
+            } else {
                 return 0;
             }
-		throw new IllegalArgumentException("Illegal type, cant convert " + val.getClass() + " to double.");
-	}
-	
-	/**
-	 * Take a String and convert it to a destined data type using the appropriate function.
-	 * 
-	 * @param str
-	 * @param destType
-	 * @return
-	 */
-	public static Object stringToPrimitive(String str, Class<?> destType) throws NumberFormatException {
-		if ((destType == Integer.class) || (destType == int.class)) {
-                return Integer.valueOf(str);
-            }
-		else if ((destType == Double.class) || (destType == double.class)) {
-                return Double.valueOf(str);
-            }
-		else if ((destType == Boolean.class) || (destType == boolean.class)) { 
-                return Boolean.valueOf(str);
-            } 
-		else if ((destType == Byte.class) || (destType == byte.class)) {
-                return Byte.valueOf(str);
-            }
-		else if ((destType == Short.class) || (destType == short.class)) {
-                return Short.valueOf(str);
-            }
-		else if ((destType == Long.class) || (destType == long.class)) {
-                return Long.valueOf(str);
-            }
-		else if ((destType == Float.class) || (destType == float.class)) {
-                return Float.valueOf(str);
-            }
-		else if ((destType == Character.class) || (destType == char.class)) {
-                return str.charAt(0);
-            }
-		else {
-			// if (destType == Void.class)
-			System.err.println("warning, value interpreted as void type");
-			return 0;
-		}
-	}
-	
-	/**
-	 * Take a double value and convert it to a primitive object.
-	 * 
-	 * @param d
-	 * @param destType
-	 * @return
-	 */
-	public static Object doubleToPrimitive(Double d, Class<?> destType) {
-		if ((destType == Double.class) || (destType == double.class)) {
-                return d;
-            }
-		if ((destType == Integer.class) || (destType == int.class)) {
-                return new Integer(d.intValue());
-            }
-		else if ((destType == Boolean.class) || (destType == boolean.class)) { 
-                return (d!=0) ? Boolean.TRUE : Boolean.FALSE;
-            } 
-		else if ((destType == Byte.class) || (destType == byte.class)) {
-                return new Byte(d.byteValue());
-            }
-		else if ((destType == Short.class) || (destType == short.class)) {
-                return new Short(d.shortValue());
-            }
-		else if ((destType == Long.class) || (destType == long.class)) {
-                return new Long(d.longValue());
-            }
-		else if ((destType == Float.class) || (destType == float.class)) {
-                return new Float(d.floatValue());
-            }
-		else { // this makes hardly sense...
-			System.err.println("warning: converting from double to character or void...");
-			if ((destType == Character.class) || (destType == char.class)) {
-                        return new Character(d.toString().charAt(0));
-                    }
-			else {
-                        return 0;
-                    }
-		}
-	}
-	
-	/**
-	 * Checks whether a type belongs to primitive (int, long, double, char etc.) 
-	 * or the Java encapsulations (Integer, Long etc.)
-	 * 
-	 * @param cls
-	 * @return
-	 */
-	public static boolean isJavaPrimitive(Class<?> cls) {
-		if (cls.isPrimitive()) {
-                return true;
-            }
-		if ((cls == Double.class) || (cls == Integer.class) || (cls == Boolean.class) || (cls == Character.class) || (cls == Void.class)
-				|| (cls == Byte.class) || (cls == Short.class) || (cls == Long.class) || (cls == Float.class)) {
-                return true;
-            }
-		return false;
-	}
-	
-	/**
-	 * Get the primitive class of a Java primitive encapsulation, or null if not applicable.
-	 * E.g., returns int for Integer, long for Long, Boolean for Boolean etc.
-	 * 
-	 * @param cls
-	 * @return
-	 */
-	public static Class getJavaPrimitive(Class<?> cls) {
-		if (cls.isPrimitive()) {
-                return cls;
-            }
-		if (cls == Double.class) {
-                return double.class;
-            }
-		else if (cls == Integer.class) {
-                return int.class;
-            }
-		else if (cls == Boolean.class) {
-                return Boolean.class;
-            }
-		else if (cls == Byte.class) {
-                return byte.class;
-            }
-		else if (cls == Short.class) {
-                return short.class;
-            }
-		else if (cls == Long.class) {
-                return long.class;
-            }
-		else if (cls == Float.class) {
-                return float.class;
-            }
-		return null;
-	}
-	/**
-	 * Try to convert an object to a destination type, especially for primitive types (int, double etc.
-	 * but also Integer, Double etc.).
-	 *  
-	 * @param destType
-	 * @param value
-	 * @return
-	 */
-	public static Object decodeType(Class<?> destType, Object value) {
+        }
+    }
+
+    /**
+     * Checks whether a type belongs to primitive (int, long, double, char etc.)
+     * or the Java encapsulations (Integer, Long etc.)
+     *
+     * @param cls
+     * @return
+     */
+    public static boolean isJavaPrimitive(Class<?> cls) {
+        if (cls.isPrimitive()) {
+            return true;
+        }
+        if ((cls == Double.class) || (cls == Integer.class) || (cls == Boolean.class) || (cls == Character.class) || (cls == Void.class)
+                || (cls == Byte.class) || (cls == Short.class) || (cls == Long.class) || (cls == Float.class)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get the primitive class of a Java primitive encapsulation, or null if not
+     * applicable. E.g., returns int for Integer, long for Long, Boolean for
+     * Boolean etc.
+     *
+     * @param cls
+     * @return
+     */
+    public static Class getJavaPrimitive(Class<?> cls) {
+        if (cls.isPrimitive()) {
+            return cls;
+        }
+        if (cls == Double.class) {
+            return double.class;
+        } else if (cls == Integer.class) {
+            return int.class;
+        } else if (cls == Boolean.class) {
+            return Boolean.class;
+        } else if (cls == Byte.class) {
+            return byte.class;
+        } else if (cls == Short.class) {
+            return short.class;
+        } else if (cls == Long.class) {
+            return long.class;
+        } else if (cls == Float.class) {
+            return float.class;
+        }
+        return null;
+    }
+
+    /**
+     * Try to convert an object to a destination type, especially for primitive
+     * types (int, double etc. but also Integer, Double etc.).
+     *
+     * @param destType
+     * @param value
+     * @return
+     */
+    public static Object decodeType(Class<?> destType, Object value) {
 //		System.err.println("desttype: " + destType.toString() + ", val: " + value.getClass().toString());
-		if (destType.isAssignableFrom(value.getClass())) {
-			// value is already of destType or assignable (subclass), so just return it
-			return value;
-		}
-		if (destType == String.class || destType == SelectedTag.class) {
-			if (value.getClass() == String.class) {
-                        return value;
-                    }
-			else {
-                        return value.toString();
-                    }
-		} else if (isJavaPrimitive(destType)) {
-			try {
-				if (value.getClass() == String.class) {
-					return stringToPrimitive((String)value, destType);
-				} else {
-					return doubleToPrimitive(toDouble(value), destType);
-				}
-			} catch(Exception e) {
-				System.err.println("Error in converting type of " + value + " to " + destType.getName() + ": " + e.getMessage());
-				return null;
-			}
-		}
-		System.err.println("Error: unknown type, skipping decode " + value.getClass().getName() + " to " +  destType.getName());
-		return value;
-	}
+        if (destType.isAssignableFrom(value.getClass())) {
+            // value is already of destType or assignable (subclass), so just return it
+            return value;
+        }
+        if (destType == String.class || destType == SelectedTag.class) {
+            if (value.getClass() == String.class) {
+                return value;
+            } else {
+                return value.toString();
+            }
+        } else if (isJavaPrimitive(destType)) {
+            try {
+                if (value.getClass() == String.class) {
+                    return stringToPrimitive((String) value, destType);
+                } else {
+                    return doubleToPrimitive(toDouble(value), destType);
+                }
+            } catch (Exception e) {
+                System.err.println("Error in converting type of " + value + " to " + destType.getName() + ": " + e.getMessage());
+                return null;
+            }
+        }
+        System.err.println("Error: unknown type, skipping decode " + value.getClass().getName() + " to " + destType.getName());
+        return value;
+    }
 
+    /**
+     * Try to get an object member value using the default getter. Returns null
+     * if not successful.
+     *
+     * @param obj
+     * @param mem
+     * @return the value if successful, else null
+     */
+    public static Object getMem(Object obj, String mem) {
+        BeanInfo bi;
+        try {
+            bi = Introspector.getBeanInfo(obj.getClass());
+        } catch (IntrospectionException e) {
+            e.printStackTrace();
+            return false;
+        }
+        PropertyDescriptor[] m_Properties = bi.getPropertyDescriptors();
+        Method getter = null;
+        for (int i = 0; i < m_Properties.length; i++) {
+            if (m_Properties[i].getDisplayName().equals(mem)) {
+                getter = m_Properties[i].getReadMethod();
+                break;
+            }
+        }
+        if (getter != null) {
+            try {
+                return getter.invoke(obj, (Object[]) null);
+            } catch (Exception e) {
+                System.err.println("Exception in invoking setter: " + e.getMessage());
+                return null;
+            }
+        } else {
+            System.err.println("Getter method for " + mem + " not found!");
+            return null;
+        }
+    }
 
-	/**
-	 * Try to get an object member value using the default getter.
-	 * Returns null if not successful.
-	 * 
-	 * @param obj
-	 * @param mem
-	 * @return the value if successful, else null
-	 */
-	public static Object getMem(Object obj, String mem) {
-		BeanInfo bi;    
-		try {
-			bi      = Introspector.getBeanInfo(obj.getClass());
-		} catch(IntrospectionException e) {
-			e.printStackTrace();
-			return false;
-		}
-		PropertyDescriptor[] 	m_Properties = bi.getPropertyDescriptors();
-		Method getter = null;
-		for (int i = 0; i < m_Properties.length; i++) {
-			if (m_Properties[i].getDisplayName().equals(mem)) {
-				getter  = m_Properties[i].getReadMethod();
-				break;
-			}
-		}
-		if (getter != null) {
-			try {
-				return getter.invoke(obj, (Object[]) null);
-			} catch (Exception e) {
-				System.err.println("Exception in invoking setter: "+e.getMessage());
-				return null;
-			} 
-		} else {
-			System.err.println("Getter method for " + mem + " not found!");
-			return null;
-		}
-	}
-	
-	/**
-	 * Try to set an object member to a given value.
-	 * Returns true if successful, else false. The types are adapted as generally as possible,
-	 * converting using the decodeType() method.
-	 * 
-	 * @param obj
-	 * @param mem
-	 * @param val
-	 * @return true if successful, else false
-	 */
-	public static boolean setMem(Object obj, String mem, Object val) {
-		BeanInfo bi;    
-		try {
-			bi      = Introspector.getBeanInfo(obj.getClass());
-		} catch(IntrospectionException e) {
-			e.printStackTrace();
-			return false;
-		}
-		PropertyDescriptor[] 	m_Properties = bi.getPropertyDescriptors();
+    /**
+     * Try to set an object member to a given value. Returns true if successful,
+     * else false. The types are adapted as generally as possible, converting
+     * using the decodeType() method.
+     *
+     * @param obj
+     * @param mem
+     * @param val
+     * @return true if successful, else false
+     */
+    public static boolean setMem(Object obj, String mem, Object val) {
+        BeanInfo bi;
+        try {
+            bi = Introspector.getBeanInfo(obj.getClass());
+        } catch (IntrospectionException e) {
+            e.printStackTrace();
+            return false;
+        }
+        PropertyDescriptor[] m_Properties = bi.getPropertyDescriptors();
 //		Method getter = null;
-		Method setter = null;
-		Class<?> type = null;
+        Method setter = null;
+        Class<?> type = null;
 //		System.err.println("looking at " + toString(obj));
-		for (int i = 0; i < m_Properties.length; i++) {
-			if (m_Properties[i].getDisplayName().equals(mem)) {
+        for (int i = 0; i < m_Properties.length; i++) {
+            if (m_Properties[i].getDisplayName().equals(mem)) {
 //				System.err.println("looking at " + m_Properties[i].getDisplayName());
 //				getter  = m_Properties[i].getReadMethod();
-				setter  = m_Properties[i].getWriteMethod();
-				type 	= m_Properties[i].getPropertyType();
-				break;
-			}
-		}
-		if (setter != null) {
-			try {
+                setter = m_Properties[i].getWriteMethod();
+                type = m_Properties[i].getPropertyType();
+                break;
+            }
+        }
+        if (setter != null) {
+            try {
 //				System.out.println("setting value...");
-				Object[] args = new Object[]{ decodeType(type, val) };
-				if (args[0] != null) {
-					setter.invoke(obj, args);
-					return true;
-				} else  {
-					System.err.println("no value to set");
-					return false;
-				}
-			} catch (Exception e) {
-				System.err.println("Exception in invoking setter: "+e.getMessage());
-//				e.printStackTrace(); 
-				return false;
-			} 
-		} else {
-			System.err.println("Setter method for " + mem + " not found!");
-			return false;
-		}
-	}
+                Object[] args = new Object[]{decodeType(type, val)};
+                if (args[0] != null) {
+                    setter.invoke(obj, args);
+                    return true;
+                } else {
+                    System.err.println("no value to set");
+                    return false;
+                }
+            } catch (Exception e) {
+                System.err.println("Exception in invoking setter: " + e.getMessage());
+                return false;
+            }
+        } else {
+            System.err.println("Setter method for " + mem + " not found!");
+            return false;
+        }
+    }
 
-	/** This method simply looks for an appropriate tiptext
-	 * @param name      The name of the property
-	 * @param methods   A list of methods to search.
-	 * @param target    The target object
-	 * @return String for the tooltip.
-	 */
+    /**
+     * This method simply looks for an appropriate tiptext
+     *
+     * @param name The name of the property
+     * @param methods A list of methods to search.
+     * @param target The target object
+     * @return String for the ToolTip.
+     */
     public static String getToolTipText(String name, MethodDescriptor[] methods, Object target, boolean stripToolTipToFirstPoint, int toHTMLLen) {
         String result = "";
         String tipName = name + "TipText";
@@ -1094,15 +1055,15 @@ public class BeanInspector {
         }
     }
 
-	/** 
-	 * This method simply looks for an appropriate tool tip text
-	 * 
-	 * @param name      The name of the property
-	 * @param methods   A list of methods to search.
-	 * @param target    The target object
-	 * @return String for the tooltip.
-	 */
-	public static String getToolTipText(String name, MethodDescriptor[] methods, Object target) {
-		return getToolTipText(name, methods, target, false, 0);
-	}
+    /**
+     * This method simply looks for an appropriate tool tip text
+     *
+     * @param name The name of the property
+     * @param methods A list of methods to search.
+     * @param target The target object
+     * @return String for the ToolTip.
+     */
+    public static String getToolTipText(String name, MethodDescriptor[] methods, Object target) {
+        return getToolTipText(name, methods, target, false, 0);
+    }
 }
diff --git a/src/eva2/gui/GOEPanel.java b/src/eva2/gui/GOEPanel.java
index e8a8f7ec..133773f9 100644
--- a/src/eva2/gui/GOEPanel.java
+++ b/src/eva2/gui/GOEPanel.java
@@ -28,8 +28,7 @@ import javax.swing.plaf.basic.BasicComboBoxRenderer;
 public class GOEPanel extends JPanel implements ItemListener {
 
     private Object backupObject;
-    private PropertyChangeSupport propChangeSupport;
-    private static boolean TRACE = false;
+    private PropertyChangeSupport propChangeSupport;    
     /**
      * The chooser component
      */
diff --git a/src/eva2/gui/GenericObjectEditor.java b/src/eva2/gui/GenericObjectEditor.java
index 25bb8474..5b4ce939 100644
--- a/src/eva2/gui/GenericObjectEditor.java
+++ b/src/eva2/gui/GenericObjectEditor.java
@@ -263,8 +263,7 @@ public class GenericObjectEditor implements PropertyEditor {
      *
      * @param type a value of type 'Class'
      */
-    public void setClassType(Class<?> type) {
-        //if (TRACE) System.out.println("GOE setClassType("+ (type == null? "<null>" : type.getName()) + ")");
+    public void setClassType(Class<?> type) {        
         classType = type;
         if (editorComponent != null) {
             editorComponent.updateClassType();
@@ -337,7 +336,6 @@ public class GenericObjectEditor implements PropertyEditor {
      */
     private void setObject(Object c) {
         // This should really call equals() for comparison.
-        //if (TRACE) System.out.println("setObject "+ c.getClass().getName() + " " + c);
         boolean trueChange = (c != getValue());
 
         m_Backup = m_Object;
diff --git a/src/eva2/gui/GraphWindow.java b/src/eva2/gui/GraphWindow.java
index 13889f90..7023206c 100644
--- a/src/eva2/gui/GraphWindow.java
+++ b/src/eva2/gui/GraphWindow.java
@@ -6,13 +6,14 @@ package eva2.gui;
  */
 
 import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * It represents one plot window in the client GUI.
  */
 public class GraphWindow {
-
-    public static boolean TRACE = false;
+    private static final Logger LOGGER = Logger.getLogger(GraphWindow.class.getName());
     static private int graphCounter = -1;
     static private PlotContainer plotContainer;
     private PlotInterface plotter;
@@ -57,9 +58,6 @@ public class GraphWindow {
      *
      */
     private GraphWindow(String plotName, String strx, String stry) {
-        if (TRACE) {
-            System.out.println("Constructor GraphWindow");
-        }
         name = plotName;
         plotter = new Plot(plotName, strx, stry, true);
     }
@@ -76,9 +74,7 @@ public class GraphWindow {
      */
     public Graph getNewGraph(String infoString) {
         graphCounter++;
-        if (TRACE) {
-            System.out.println("Graph.getNewGraph No:" + graphCounter + " - " + infoString);
-        }
+        LOGGER.log(Level.FINEST, "Graph.getNewGraph No:{0} - {1} created.", new Object[]{graphCounter, infoString});
         return new Graph(infoString, plotter, graphCounter);
     }
 }
@@ -104,7 +100,7 @@ class PlotContainer extends ArrayList<GraphWindow> {
      *
      */
     public boolean containsName(String name) {
-        GraphWindow temp = null;
+        GraphWindow temp;
         for (int i = 0; i < size(); i++) {
             temp = (GraphWindow) (get(i));
             if (name.equals(temp.getName())) {
@@ -130,7 +126,7 @@ class PlotContainer extends ArrayList<GraphWindow> {
                 return actualPlot;
             }
         }
-        GraphWindow temp = null;
+        GraphWindow temp;
         for (int i = 0; i < size(); i++) {
             temp = (GraphWindow) (get(i));
             if (name.equals(temp.getName())) {
diff --git a/src/eva2/gui/JExtMenu.java b/src/eva2/gui/JExtMenu.java
index ed5a638b..9b0a7503 100644
--- a/src/eva2/gui/JExtMenu.java
+++ b/src/eva2/gui/JExtMenu.java
@@ -9,94 +9,93 @@ package eva2.gui;
  *            $Date: 2006-01-18 11:02:22 +0100 (Wed, 18 Jan 2006) $
  *            $Author: streiche $
  */
-/*==========================================================================*
- * IMPORTS
- *==========================================================================*/
+
 import java.beans.*;
 import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.KeyStroke;
+
 /**
  *
  */
-public class JExtMenu extends JMenu{
-  public final static String ACTION = "Action";
-  /**
-   *
-   */
-  public JExtMenu(){
-    //super();
-    //Mnemonic m = new Mnemonic(s);
-    //setText(m.getText());
-    //setMnemonic(m.getMnemonic());
-  }
-  /**
-   *
-   */
-  public JExtMenu(String s){
-    super();
-    Mnemonic m = new Mnemonic(s);
-    setText(m.getText());
-    setMnemonic(m.getMnemonic());
-  }
-  /**
-   *
-   */
+public class JExtMenu extends JMenu {
+
+    public final static String ACTION = "Action";
+
+    /**
+     *
+     */
+    public JExtMenu() {
+        //super();
+        //Mnemonic m = new Mnemonic(s);
+        //setText(m.getText());
+        //setMnemonic(m.getMnemonic());
+    }
+
+    /**
+     *
+     */
+    public JExtMenu(String s) {
+        super();
+        Mnemonic m = new Mnemonic(s);
+        setText(m.getText());
+        setMnemonic(m.getMnemonic());
+    }
+
+    /**
+     *
+     */
     @Override
-  public JMenuItem add(Action a){
-    JMenuItem item = super.add(a);
-    Object o;
-    o = a.getValue(ExtAction.MNEMONIC);
-    if(o != null) {
-          item.setMnemonic(((Character)o).charValue());
-      }
-    o = a.getValue(ExtAction.TOOLTIP);
-    if(o != null) {
-          item.setToolTipText((String)o);
-      }
-    o = a.getValue(ExtAction.KEYSTROKE);
-    if(o != null) {
-          item.setAccelerator((KeyStroke)o);
-      }
-    return item;
-  }
-  /**
-   *
-   */
-    @Override
-  protected PropertyChangeListener createActionChangeListener(JMenuItem b){
-    return new ExtActionChangedListener(b){
-            @Override
-      public void propertyChange(PropertyChangeEvent e) {
-        JMenuItem menuItem = (JMenuItem)component;
-        if(menuItem == null) {
-              return;
-          }
-        String propertyName = e.getPropertyName();
-        if(propertyName.equals(Action.NAME)) {
-              menuItem.setText((String)e.getNewValue());
-          }
-        else if(propertyName.equals("enabled")) {
-              menuItem.setEnabled(((Boolean)e.getNewValue()).booleanValue());
-          }
-        else if(propertyName.equals(Action.SMALL_ICON)){
-          Icon icon = (Icon)e.getNewValue();
-          menuItem.setIcon(icon);
-          menuItem.invalidate();
-          menuItem.repaint();
+    public JMenuItem add(Action a) {
+        JMenuItem item = super.add(a);
+        Object o;
+        o = a.getValue(ExtAction.MNEMONIC);
+        if (o != null) {
+            item.setMnemonic(((Character) o).charValue());
         }
-        else if(propertyName.equals(ExtAction.MNEMONIC)) {
-              menuItem.setMnemonic(((Character)e.getNewValue()).charValue());
-          }
-        else if(propertyName.equals(ExtAction.TOOLTIP)) {
-              menuItem.setToolTipText((String)e.getNewValue());
-          }
-        else if(propertyName.equals(ExtAction.KEYSTROKE)) {
-              menuItem.setAccelerator((KeyStroke)e.getNewValue());
-          }
-      }
-    };
-  }
+        o = a.getValue(ExtAction.TOOLTIP);
+        if (o != null) {
+            item.setToolTipText((String) o);
+        }
+        o = a.getValue(ExtAction.KEYSTROKE);
+        if (o != null) {
+            item.setAccelerator((KeyStroke) o);
+        }
+        return item;
+    }
+
+    /**
+     *
+     */
+    @Override
+    protected PropertyChangeListener createActionChangeListener(JMenuItem b) {
+        return new ExtActionChangedListener(b) {
+            @Override
+            public void propertyChange(PropertyChangeEvent e) {
+                JMenuItem menuItem = (JMenuItem) component;
+                if (menuItem == null) {
+                    return;
+                }
+                String propertyName = e.getPropertyName();
+                if (propertyName.equals(Action.NAME)) {
+                    menuItem.setText((String) e.getNewValue());
+                } else if (propertyName.equals("enabled")) {
+                    menuItem.setEnabled(((Boolean) e.getNewValue()).booleanValue());
+                } else if (propertyName.equals(Action.SMALL_ICON)) {
+                    Icon icon = (Icon) e.getNewValue();
+                    menuItem.setIcon(icon);
+                    menuItem.invalidate();
+                    menuItem.repaint();
+                } else if (propertyName.equals(ExtAction.MNEMONIC)) {
+                    menuItem.setMnemonic(((Character) e.getNewValue()).charValue());
+                } else if (propertyName.equals(ExtAction.TOOLTIP)) {
+                    menuItem.setToolTipText((String) e.getNewValue());
+                } else if (propertyName.equals(ExtAction.KEYSTROKE)) {
+                    menuItem.setAccelerator((KeyStroke) e.getNewValue());
+                }
+            }
+        };
+    }
 }
diff --git a/src/eva2/server/ModuleServer.java b/src/eva2/server/ModuleServer.java
index 73b24799..e53be0f7 100644
--- a/src/eva2/server/ModuleServer.java
+++ b/src/eva2/server/ModuleServer.java
@@ -92,20 +92,7 @@ public class ModuleServer {
             }
 
         }
-        // and the running modules
-        // @todo running modules sind abgeschaltet
-
-//		for (int i = 0; i < m_RunnungModules.size(); i++) {
-//			String AdapterName = null;
-//			try {
-//				AdapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName();
-//			}
-//			catch (Exception ee) {
-//				System.err.println("Error: GetAdapterName" + ee.getMessage());
-//			}
-//			ModuleNameList.add(AdapterName);
-//		}
-
+        
         String[] x = new String[moduleNameList.size()];
         moduleNameList.toArray(x);
         return x;
@@ -176,21 +163,6 @@ public class ModuleServer {
                 return (ModuleAdapter) moduleAdapter;
             }
         }
-//		//  @todo running modules sind gerade noch abgeschaltet
-//		for (int i = 0; i < m_RunnungModules.size(); i++) {
-//			try {
-//				adapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName();
-//			}
-//			catch (Exception e) {
-//				System.out.println("Error : GetAdapterName" + e);
-//			}
-//			if (adapterName.equals(selectedModuleName)) {
-//				if (TRACE)
-//					System.out.println(" Choose a running Module!!! " + adapterName);
-//				m_ModuleAdapter = ( (ModuleAdapter) m_RunnungModules.get(i));
-//				return (ModuleAdapter) m_ModuleAdapter;
-//			}
-//		}
 
         LOGGER.log(Level.SEVERE, "No valid module defined: {0}", selectedModuleName);
         return null;
diff --git a/src/eva2/tools/Serializer.java b/src/eva2/tools/Serializer.java
index 34314f37..065ba3dd 100644
--- a/src/eva2/tools/Serializer.java
+++ b/src/eva2/tools/Serializer.java
@@ -6,164 +6,175 @@ import java.util.logging.Logger;
 
 /**
  * This class defines utility routines that use Java serialization. Any
- * serializable object can be stored to a file, loaded, and cloned (returning
- * a deep copy).
- * 
+ * serializable object can be stored to a file, loaded, and cloned (returning a
+ * deep copy).
+ *
  * @author Holger Ulmer, Felix Streichert, Hannes Planatscher, Marcel Kronfeld
- **/
+ *
+ */
 public class Serializer {
+
     /**
      * The logging instance for this class.
      */
     private static final Logger LOGGER = Logger.getLogger(Serializer.class.getName());
-    
+
     /**
      * Private constructor to prevent instantiating module class.
      */
-    private Serializer() { }
-    
-	/**
-	 * Serialize the object o (and any Serializable objects it refers to) and
-	 * store its serialized state in File f. If serializeInMem is true, the object
-	 * is wrapped in a SerializedObject first, which seems to be more efficient than
-	 * writing a nested object directly to a file.
-	 * 
-	 * @param o the object to write
-	 * @param outStream The stream to write to
-	 * @param serializeInMem flag whether to wrap the object in a SerializedObject
-	 * @throws IOException
-	 **/
-	private static void store(Serializable o, OutputStream outStream, boolean serializeInMem) throws IOException {		
-		ObjectOutputStream out = new ObjectOutputStream(outStream);
-		try {
-			Object objToStore = o;
-			if (serializeInMem) {
+    private Serializer() {
+    }
+
+    /**
+     * Serialize the object o (and any Serializable objects it refers to) and
+     * store its serialized state in File f. If serializeInMem is true, the
+     * object is wrapped in a SerializedObject first, which seems to be more
+     * efficient than writing a nested object directly to a file.
+     *
+     * @param o the object to write
+     * @param outStream The stream to write to
+     * @param serializeInMem flag whether to wrap the object in a
+     * SerializedObject
+     * @throws IOException
+	 *
+     */
+    private static void store(Serializable o, OutputStream outStream, boolean serializeInMem) throws IOException {
+        ObjectOutputStream out = new ObjectOutputStream(outStream);
+        try {
+            Object objToStore = o;
+            if (serializeInMem) {
                 objToStore = new SerializedObject((Object) o);
             }
-			out.writeObject(objToStore);
-		} catch (java.io.NotSerializableException ex) {
+            out.writeObject(objToStore);
+        } catch (java.io.NotSerializableException ex) {
             LOGGER.log(Level.SEVERE, "Object is not serializable!", ex);
-		}
-		out.flush();
-		out.close();
-	}
+        }
+        out.flush();
+        out.close();
+    }
 
-	/**
-	 * Deserialize the contents of File f and return the resulting object.
-	 * A SerializedObject is unwrapped once.
+    /**
+     * Deserialize the contents of File f and return the resulting object. A
+     * SerializedObject is unwrapped once.
      *
-     * @param inputStream  The Input stream to read from
+     * @param inputStream The Input stream to read from
      * @throws ClassNotFoundException
      * @throws IOException
      * @return The deserialized Object from the file
-	 **/
-	private static Object load(final InputStream inputStream) throws IOException, ClassNotFoundException {		
-		ObjectInputStream objInputStream = new ObjectInputStream(inputStream);
-		Object ret = objInputStream.readObject();
-		if (ret instanceof SerializedObject) {
-			ret = ((SerializedObject) ret).getObject();
-		}
-		objInputStream.close();		
-		return ret;
-	}
-
-	/**
-	 * Use object serialization to make a "deep clone" of the object o.
-	 * This method serializes o and all of its member objects, and then
-	 * deserializes that graph of objects, which means that everything is
-	 * copied.  This differs from the clone() method of an object which is
-	 * usually implemented to produce a "shallow" clone that copies references
-	 * to other objects, instead of copying all referenced objects.
-	 **/
-	public static Object deepClone(Object o) {
-		Object obj = null;
-		try {
-			// Write the object out to a byte array
-			ByteArrayOutputStream bos = new ByteArrayOutputStream();
-			ObjectOutputStream out = new ObjectOutputStream(bos);
-			out.writeObject(o);
-			out.flush();
-			out.close();
-
-			// Make an input stream from the byte array and read
-			// a copy of the object back in.
-			ObjectInputStream inputStream = new ObjectInputStream(
-					new ByteArrayInputStream(bos.toByteArray()));
-			obj = inputStream.readObject();
-		} catch (IOException ex) {
-			LOGGER.log(Level.WARNING, "Error while cloning object.", ex);
-		} catch (ClassNotFoundException ex) {
-            LOGGER.log(Level.WARNING, "Object class was not found.", ex);
-		}
-		return obj;
-	}
-
-	/**
-	 * Serialize the string data and write it to the OutputStream.
 	 *
-     * @param outStream The output stream
-     * @param data      The string data
-	 **/
-	public static void storeString(final OutputStream outStream, final String data) {
-		try {
-			outStream.write(data.getBytes());
-		} catch (Exception ex) {
-            LOGGER.log(Level.SEVERE, "Could not write string to stream", ex);
-		}
-	}
+     */
+    private static Object load(final InputStream inputStream) throws IOException, ClassNotFoundException {
+        ObjectInputStream objInputStream = new ObjectInputStream(inputStream);
+        Object ret = objInputStream.readObject();
+        if (ret instanceof SerializedObject) {
+            ret = ((SerializedObject) ret).getObject();
+        }
+        objInputStream.close();
+        return ret;
+    }
 
-	/**
-	 * Deserialize the contents of the InputStream containing
-	 * a string and return the resulting string.
+    /**
+     * Use object serialization to make a "deep clone" of the object o. This
+     * method serializes o and all of its member objects, and then deserializes
+     * that graph of objects, which means that everything is copied. This
+     * differs from the clone() method of an object which is usually implemented
+     * to produce a "shallow" clone that copies references to other objects,
+     * instead of copying all referenced objects.
+	 *
+     */
+    public static Object deepClone(Object o) {
+        Object obj = null;
+        try {
+            // Write the object out to a byte array
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            ObjectOutputStream out = new ObjectOutputStream(bos);
+            out.writeObject(o);
+            out.flush();
+            out.close();
+
+            // Make an input stream from the byte array and read
+            // a copy of the object back in.
+            ObjectInputStream inputStream = new ObjectInputStream(
+                    new ByteArrayInputStream(bos.toByteArray()));
+            obj = inputStream.readObject();
+        } catch (IOException ex) {
+            LOGGER.log(Level.WARNING, "Error while cloning object.", ex);
+        } catch (ClassNotFoundException ex) {
+            LOGGER.log(Level.WARNING, "Object class was not found.", ex);
+        }
+        return obj;
+    }
+
+    /**
+     * Serialize the string data and write it to the OutputStream.
+     *
+     * @param outStream The output stream
+     * @param data The string data
+	 *
+     */
+    public static void storeString(final OutputStream outStream, final String data) {
+        try {
+            outStream.write(data.getBytes());
+        } catch (Exception ex) {
+            LOGGER.log(Level.SEVERE, "Could not write string to stream", ex);
+        }
+    }
+
+    /**
+     * Deserialize the contents of the InputStream containing a string and
+     * return the resulting string.
      *
      * @param inputStream The input stream to read from
      * @return The deserialized data from the stream
-	 **/
-	public static String loadString(final InputStream inputStream) {
-		StringBuilder sBuilder = new StringBuilder();
-		try {
+	 *
+     */
+    public static String loadString(final InputStream inputStream) {
+        StringBuilder sBuilder = new StringBuilder();
+        try {
             int data = inputStream.read();
             while (data != -1) {
                 sBuilder.append((char) data);
                 data = inputStream.read();
             }
-		} catch (Exception ex) {
-			LOGGER.log(Level.SEVERE, "Could not load string from stream!", ex);
-		}
-		return sBuilder.toString();
-	}
+        } catch (Exception ex) {
+            LOGGER.log(Level.SEVERE, "Could not load string from stream!", ex);
+        }
+        return sBuilder.toString();
+    }
 
-	/**
-	 * Serialize the string s and
-	 * store its serialized state in File with name Filename.
-	 **/
-	public static void storeObject(OutputStream outStream, Serializable s) {		
-		try {
-			store(s, outStream, true);
-		} catch (Exception ex) {
-            LOGGER.log(Level.SEVERE, "Could not write object to stream.", ex);			
-		}
-	}
+    /**
+     * Serialize the string s and store its serialized state in File with name
+     * Filename.
+     */
+    public static void storeObject(OutputStream outStream, Serializable s) {
+        try {
+            store(s, outStream, true);
+        } catch (Exception ex) {
+            LOGGER.log(Level.SEVERE, "Could not write object to stream.", ex);
+        }
+    }
 
-	/**
-	 * Deserialize the contents of File with given name containing
-	 * a string and return the resulting string. If the indicated file
-	 * doesnt exist or an error occurs, null is returned.
-	 **/
-	public static Object loadObject (InputStream inputStream) {
-		return loadObject(inputStream, true);
-	}
+    /**
+     * Deserialize the contents of File with given name containing a string and
+     * return the resulting string. If the indicated file doesn't exist or an
+     * error occurs, null is returned.
+	 *
+     */
+    public static Object loadObject(InputStream inputStream) {
+        return loadObject(inputStream, true);
+    }
+
+    /**
+     * Deserialize the contents of File with given name containing a string and
+     * return the resulting string. If the indicated file doesn't exist or an
+     * error occurs, null is returned. If casually is false, an error message is
+     * printed and an exception is raised if the file was not found or an error
+     * occured on loading.
+	 *
+     */
+    public static Object loadObject(InputStream inputStream, boolean casually) {
+        Object serializedObject = null;
 
-	/**
-	 * Deserialize the contents of File with given name containing
-	 * a string and return the resulting string. If the indicated file
-	 * doesnt exist or an error occurs, null is returned.
-	 * If casually is false, an error message is printed and an exception
-	 * is raised if the file was not found or an error occured on loading.
-	 **/
-	public static Object loadObject (InputStream inputStream, boolean casually) {
-		Object serializedObject = null;
-        
         try {
             serializedObject = (Object) load(inputStream);
         } catch (InvalidClassException ex) {
@@ -178,6 +189,6 @@ public class Serializer {
             }
         }
         return serializedObject;
-		
-	}
+
+    }
 }