434176: [Table] Papyrus shall migrate to Nattable 1.1

https://bugs.eclipse.org/bugs/show_bug.cgi?id=434176

4 files changed, 56 insertions, 131 deletions

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
index e6ea5418150..9f6b318d2a1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2012 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -16,15 +16,16 @@ package org.eclipse.papyrus.infra.nattable.configuration;
 import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

 import org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration;

 import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

+import org.eclipse.nebula.widgets.nattable.export.ExportConfigAttributes;

 import org.eclipse.papyrus.infra.nattable.converter.GenericDisplayConverter;

 import org.eclipse.papyrus.infra.nattable.formatter.PapyrusExportFormatter;

 import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;

 

 /**

  * Register a specific Cellpainter

- * 

+ *

  * @author Vincent Lorenzo

- * 

+ *

  */

 public class StyleConfiguration extends DefaultNatTableStyleConfiguration {

 

@@ -33,7 +34,7 @@ public class StyleConfiguration extends DefaultNatTableStyleConfiguration {
 		super.configureRegistry(configRegistry);

 		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomizedCellPainter());

 		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new GenericDisplayConverter());

-		configRegistry.registerConfigAttribute(CellConfigAttributes.EXPORT_FORMATTER, new PapyrusExportFormatter());

+		configRegistry.registerConfigAttribute(ExportConfigAttributes.EXPORT_FORMATTER, new PapyrusExportFormatter());

 

 	}

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/PapyrusExportBindings.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/PapyrusExportBindings.java
index 553737e0f3a..0b8845f4df7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/PapyrusExportBindings.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/PapyrusExportBindings.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- *    
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,20 +16,14 @@ package org.eclipse.papyrus.infra.nattable.export;
 
 
 import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
-import org.eclipse.nebula.widgets.nattable.config.IConfiguration;
-import org.eclipse.nebula.widgets.nattable.export.ILayerExporter;
-import org.eclipse.nebula.widgets.nattable.export.action.ExportAction;
+import org.eclipse.nebula.widgets.nattable.export.ExportConfigAttributes;
 import org.eclipse.nebula.widgets.nattable.export.config.DefaultExportBindings;
-import org.eclipse.nebula.widgets.nattable.export.excel.ExcelExporter;
-import org.eclipse.nebula.widgets.nattable.layer.ILayer;
-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
-import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;
-import org.eclipse.swt.SWT;
 
 public class PapyrusExportBindings extends DefaultExportBindings {
 
+	@Override
 	public void configureRegistry(IConfigRegistry configRegistry) {
-		configRegistry.registerConfigAttribute(ILayerExporter.CONFIG_ATTRIBUTE, new PapyrusExcelExporter());
+		configRegistry.registerConfigAttribute(ExportConfigAttributes.EXPORTER, new PapyrusExcelExporter());
 	}
 
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusSortableHeaderTextPainter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusSortableHeaderTextPainter.java
index 14dcfa556ce..d6ae2abcb66 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusSortableHeaderTextPainter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusSortableHeaderTextPainter.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2014 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -12,21 +12,17 @@
  /*****************************************************************************/

 package org.eclipse.papyrus.infra.nattable.painter;

 

-import org.apache.commons.lang.StringUtils;

 import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

 import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;

 import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;

 import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.CellPainterDecorator;

-import org.eclipse.nebula.widgets.nattable.sort.config.DefaultSortConfiguration;

 import org.eclipse.nebula.widgets.nattable.sort.painter.SortableHeaderTextPainter;

 import org.eclipse.nebula.widgets.nattable.style.CellStyleUtil;

 import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

 import org.eclipse.nebula.widgets.nattable.style.IStyle;

 import org.eclipse.nebula.widgets.nattable.ui.util.CellEdgeEnum;

-import org.eclipse.nebula.widgets.nattable.util.GUIHelper;

 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

 import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

 import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

@@ -50,7 +46,7 @@ public class PapyrusSortableHeaderTextPainter extends SortableHeaderTextPainter
 	 * Creates a {@link SortableHeaderTextPainter} that uses the given {@link ICellPainter} as base {@link ICellPainter} and decorate it with the

 	 * {@link SortIconPainter} on the right

 	 * edge of the cell.

-	 * 

+	 *

 	 * @param interiorPainter

 	 *        the base {@link ICellPainter} to use

 	 */

@@ -62,7 +58,7 @@ public class PapyrusSortableHeaderTextPainter extends SortableHeaderTextPainter
 	 * Creates a {@link SortableHeaderTextPainter} that uses the given {@link ICellPainter} as base {@link ICellPainter} and decorate it with the

 	 * {@link SortIconPainter} on the specified

 	 * edge of the cell.

-	 * 

+	 *

 	 * @param interiorPainter

 	 *        the base {@link ICellPainter} to use

 	 * @param cellEdge

@@ -76,7 +72,7 @@ public class PapyrusSortableHeaderTextPainter extends SortableHeaderTextPainter
 	 * Creates a {@link SortableHeaderTextPainter} that uses the given {@link ICellPainter} as base {@link ICellPainter} and decorate it with the

 	 * given {@link ICellPainter} to use for sort

 	 * related decoration on the specified edge of the cell.

-	 * 

+	 *

 	 * @param interiorPainter

 	 *        the base {@link ICellPainter} to use

 	 * @param cellEdge

@@ -93,7 +89,7 @@ public class PapyrusSortableHeaderTextPainter extends SortableHeaderTextPainter
 	 * Paints the triangular sort icon images.

 	 * Adapted code from Nattable

 	 */

-	protected static class SortIconPainter extends SortableHeaderTextPainter.SortIconPainter {

+	protected static class SortIconPainter extends org.eclipse.nebula.widgets.nattable.sort.painter.SortIconPainter {

 

 		public SortIconPainter(boolean paintBg) {

 			super(paintBg);

@@ -104,7 +100,7 @@ public class PapyrusSortableHeaderTextPainter extends SortableHeaderTextPainter
 		public void paintCell(ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {

 			int position = cell.getRowPosition();

 			if(position == 0) {

-				INattableModelManager manager = (NattableModelManager)configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

+				INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

 				AbstractHeaderAxisConfiguration config = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisUsedInTable(manager.getTable());

 				if(config != null && config.isDisplayIndex()) {

 					return;

@@ -146,83 +142,6 @@ public class PapyrusSortableHeaderTextPainter extends SortableHeaderTextPainter
 			return super.getPreferredWidth(cell, gc, configRegistry);

 		}

 

-		@Override

-		protected Image getImage(ILayerCell cell, IConfigRegistry configRegistry) {

-

-			Image icon = null;

-

-			if(isSortedAscending(cell)) {

-				icon = selectUpImage(getSortSequence(cell));

-			} else if(isSortedDescending(cell)) {

-				icon = selectDownImage(getSortSequence(cell));

-			}

-			//to change the color of the icon

-			//			ImageData ideaImageData = icon.getImageData();

-			//			int[] lineData = new int[ideaImageData.width];

-			//			for(int y = 0; y < ideaImageData.height; y++) {

-			//				ideaImageData.getPixels(0, y, ideaImageData.width, lineData, 0);

-			//				// Analyze each pixel value in the line

-			//				for(int x = 0; x < lineData.length; x++) {

-			//					// Extract the red, green and blue component

-			//					int pixelValue = lineData[x];

-			//					ideaImageData.setPixel(x, y, ideaImageData.palette.getPixel(new RGB(0, 0, 250)));

-			//				}

-			//			};

-			//			icon = new Image(Display.getDefault(), ideaImageData);

-

-

-			return icon;

-		}

-

-		private boolean isSortedAscending(ILayerCell cell) {

-			return cell.getConfigLabels().hasLabel(DefaultSortConfiguration.SORT_UP_CONFIG_TYPE);

-		}

-

-		private boolean isSortedDescending(ILayerCell cell) {

-			return cell.getConfigLabels().hasLabel(DefaultSortConfiguration.SORT_DOWN_CONFIG_TYPE);

-		}

-

-		private int getSortSequence(ILayerCell cell) {

-			int sortSeq = 0;

-

-			for(String configLabel : cell.getConfigLabels().getLabels()) {

-				if(configLabel.startsWith(DefaultSortConfiguration.SORT_SEQ_CONFIG_TYPE)) {

-					String[] tokens = StringUtils.split(configLabel, "_"); //$NON-NLS-1$

-					sortSeq = Integer.valueOf(tokens[tokens.length - 1]).intValue();

-				}

-			}

-			return sortSeq;

-		}

-

-		private Image selectUpImage(int sortSequence) {

-			//			return GUIHelper.getImage("up_0"); //$NON-NLS-1$

-			switch(sortSequence) {

-			case 0:

-				return GUIHelper.getImage("up_0"); //$NON-NLS-1$

-			case 1:

-				return GUIHelper.getImage("up_1"); //$NON-NLS-1$

-			case 2:

-				return GUIHelper.getImage("up_2"); //$NON-NLS-1$

-			default:

-				return GUIHelper.getImage("up_2"); //$NON-NLS-1$

-			}

-		}

-

-		private Image selectDownImage(int sortSequence) {

-			//			return GUIHelper.getImage("down_0"); //$NON-NLS-1$

-			switch(sortSequence) {

-			case 0:

-				return GUIHelper.getImage("down_0"); //$NON-NLS-1$

-			case 1:

-				return GUIHelper.getImage("down_1"); //$NON-NLS-1$

-			case 2:

-				return GUIHelper.getImage("down_2"); //$NON-NLS-1$

-			default:

-				return GUIHelper.getImage("down_2"); //$NON-NLS-1$

-			}

-		}

-

-

 	}

 

 }

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/StereotypeApplierCellEditorWrapper.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/StereotypeApplierCellEditorWrapper.java
index 92fb2474b5b..8deecd1e822 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/StereotypeApplierCellEditorWrapper.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/StereotypeApplierCellEditorWrapper.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

+ *

  *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *       Christian W. Damus (CEA) - bug 402525

  *

@@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvide
 import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

 import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;

 import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

+import org.eclipse.swt.graphics.Rectangle;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Control;

 import org.eclipse.uml2.uml.Element;

@@ -42,7 +43,7 @@ import org.eclipse.uml2.uml.Stereotype;
  * Wrapper to apply stereotypes if required before to do the edition

  * see bug 426709: [Table 2][Stereotype] Papyrus Table must allows to edit stereotype properties even if the required stereotypes is not yet applied

  * https://bugs.eclipse.org/bugs/show_bug.cgi?id=426709

- * 

+ *

  * elementProvider

  */

 public class StereotypeApplierCellEditorWrapper implements ICellEditor {

@@ -61,9 +62,9 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 	protected final ITableAxisElementProvider elementProvider;

 

 	/**

-	 * 

+	 *

 	 * Constructor.

-	 * 

+	 *

 	 * @param wrappedCellEditor

 	 *        the wrapped cell editor

 	 * @param axisElement

@@ -81,7 +82,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#activateCell(org.eclipse.swt.widgets.Composite, java.lang.Object,

 	 *      org.eclipse.nebula.widgets.nattable.widget.EditModeEnum, org.eclipse.nebula.widgets.nattable.edit.ICellEditHandler,

 	 *      org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 * 

+	 *

 	 * @param parent

 	 * @param originalCanonicalValue

 	 * @param editMode

@@ -118,7 +119,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#getColumnIndex()

-	 * 

+	 *

 	 * @return

 	 */

 

@@ -129,7 +130,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#getRowIndex()

-	 * 

+	 *

 	 * @return

 	 */

 

@@ -140,7 +141,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#getColumnPosition()

-	 * 

+	 *

 	 * @return

 	 */

 

@@ -151,7 +152,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#getRowPosition()

-	 * 

+	 *

 	 * @return

 	 */

 

@@ -162,7 +163,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#getEditorValue()

-	 * 

+	 *

 	 * @return

 	 */

 

@@ -173,7 +174,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#setEditorValue(java.lang.Object)

-	 * 

+	 *

 	 * @param value

 	 */

 

@@ -184,7 +185,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#getCanonicalValue()

-	 * 

+	 *

 	 * @return

 	 */

 

@@ -195,7 +196,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#getCanonicalValue(org.eclipse.nebula.widgets.nattable.edit.editor.IEditErrorHandler)

-	 * 

+	 *

 	 * @param conversionErrorHandler

 	 * @return

 	 */

@@ -207,7 +208,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#setCanonicalValue(java.lang.Object)

-	 * 

+	 *

 	 * @param canonicalValue

 	 */

 

@@ -218,7 +219,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#validateCanonicalValue(java.lang.Object)

-	 * 

+	 *

 	 * @param canonicalValue

 	 * @return

 	 */

@@ -231,7 +232,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#validateCanonicalValue(java.lang.Object,

 	 *      org.eclipse.nebula.widgets.nattable.edit.editor.IEditErrorHandler)

-	 * 

+	 *

 	 * @param canonicalValue

 	 * @param validationErrorHandler

 	 * @return

@@ -244,7 +245,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#commit(org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum)

-	 * 

+	 *

 	 * @param direction

 	 * @return

 	 */

@@ -257,7 +258,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#commit(org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum,

 	 *      boolean)

-	 * 

+	 *

 	 * @param direction

 	 * @param closeAfterCommit

 	 * @return

@@ -271,7 +272,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#commit(org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum,

 	 *      boolean, boolean)

-	 * 

+	 *

 	 * @param direction

 	 * @param closeAfterCommit

 	 * @param skipValidation

@@ -285,7 +286,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#close()

-	 * 

+	 *

 	 */

 

 	@Override

@@ -295,7 +296,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#isClosed()

-	 * 

+	 *

 	 * @return

 	 */

 

@@ -306,7 +307,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#getEditorControl()

-	 * 

+	 *

 	 * @return

 	 */

 

@@ -317,7 +318,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#createEditorControl(org.eclipse.swt.widgets.Composite)

-	 * 

+	 *

 	 * @param parent

 	 * @return

 	 */

@@ -330,7 +331,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#openInline(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry,

 	 *      java.util.List)

-	 * 

+	 *

 	 * @param configRegistry

 	 * @param configLabels

 	 * @return

@@ -344,7 +345,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#supportMultiEdit(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry,

 	 *      java.util.List)

-	 * 

+	 *

 	 * @param configRegistry

 	 * @param configLabels

 	 * @return

@@ -357,7 +358,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#openAdjacentEditor()

-	 * 

+	 *

 	 * @return

 	 */

 

@@ -368,7 +369,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#activateAtAnyPosition()

-	 * 

+	 *

 	 * @return

 	 */

 

@@ -379,7 +380,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#addEditorControlListeners()

-	 * 

+	 *

 	 */

 

 	@Override

@@ -389,7 +390,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 

 	/**

 	 * Removes the editor control listeners.

-	 * 

+	 *

 	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#removeEditorControlListeners()

 	 */

 

@@ -399,7 +400,7 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 	}

 

 	/**

-	 * 

+	 *

 	 * @param el

 	 *        an element of the model

 	 * @param propertyId

@@ -424,4 +425,14 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
 		return false;

 	}

 

+	@Override

+	public boolean openMultiEditDialog() {

+		return wrappedCellEditor == null ? false : wrappedCellEditor.openMultiEditDialog();

+	}

+

+	@Override

+	public Rectangle calculateControlBounds(Rectangle cellBounds) {

+		return wrappedCellEditor == null ? cellBounds : wrappedCellEditor.calculateControlBounds(cellBounds);

+	}

+

 }