diff --git a/src/eva2/gui/BigStringEditor.java b/src/eva2/gui/BigStringEditor.java
index 0dbc77b2..2afe7c29 100644
--- a/src/eva2/gui/BigStringEditor.java
+++ b/src/eva2/gui/BigStringEditor.java
@@ -40,16 +40,46 @@ public class BigStringEditor implements PropertyEditor {
       m_finished=false;
       BigStringEditor editor = new BigStringEditor();
 
-      PropertyDialog frame = new PropertyDialog(editor,file, 50, 50);
+      PropertyDialog dialog = new PropertyDialog(editor,file, 50, 50);
       //frame.setSize(200, 200);
-      frame.addInternalFrameListener(new InternalFrameAdapter() {
+      dialog.addWindowListener(new WindowListener() {
 
-            @Override
-            public void internalFrameClosing(InternalFrameEvent e) {
-                super.internalFrameClosing(e);
-                m_finished = true;
+                @Override
+                public void windowOpened(WindowEvent e) {
+                    
+                }
+
+                @Override
+                public void windowClosing(WindowEvent e) {
+                    
+                }
+
+                @Override
+                public void windowClosed(WindowEvent e) {                    
+                    m_finished = true;
+                }
+
+                @Override
+                public void windowIconified(WindowEvent e) {
+                    
+                }
+
+                @Override
+                public void windowDeiconified(WindowEvent e) {
+                    
+                }
+
+                @Override
+                public void windowActivated(WindowEvent e) {
+                    
+                }
+
+                @Override
+                public void windowDeactivated(WindowEvent e) {
+                    
+                }
             }
-        });
+        );
       while (m_finished==false) {
         try {Thread.sleep(1000);}
         catch (Exception e) {
@@ -182,30 +212,6 @@ public class BigStringEditor implements PropertyEditor {
 	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
 	  m_Support.removePropertyChangeListener(l);
   }
-
-  /**
-   *
-   */
-  public static void main (String[] args) {
-    try {
-      BigStringEditor editor = new BigStringEditor();
-
-      PropertyDialog frame = new PropertyDialog(editor, "test", 50, 50);
-      frame.setSize(200, 200);
-      frame.addInternalFrameListener(new InternalFrameAdapter() {
-
-            @Override
-            public void internalFrameClosing(InternalFrameEvent e) {
-                super.internalFrameClosing(e);
-                System.exit(0);
-            }
-        });
-//       editor.setValue(so);
-    } catch (Exception e) {
-        e.printStackTrace();
-        System.out.println(e.getMessage());
-    }
-  }
 }
 
 
diff --git a/src/eva2/gui/GenericSelectableArrayEditor.java b/src/eva2/gui/GenericSelectableArrayEditor.java
deleted file mode 100644
index a805917d..00000000
--- a/src/eva2/gui/GenericSelectableArrayEditor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package eva2.gui;
-/*
- * Title:        EvA2
- * Description:
- * Copyright:    Copyright (c) 2003
- * Company:      University of Tuebingen, Computer Architecture
- * @author Holger Ulmer, Felix Streichert, Hannes Planatscher
- * @version:  $Revision: 235 $
- *            $Date: 2007-11-08 13:53:51 +0100 (Thu, 08 Nov 2007) $
- *            $Author: mkron $
- * 
- */
-import eva2.tools.EVAHELP;
-import eva2.tools.SelectedTag;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.JCheckBox;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-
-public class GenericSelectableArrayEditor extends GenericArrayEditor {
-    protected JCheckBox[]             m_BlackCheck;
-
-	public static void main(String [] args) {
-		try {
-			java.beans.PropertyEditorManager.registerEditor(SelectedTag.class,TagEditor.class);
-			java.beans.PropertyEditorManager.registerEditor(int [].class,GenericArrayEditor.class);
-			java.beans.PropertyEditorManager.registerEditor(double [].class,GenericArrayEditor.class);
-			GenericArrayEditor editor = new GenericArrayEditor();
-			
-
-			int[] initial = {3, 45, 7};
-			editor.setValue(initial);
-			PropertyDialog pd = new PropertyDialog(editor,EVAHELP.cutClassName(editor.getClass().getName())
-					, 100, 100);
-			pd.setSize(200,200);
-			pd.addInternalFrameListener(new InternalFrameAdapter() {
-
-                @Override
-                public void internalFrameClosing(InternalFrameEvent e) {
-                    super.internalFrameClosing(e);
-                    System.exit(0);
-                }
-			});
-			editor.setValue(initial);
-			//ce.validate();
-		} catch (Exception ex) {
-			ex.printStackTrace();
-			System.err.println(ex.getMessage());
-		}
-	}
-}
-