Merging mk branch rev 574, minor bug

This commit is contained in:
Marcel Kronfeld committed 2010-06-15 16:30:16 +00:00
1 parent 152c5fdd2b
commit 7c5737f602
1 file changed
+4 -1
+4 -1
View File
@@ -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;
}
}