Author: DartPeng
Date: 2009-05-26 04:20:10 -0400 (Tue, 26 May 2009)
New Revision: 15509
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java
Log:
JBIDE-4232
Change the ValueType details panel
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java 2009-05-26
07:44:30 UTC (rev 15508)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java 2009-05-26
08:20:10 UTC (rev 15509)
@@ -429,7 +429,10 @@
List<AttributeFieldEditPart> list = new
ArrayList<AttributeFieldEditPart>();
list.add(editPart1);
list.add(editPart2);
-
+ AttributeFieldEditPart dummyEditPart = new AttributeFieldEditPart();
+ dummyEditPart.setAttribute(null);
+ dummyEditPart.setContentControl(container);
+ list.add(dummyEditPart);
return list;
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-05-26
07:44:30 UTC (rev 15508)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-05-26
08:20:10 UTC (rev 15509)
@@ -125,7 +125,7 @@
for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
AttributeFieldEditPart attributeFieldEditPart = (AttributeFieldEditPart)
iterator.next();
Object attribute = attributeFieldEditPart.getAttribute();
- if (attribute != null) {
+ if (attribute != null && attributeFieldEditPart != null) {
currentPropertyUIMap.put(attribute, attributeFieldEditPart);
}
}
@@ -137,7 +137,7 @@
EAttribute attribute = (EAttribute) pd.getFeature(getModel());
if (attribute.isRequired()) {
AttributeFieldEditPart editPart = createAttributeUI(detailsComposite, pd, creator);
- if (editPart != null) {
+ if (editPart != null && attribute != null) {
currentPropertyUIMap.put(attribute, editPart);
}
}
@@ -147,7 +147,7 @@
EAttribute attribute = (EAttribute) pd.getFeature(getModel());
if (!attribute.isRequired()) {
AttributeFieldEditPart editPart = createAttributeUI(detailsComposite, pd, creator);
- if (editPart != null) {
+ if (editPart != null && attribute != null) {
currentPropertyUIMap.put(attribute, editPart);
}
}
@@ -159,7 +159,7 @@
for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
AttributeFieldEditPart attributeFieldEditPart = (AttributeFieldEditPart)
iterator.next();
Object attribute = attributeFieldEditPart.getAttribute();
- if (attribute != null) {
+ if (attribute != null && attributeFieldEditPart != null) {
currentPropertyUIMap.put(attribute, attributeFieldEditPart);
}
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-05-26
07:44:30 UTC (rev 15508)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-05-26
08:20:10 UTC (rev 15509)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.smooks.configuration.editors.javabean;
+import java.util.Iterator;
import java.util.List;
import org.eclipse.emf.ecore.EAttribute;
@@ -79,10 +80,18 @@
List<AttributeFieldEditPart> list =
createElementSelectionSection("Data", editingdomain, toolkit, parent,
model, formEditor, JavabeanPackage.eINSTANCE.getValueType_Data(),
JavabeanPackage.eINSTANCE
.getValueType_DataNS());
- list.add(SmooksUIUtils.createStringFieldEditor(parent, toolkit,
getPropertyDescriptor(editingdomain,
+ Composite groupParent = parent;
+ for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
+ AttributeFieldEditPart attributeFieldEditPart = (AttributeFieldEditPart)
iterator.next();
+ if(attributeFieldEditPart.getAttribute() == null){
+ groupParent = (Composite) attributeFieldEditPart.getContentControl();
+ break;
+ }
+ }
+ list.add(SmooksUIUtils.createStringFieldEditor(groupParent, toolkit,
getPropertyDescriptor(editingdomain,
JavabeanPackage.Literals.VALUE_TYPE__DEFAULT, model), model, false, false, null));
- list.add(SmooksUIUtils.createStringFieldEditor(parent, toolkit,
getPropertyDescriptor(editingdomain,
+ list.add(SmooksUIUtils.createStringFieldEditor(groupParent, toolkit,
getPropertyDescriptor(editingdomain,
JavabeanPackage.Literals.VALUE_TYPE__DECODER, model), model, false, false, null));
return list;
}