Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2020-02-13 14:59:46 +0000
committervincent lorenzo2020-02-18 14:08:14 +0000
commit4cf5c84c37db98911868313e7d15db0abe82f580 (patch)
tree0155890df387e2f8614ca0528615f045092bb2af
parent4fe9f72f43cfd6445beb242afc2eb9fd6a81fd43 (diff)
downloadorg.eclipse.papyrus-4cf5c84c37db98911868313e7d15db0abe82f580.tar.gz
org.eclipse.papyrus-4cf5c84c37db98911868313e7d15db0abe82f580.tar.xz
org.eclipse.papyrus-4cf5c84c37db98911868313e7d15db0abe82f580.zip
Bug 560094: [Table] The framework must provide a way to add additional button to CellEditor
- set old classes as depreacted, without real replacement solution (no times for that, sorry) Change-Id: I9ebd71776e08c0ec9471a7d21acbec08b252a47b Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java3
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractOpenDialogCellEditorButtonAction.java9
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java11
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/widget/UMLDialogComboAction.java2
7 files changed, 28 insertions, 11 deletions
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
index 79c492e5bbd..91407922c9b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
@@ -17,12 +17,15 @@ package org.eclipse.papyrus.infra.nattable.celleditor;
import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
import org.eclipse.nebula.widgets.nattable.widget.NatCombo;
+import org.eclipse.papyrus.infra.nattable.celleditor.action.ICellEditorButtonAction;
/**
*
* This abstract class is used to declare addition action for a button located near a NatCombo
*
+ * @deprecated since 6.6 (use {@link ICellEditorButtonAction} mixed with {@link ActionComboBoxCellEditor}
*/
+@Deprecated
public abstract class AbstractComboAction {
/**
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractOpenDialogCellEditorButtonAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractOpenDialogCellEditorButtonAction.java
index 3dc78c953c6..a6ea04485da 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractOpenDialogCellEditorButtonAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractOpenDialogCellEditorButtonAction.java
@@ -27,7 +27,10 @@ import org.eclipse.swt.widgets.Composite;
/**
* This class allows to store required information to customize
* a Button to open a dialog
+ *
+ * @deprecated since 6.6 (use {@link org.eclipse.papyrus.infra.nattable.celleditor.action.AbstractOpenDialogCellEditorButtonAction} instead)
*/
+@Deprecated
public abstract class AbstractOpenDialogCellEditorButtonAction {
/** The text to use for the button. */
@@ -118,7 +121,7 @@ public abstract class AbstractOpenDialogCellEditorButtonAction {
/**
- *
+ *
* @return
* the created dialog
*/
@@ -139,7 +142,7 @@ public abstract class AbstractOpenDialogCellEditorButtonAction {
}
/**
- *
+ *
* @return
* the value selected by the user
*/
@@ -148,7 +151,7 @@ public abstract class AbstractOpenDialogCellEditorButtonAction {
}
/**
- *
+ *
* @param parent
* the parent composite used to open a dialog
* @param originalCanonicalValue
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java
index d1333cf2f00..70baa87fc17 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java
@@ -36,9 +36,10 @@ import org.eclipse.swt.widgets.Control;
* This class is used for XText Cell Editor and text editor with completion
*
* @author Vincent Lorenzo
- *
+ * @deprecated since 6.6, use {@link AbstractActionStyledTextCellEditor} instead
*/
-public abstract class AbstractPapyrusStyledTextCellEditor extends AbstractStyledTextCellEditor{
+@Deprecated
+public abstract class AbstractPapyrusStyledTextCellEditor extends AbstractStyledTextCellEditor {
/**
* the table
@@ -174,12 +175,12 @@ public abstract class AbstractPapyrusStyledTextCellEditor extends AbstractStyled
}
/**
- *
+ *
* @param composite
* the composite parent
* @return
* the created button
- *
+ *
*/
protected Button createAdditionalButton(Composite composite) {
Button button = new Button(composite, SWT.NONE);
@@ -215,7 +216,7 @@ public abstract class AbstractPapyrusStyledTextCellEditor extends AbstractStyled
/**
* This method allow to define the behavior of the an additional button located at the right of the text field in the cell
- *
+ *
* @param additionalAction
*/
public void setOpenDialogCellEditorButtonAction(AbstractOpenDialogCellEditorButtonAction additionalAction) {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
index c458d76ac12..25904036da3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
@@ -15,12 +15,16 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.celleditor;
+import org.eclipse.papyrus.infra.nattable.celleditor.action.ICellEditorButtonAction;
import org.eclipse.swt.graphics.Image;
/**
* This class allows to store required information to customize
* a Button and define the action done when it is pressed.
+ *
+ * @deprecated since 6.6 use {@link ICellEditorButtonAction} instead
*/
+@Deprecated
public class ButtonConfiguration {
/** The text to use for the button. */
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
index 4520c1e9e04..2a3ad5a7f39 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
@@ -30,8 +30,9 @@ import org.eclipse.swt.widgets.Display;
/**
*
* @author Vincent Lorenzo
- *
+ * @deprecated since 6.6, use {@link ActionComboBoxCellEditor} instead
*/
+@Deprecated
public class ComboBoxWithButtonCellEditor extends ComboBoxCellEditor {
/**
@@ -158,8 +159,9 @@ public class ComboBoxWithButtonCellEditor extends ComboBoxCellEditor {
@Override
public NatCombo createEditorControl(Composite parent) {
int style = this.editMode == EditModeEnum.INLINE ? SWT.NONE : SWT.BORDER;
- final NatCombo combo = this.iconImage == null ? new NatComboButton(parent, this.cellStyle, this.maxVisibleItems, this.freeEdit, this.multiselect, style, buttonConfiguration) : new NatComboButton(parent, this.cellStyle, this.maxVisibleItems,
- this.freeEdit, this.multiselect, style, this.iconImage, buttonConfiguration);
+ final NatCombo combo = this.iconImage == null ? new NatComboButton(parent, this.cellStyle, this.maxVisibleItems, this.freeEdit, this.multiselect, style, buttonConfiguration)
+ : new NatComboButton(parent, this.cellStyle, this.maxVisibleItems,
+ this.freeEdit, this.multiselect, style, this.iconImage, buttonConfiguration);
combo.setCursor(new Cursor(Display.getDefault(), SWT.CURSOR_IBEAM));
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
index a84a379646a..d57fccbecbd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
@@ -31,7 +31,9 @@ import org.eclipse.swt.widgets.Composite;
*
* This widget provides a Combo with a button
*
+ * @deprecated since 6.6, use {@link ButtonNatCombo} instead
*/
+@Deprecated
public class NatComboButton extends NatCombo {
/**
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/widget/UMLDialogComboAction.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/widget/UMLDialogComboAction.java
index 9e658b30a5e..4209a3a8add 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/widget/UMLDialogComboAction.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/widget/UMLDialogComboAction.java
@@ -45,7 +45,9 @@ import org.eclipse.uml2.uml.Stereotype;
* @author Vincent Lorenzo
*
* TODO : maybe we could improve this action using AbstractDialogCellEditor
+ * @deprecated since 5.3, use {@link UMLOpenDialogCellEditorButtonAction} {@link InstantiationError}
*/
+@Deprecated
public class UMLDialogComboAction extends AbstractComboAction {
/**

Back to the top