Bug 424148 - add name attribute for all elements in editing popup dialog
diff --git a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/AbstractDetailComposite.java b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/AbstractDetailComposite.java
index c741c38..d33db7c 100644
--- a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/AbstractDetailComposite.java
+++ b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/AbstractDetailComposite.java
@@ -18,6 +18,7 @@
import java.util.List;
import org.eclipse.bpmn2.modeler.core.merrimac.IConstants;
+import org.eclipse.bpmn2.modeler.core.merrimac.dialogs.AbstractObjectEditingDialog;
import org.eclipse.bpmn2.modeler.core.merrimac.dialogs.BooleanObjectEditor;
import org.eclipse.bpmn2.modeler.core.merrimac.dialogs.ComboObjectEditor;
import org.eclipse.bpmn2.modeler.core.merrimac.dialogs.FeatureListObjectEditor;
@@ -80,7 +81,6 @@
protected Font descriptionFont = null;
protected AbstractPropertiesProvider propertiesProvider = null;
protected StyledText descriptionText = null;
-
/**
* Constructor for embedding this composite in an AbstractBpmn2PropertySection.
* This is the "normal" method of creating this composite.
@@ -327,6 +327,7 @@
descriptionText.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
descriptionText.setForeground(display.getSystemColor(SWT.COLOR_INFO_FOREGROUND));
+ descriptionText.setData(AbstractObjectEditingDialog.DO_NOT_ADAPT , Boolean.TRUE);
GridData d = new GridData(SWT.FILL, SWT.FILL, false, false, 3, 1);
d.horizontalIndent = 4;
diff --git a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/AbstractObjectEditingDialog.java b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/AbstractObjectEditingDialog.java
index 097aa43..92fff72 100644
--- a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/AbstractObjectEditingDialog.java
+++ b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/AbstractObjectEditingDialog.java
@@ -15,7 +15,6 @@
import org.eclipse.bpmn2.modeler.core.Activator;
import org.eclipse.bpmn2.modeler.core.merrimac.clad.IPropertiesCompositeFactory;
-import org.eclipse.bpmn2.modeler.core.merrimac.clad.PropertiesCompositeFactory;
import org.eclipse.bpmn2.modeler.core.validation.LiveValidationListener;
import org.eclipse.bpmn2.modeler.core.validation.ValidationErrorHandler;
import org.eclipse.core.runtime.IStatus;
@@ -29,7 +28,6 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.StringConverter;
-import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.ControlListener;
@@ -60,6 +58,10 @@
protected Composite dialogContent;
private Text errorMessageText;
private IPropertiesCompositeFactory compositeFactory = null;
+ // If this property is set on a Control, then don't try to
+ // adapt the Control's colors/fonts/etc. to dialog defaults
+ // This is used by the Description Styled Text widget.
+ public final static String DO_NOT_ADAPT = "do_not_adapt";
public AbstractObjectEditingDialog(DiagramEditor editor, EObject object) {
super(editor.getEditorSite().getShell());
@@ -214,6 +216,10 @@
// We can now safely set the background color of all controls to match the dialog.
content.setBackground(form.getBackground());
for (Control k : content.getChildren()) {
+ Object data = k.getData(AbstractObjectEditingDialog.DO_NOT_ADAPT);
+ if (data instanceof Boolean && (Boolean)data == true)
+ continue;
+
k.setBackground(form.getBackground());
if (k instanceof Composite) {
adapt((Composite)k);
diff --git a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmDescriptionPropertySection.java b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmDescriptionPropertySection.java
index 9e661ec..529030a 100644
--- a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmDescriptionPropertySection.java
+++ b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/JbpmDescriptionPropertySection.java
@@ -58,7 +58,7 @@
// TODO Auto-generated constructor stub
}
- public class JbpmDescriptionPropertyComposite extends DescriptionPropertyComposite {
+ public class JbpmDescriptionPropertyComposite extends DescriptionDetailComposite {
public JbpmDescriptionPropertyComposite(
AbstractBpmn2PropertySection section) {
diff --git a/org.eclipse.bpmn2.modeler.ui/plugin.xml b/org.eclipse.bpmn2.modeler.ui/plugin.xml
index 3dcfc7a..fd251bb 100644
--- a/org.eclipse.bpmn2.modeler.ui/plugin.xml
+++ b/org.eclipse.bpmn2.modeler.ui/plugin.xml
@@ -155,7 +155,7 @@
<propertyTab
id="org.eclipse.bpmn2.modeler.description.tab"
class="org.eclipse.bpmn2.modeler.ui.property.DescriptionPropertySection"
- popup="false"
+ popup="true"
label="%propertyTab.label">
</propertyTab>
diff --git a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/DescriptionPropertySection.java b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/DescriptionPropertySection.java
index fca8b71..aec1695 100644
--- a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/DescriptionPropertySection.java
+++ b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/DescriptionPropertySection.java
@@ -35,24 +35,24 @@
*/
@Override
protected AbstractDetailComposite createSectionRoot() {
- return new DescriptionPropertyComposite(this);
+ return new DescriptionDetailComposite(this);
}
@Override
public AbstractDetailComposite createSectionRoot(Composite parent, int style) {
- return new DescriptionPropertyComposite(parent, style);
+ return new DescriptionDetailComposite(parent, style);
}
- public class DescriptionPropertyComposite extends DefaultDetailComposite {
+ public class DescriptionDetailComposite extends DefaultDetailComposite {
/**
* @param section
*/
- public DescriptionPropertyComposite(AbstractBpmn2PropertySection section) {
+ public DescriptionDetailComposite(AbstractBpmn2PropertySection section) {
super(section);
}
- public DescriptionPropertyComposite(Composite parent, int style) {
+ public DescriptionDetailComposite(Composite parent, int style) {
super(parent,style);
}
@@ -87,7 +87,7 @@
protected void bindDescription(EObject be) {
// don't display the description text if disabled in preferences,
// or if this is a popup configuration dialog.
- if (Bpmn2Preferences.getInstance(be).getShowDescriptions() && !isPopupDialog) {
+ if (Bpmn2Preferences.getInstance(be).getShowDescriptions()) {
String description = getDescription(be);
if (description != null) {
diff --git a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/data/DataObjectPropertySection.java b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/data/DataObjectPropertySection.java
index 11ad85c..33d4dc2 100644
--- a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/data/DataObjectPropertySection.java
+++ b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/data/DataObjectPropertySection.java
@@ -98,7 +98,7 @@
else if (object instanceof DataObject) {
if (propertiesProvider == null) {
propertiesProvider = new AbstractPropertiesProvider(object) {
- String[] properties = new String[] { "id", "name", "isCollection", "itemSubjectRef", "dataState" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ String[] properties = new String[] { "id", "isCollection", "itemSubjectRef", "dataState" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
@Override
public String[] getProperties() {
@@ -111,7 +111,7 @@
else if (object instanceof DataObjectReference) {
if (dataObjectReferencePropertiesProvider == null) {
dataObjectReferencePropertiesProvider = new AbstractPropertiesProvider(object) {
- String[] properties = new String[] { "id", "name", "dataObjectRef" , "dataState" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ String[] properties = new String[] { "id", "dataObjectRef" , "dataState" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@Override
public String[] getProperties() {
