Author: scabanovich
Date: 2011-01-28 09:17:52 -0500 (Fri, 28 Jan 2011)
New Revision: 28697
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
Log:
JBIDE-8244
https://issues.jboss.org/browse/JBIDE-8244
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2011-01-28
14:16:08 UTC (rev 28696)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2011-01-28
14:17:52 UTC (rev 28697)
@@ -65,6 +65,8 @@
public class NewDecoratorWizardPage extends NewClassWizardPage {
protected InterceptorBindingSelectionProvider interceptorBindingsProvider = new
InterceptorBindingSelectionProvider();
IFieldEditor fieldName = null;
+ String defaultTypeName = null;
+ String defaultFieldName = null;
protected StatusInfo fieldNameStatus = new StatusInfo();
@@ -76,6 +78,8 @@
public void init(IStructuredSelection selection) {
super.init(selection);
+ defaultTypeName = null;
+ defaultFieldName = null;
if (!selection.isEmpty()) {
Object o = selection.iterator().next();
IType type = null;
@@ -125,13 +129,25 @@
String elementName = interfaceName.substring(d + 1, b);
String typeName = elementName + "Decorator";
typeName += interfaceName.substring(b);
- setTypeName(typeName, true);
- typeNameChanged();
- String defaultFieldName = elementName;
- if(defaultFieldName.length() > 0) {
- defaultFieldName = defaultFieldName.substring(0, 1).toLowerCase() +
defaultFieldName.substring(1);
+
+ String currentTypeName = getTypeName();
+ boolean isDefault = currentTypeName == null || currentTypeName.length() == 0 ||
currentTypeName.equals(defaultTypeName);
+ if(isDefault) {
+ setTypeName(typeName, true);
+ typeNameChanged();
+ }
+ defaultTypeName = typeName;
+
+ String _defaultFieldName = elementName;
+ if(_defaultFieldName.length() > 0) {
+ _defaultFieldName = _defaultFieldName.substring(0, 1).toLowerCase() +
_defaultFieldName.substring(1);
if(fieldName != null) {
- fieldName.setValue(defaultFieldName);
+ String currentFieldName = fieldName.getValueAsString();
+ isDefault = currentFieldName == null || currentFieldName.length() == 0 ||
currentFieldName.equals(defaultFieldName);
+ if(isDefault) {
+ fieldName.setValue(_defaultFieldName);
+ }
+ defaultFieldName = _defaultFieldName;
}
}