From 7c5737f602f9ae1545dc5913f91cfe590d92c1bd Mon Sep 17 00:00:00 2001
From: Marcel Kronfeld <makron@gmx.net>
Date: Tue, 15 Jun 2010 16:30:16 +0000
Subject: [PATCH] Merging mk branch rev 574, minor bug

---
 src/eva2/gui/GenericArrayEditor.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/eva2/gui/GenericArrayEditor.java b/src/eva2/gui/GenericArrayEditor.java
index 318a5210..a9404dd4 100644
--- a/src/eva2/gui/GenericArrayEditor.java
+++ b/src/eva2/gui/GenericArrayEditor.java
@@ -329,7 +329,9 @@ implements PropertyEditor {
 						if (m_ElementEditor instanceof GenericObjectEditor) {
 							((GenericObjectEditor)m_ElementEditor).setDefaultValue();
 						} else {
-							m_ElementEditor.setValue(m_ElementClass.newInstance());
+							if (m_ElementEditor.getValue()!=null) {
+								m_ElementEditor.setValue(m_ElementClass.newInstance());
+							}
 						}
 					}
 
@@ -354,6 +356,7 @@ implements PropertyEditor {
 					});
 				} catch (Exception ex) {
 					System.err.println(ex.getMessage());
+					ex.printStackTrace();
 					m_ElementEditor = null;
 				}
 			}