Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2013-04-29 09:46:47 -0400
committervlorenzo2013-04-29 09:46:47 -0400
commitdf9700f57cb25992b86b39a1a2cc1fa2e3772d88 (patch)
tree6ef2ab28b7b606338b5016761ff51b1c07a4e231 /sandbox
parente555a165ddd42641d119abcd73f06d48fea0432b (diff)
downloadorg.eclipse.papyrus-df9700f57cb25992b86b39a1a2cc1fa2e3772d88.tar.gz
org.eclipse.papyrus-df9700f57cb25992b86b39a1a2cc1fa2e3772d88.tar.xz
org.eclipse.papyrus-df9700f57cb25992b86b39a1a2cc1fa2e3772d88.zip
405163: [Table 2] The table configuration must not be embedded in the table editors plugins
https://bugs.eclipse.org/bugs/show_bug.cgi?id=405163
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java (renamed from sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler2.java)4
-rw-r--r--sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableEditorHandler.java35
2 files changed, 27 insertions, 12 deletions
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler2.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
index ad269bf58e2..025090f6d17 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler2.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
@@ -59,7 +59,7 @@ import org.eclipse.ui.PlatformUI;
*
*
*/
-public abstract class AbstractCreateNattableEditorHandler2 extends AbstractHandler {
+public abstract class AbstractCreateNattableEditorHandler extends AbstractHandler {
@@ -106,7 +106,7 @@ public abstract class AbstractCreateNattableEditorHandler2 extends AbstractHandl
@Override
protected void doExecute() {
try {
- AbstractCreateNattableEditorHandler2.this.doExecute(serviceRegistry, name, this.description);
+ AbstractCreateNattableEditorHandler.this.doExecute(serviceRegistry, name, this.description);
} catch (final NotFoundException e) {
Activator.log.error(e);
} catch (final ServiceException e) {
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableEditorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableEditorHandler.java
index a43f24537c4..2259bf243b7 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableEditorHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableEditorHandler.java
@@ -16,8 +16,6 @@ package org.eclipse.papyrus.infra.nattable.common.handlers;
import java.util.Hashtable;
import java.util.List;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExecutableExtension;
@@ -26,33 +24,50 @@ import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.infra.nattable.nattableconfiguration.NattableConfigurationRegistry;
-
-public class CreateNatTableEditorHandler extends AbstractCreateNattableEditorHandler2 implements IExecutableExtension {
+/**
+ * The handler used to create a nattable editor
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CreateNatTableEditorHandler extends AbstractCreateNattableEditorHandler implements IExecutableExtension {
/**
* the name of the parameter of the handler
*/
- private static final String TABLE_TYPE_PARAMETER = "tableType";
+ private static final String TABLE_TYPE_PARAMETER = "tableType"; //$NON-NLS-1$
/**
* the type of the table to create
*/
private String type;
+ /**
+ *
+ * Constructor.
+ *
+ */
public CreateNatTableEditorHandler() {
super();
}
- @Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
- return super.execute(event);
- }
-
+ /**
+ *
+ * @see org.eclipse.papyrus.infra.nattable.common.handlers.AbstractCreateNattableEditorHandler2#getTableEditorConfigurationURI()
+ *
+ * @return
+ */
@Override
protected URI getTableEditorConfigurationURI() {
return NattableConfigurationRegistry.INSTANCE.getConfigurationURI(this.type);
}
+ /**
+ *
+ * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+ *
+ * @param evaluationContext
+ */
@Override
public void setEnabled(Object evaluationContext) {
if(this.type != null) {

Back to the top