diff options
author | Ed Merks | 2020-02-05 05:29:23 +0000 |
---|---|---|
committer | Ed Merks | 2020-02-05 05:29:23 +0000 |
commit | 164f7a1d6eedd6cbda8321987c0a2419f1616f72 (patch) | |
tree | 0143c935e4aad2b34c0d62c7a01ade7f79008adf | |
parent | 66c802845f1603ecba76bf1aa3fc6ac3090c427f (diff) | |
download | org.eclipse.emf-164f7a1d6eedd6cbda8321987c0a2419f1616f72.tar.gz org.eclipse.emf-164f7a1d6eedd6cbda8321987c0a2419f1616f72.tar.xz org.eclipse.emf-164f7a1d6eedd6cbda8321987c0a2419f1616f72.zip |
in exceptions
-rw-r--r-- | plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/celleditor/FeatureEditorDialog.java | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/celleditor/FeatureEditorDialog.java b/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/celleditor/FeatureEditorDialog.java index 747819064..3a39803e2 100644 --- a/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/celleditor/FeatureEditorDialog.java +++ b/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/celleditor/FeatureEditorDialog.java @@ -365,10 +365,7 @@ public class FeatureEditorDialog extends Dialog addButtonGridData.verticalAlignment = SWT.FILL; addButtonGridData.horizontalAlignment = SWT.FILL; addButton.setLayoutData(addButtonGridData); - if (valueHandler != null) - { - addButton.setEnabled(valueHandler.isValid("") == null); - } + addButton.setEnabled(valueHandler != null && valueHandler.isValid("") == null); final Button removeButton = new Button(controlButtons, SWT.PUSH); removeButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Remove_label")); @@ -376,6 +373,7 @@ public class FeatureEditorDialog extends Dialog removeButtonGridData.verticalAlignment = SWT.FILL; removeButtonGridData.horizontalAlignment = SWT.FILL; removeButton.setLayoutData(removeButtonGridData); + removeButton.setEnabled(false); Label spaceLabel = new Label(controlButtons, SWT.NONE); GridData spaceLabelGridData = new GridData(); @@ -388,6 +386,7 @@ public class FeatureEditorDialog extends Dialog upButtonGridData.verticalAlignment = SWT.FILL; upButtonGridData.horizontalAlignment = SWT.FILL; upButton.setLayoutData(upButtonGridData); + upButton.setEnabled(false); final Button downButton = new Button(controlButtons, SWT.PUSH); downButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Down_label")); @@ -395,6 +394,7 @@ public class FeatureEditorDialog extends Dialog downButtonGridData.verticalAlignment = SWT.FILL; downButtonGridData.horizontalAlignment = SWT.FILL; downButton.setLayoutData(downButtonGridData); + downButton.setEnabled(false); Composite featureComposite = new Composite(contents, SWT.NONE); { @@ -462,12 +462,15 @@ public class FeatureEditorDialog extends Dialog // Up is enabled only if something will actually be moved up. // boolean upEnabled = false; - int upIndex = Math.max(selectionIndices[0] - 1, 0); - for (int i = 0; i < selectionIndices.length; ++i) + if (selectionIndices.length > 0) { - if (upIndex++ != selectionIndices[i]) + int upIndex = Math.max(selectionIndices[0] - 1, 0); + for (int i = 0; i < selectionIndices.length; ++i) { - upEnabled = true; + if (upIndex++ != selectionIndices[i]) + { + upEnabled = true; + } } } upButton.setEnabled(upEnabled); @@ -475,12 +478,15 @@ public class FeatureEditorDialog extends Dialog // Down is enabled only if something will actually be moved up. // boolean downEnabled = false; - int downIndex = Math.min(selectionIndices[selectionIndices.length - 1] + 1, featureTable.getItemCount() - 1); - for (int i = selectionIndices.length - 1; i >= 0; --i) + if (selectionIndices.length > 0) { - if (downIndex-- != selectionIndices[i]) + int downIndex = Math.min(selectionIndices[selectionIndices.length - 1] + 1, featureTable.getItemCount() - 1); + for (int i = selectionIndices.length - 1; i >= 0; --i) { - downEnabled = true; + if (downIndex-- != selectionIndices[i]) + { + downEnabled = true; + } } } downButton.setEnabled(downEnabled); @@ -772,8 +778,8 @@ public class FeatureEditorDialog extends Dialog if (!children.isEmpty()) { featureTable.setSelection(selectionIndices[0] == 0 ? 0 : selectionIndices[0] - 1); - featureTable.notifyListeners(SWT.Selection, null); } + featureTable.notifyListeners(SWT.Selection, null); // If there is a choice table... // |