Skip to content

Commit

Permalink
TEIIDDES-2240, TEIIDDES-2379
Browse files Browse the repository at this point in the history 
 * filtering certain Table Cell Editors to disallow editing certain
properties from table editor.
 * replaced with simple warning dialog which tells users to use the
Properties View instead.
  • Loading branch information
@blafond
blafond committed Mar 9, 2015
1 parent 8bcb3ac commit b26bd52
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 31 deletions.
3 changes: 3 additions & 0 deletions plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/i18n.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ UserDefinedPropertyDescriptor.category=User Defined
PropertyEditorFactory.wrongContributorClass=Error loading class <{0}> -- must implement IPropertyEditorFactory.
PropertyEditorFactory.contributorProblem=Error constructing IPropertyEditorFactory contributor <{0}>
PropertyEditorFactory.errorInFactory=Error executing the IPropertyEditorFactory contributor <{0}>
PropertyEditorFactory.unsupportedEditingTitle=Property Edit Not Supported
PropertyEditorFactory.unsupportedEditingMessage=The table editor does not support editing the [{0}] property for the selected [{1}] object\
/n/nPlease select the object and edit it in the Properties View

#################Extensions Viewer#########################################
ExtensionPropertyDescriptor.category=Extensions
Expand Down
112 changes: 81 additions & 31 deletions ...ins/org.teiid.designer.ui/src/org/teiid/designer/ui/properties/PropertyEditorFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.ui.EMFEditUIPlugin;
import org.eclipse.emf.edit.ui.provider.PropertyDescriptor.EDataTypeCellEditor;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.window.Window;
Expand Down Expand Up @@ -134,6 +135,8 @@ public static CellEditor createPropertyEditor( final Composite composite,
if (!itemPropertyDescriptor.canSetProperty(object)) {
return null;
}

boolean isTableEditor = composite instanceof Table;

CellEditor result = null;

Expand Down Expand Up @@ -192,11 +195,15 @@ public static CellEditor createPropertyEditor( final Composite composite,

if (containsLiterals) {
// this is standard; use the accumulator
result = createAccumulatorEnumEditor(composite,
propertyDescriptor,
feature,
itemPropertyDescriptor,
object);
if( isTableEditor ) {
result = createUnsupportedCellEditor(composite, propertyDescriptor, feature, object);
} else {
result = createAccumulatorEnumEditor(composite,
propertyDescriptor,
feature,
itemPropertyDescriptor,
object);
}
} else {
// this is a non-standard; use the combo box editor
result = createComboEditor(composite, itemPropertyDescriptor, propertyDescriptor, object);
Expand All @@ -221,11 +228,15 @@ public static CellEditor createPropertyEditor( final Composite composite,
// no properties that will travel down this block of code with getChoiceOfValues( ) returning
// values.
// Should that ever occur (say, in EMF 2.0), this block of code will need to be re-tested.
result = createAccumulatorEnumEditor(composite,
propertyDescriptor,
feature,
itemPropertyDescriptor,
object);
if( isTableEditor ) {
result = createUnsupportedCellEditor(composite, propertyDescriptor, feature, object);
} else {
result = createAccumulatorEnumEditor(composite,
propertyDescriptor,
feature,
itemPropertyDescriptor,
object);
}
}
} else {
result = createAccumulatorEnumEditor(composite,
Expand All @@ -242,14 +253,22 @@ public static CellEditor createPropertyEditor( final Composite composite,
// property is single-valued.
if (choiceOfValues != null) {
if (choiceOfValues.size() < COMBO_BOX_CHOICE_LIMIT) {
result = createComboEditor(composite, itemPropertyDescriptor, propertyDescriptor, object);
if( isTableEditor ) {
result = createUnsupportedCellEditor(composite, propertyDescriptor, feature, object);
} else {
result = createComboEditor(composite, itemPropertyDescriptor, propertyDescriptor, object);
}
} else {
result = createListEditor(composite,
propertyDescriptor,
feature,
itemPropertyDescriptor,
object,
choiceOfValues);
if( isTableEditor ) {
result = createUnsupportedCellEditor(composite, propertyDescriptor, feature, object);
} else {
result = createListEditor(composite,
propertyDescriptor,
feature,
itemPropertyDescriptor,
object,
choiceOfValues);
}
}
} else {
result = new EDataTypeCellEditor(eDataType, composite);
Expand All @@ -266,12 +285,15 @@ public static CellEditor createPropertyEditor( final Composite composite,

if (valid) {
// create a cell editor that launches the accumulator
result = createAccumulatorEditor(composite,
propertyDescriptor,
feature,
itemPropertyDescriptor,
object);

if( isTableEditor ) {
result = createUnsupportedCellEditor(composite, propertyDescriptor, feature, object);
} else {
result = createAccumulatorEditor(composite,
propertyDescriptor,
feature,
itemPropertyDescriptor,
object);
}
}
} else {

Expand All @@ -294,15 +316,22 @@ public static CellEditor createPropertyEditor( final Composite composite,

// property is single-valued.
if (useComboBox) {
result = createComboEditor(composite, (ArrayList)choiceOfValues, propertyDescriptor, object);
if( isTableEditor ) {
result = createUnsupportedCellEditor(composite, propertyDescriptor, feature, object);
} else {
result = createComboEditor(composite, (ArrayList)choiceOfValues, propertyDescriptor, object);
}
} else {
result = createListEditor(composite,
propertyDescriptor,
feature,
itemPropertyDescriptor,
object,
choiceOfValues);

if( isTableEditor ) {
result = createUnsupportedCellEditor(composite, propertyDescriptor, feature, object);
} else {
result = createListEditor(composite,
propertyDescriptor,
feature,
itemPropertyDescriptor,
object,
choiceOfValues);
}
}
}

Expand Down Expand Up @@ -584,6 +613,27 @@ public boolean passes( final Object object ) {
}
};
}

private static CellEditor createUnsupportedCellEditor(final Composite composite,
final IPropertyDescriptor propertyDescriptor,
final EStructuralFeature feature,
final Object object) {

return new ExtendedDialogCellEditor(composite, propertyDescriptor.getLabelProvider()) {
@Override
protected Object openDialogBox(Control cellEditorWindow) {
if( object instanceof EObject ) {
String name = ModelerCore.getModelEditor().getName((EObject)object);

MessageDialog.openWarning(composite.getShell(),
UiConstants.Util.getString("PropertyEditorFactory.unsupportedEditingMessage"),
UiConstants.Util.getString("PropertyEditorFactory.unsupportedEditingMessage", feature.getName(), name));
}
// return the original object
return getValue();
}
};
}

static List copyList( List inList ) {
List outList = new ArrayList(inList.size());
Expand Down

0 comments on commit b26bd52

Please sign in to comment.