Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2011-05-02 15:43:21 +0000
committervlorenzo2011-05-02 15:43:21 +0000
commit892c46ccdb397143d4b87d28dd374c324e1100b2 (patch)
tree171a4e42b79787b435af85124adf3f67883e69ee /incoming
parent91749627ffc145563ee336a0cd897fde106e56be (diff)
downloadorg.eclipse.papyrus-892c46ccdb397143d4b87d28dd374c324e1100b2.tar.gz
org.eclipse.papyrus-892c46ccdb397143d4b87d28dd374c324e1100b2.tar.xz
org.eclipse.papyrus-892c46ccdb397143d4b87d28dd374c324e1100b2.zip
NEW - bug 344472: [Papyrus Table Instance] The plugin oep.nattable.instance should be renamed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=344472
Diffstat (limited to 'incoming')
-rw-r--r--incoming/org.eclipse.papyrus.sysml.table.allocation/META-INF/MANIFEST.MF2
-rw-r--r--incoming/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableCommand.java2
-rw-r--r--incoming/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/editor/AllocationTableEditor.java2
-rw-r--r--incoming/org.eclipse.papyrus.sysml.table.requirement/META-INF/MANIFEST.MF2
-rw-r--r--incoming/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/editor/RequirementTableEditor.java2
-rw-r--r--incoming/org.eclipse.papyrus.table.common/META-INF/MANIFEST.MF2
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/editor/AbstractNattableEditor.java4
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/AbstractNattableEditorFactory.java2
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/AbstractCreateNattableEditorCommand.java4
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/NatTableEditor.java2
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/TableEditorInput.java2
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/PapyrusNattableModel.java2
-rw-r--r--incoming/org.eclipse.papyrus.table.default/META-INF/MANIFEST.MF2
-rw-r--r--incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/editor/DefaultNattableEditor.java2
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/.project2
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/META-INF/MANIFEST.MF11
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.ecore2
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.genmodel6
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/plugin.xml2
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java (renamed from incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/Activator.java)8
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrusTableInstance.java (renamed from incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/PapyrusTableInstance.java)32
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java (renamed from incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/PapyrustableinstanceFactory.java)6
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstancePackage.java (renamed from incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/PapyrustableinstancePackage.java)44
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java (renamed from incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java)16
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java (renamed from incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java)4
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java (renamed from incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java)10
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java (renamed from incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java)10
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java (renamed from incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java)6
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/META-INF/MANIFEST.MF4
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java2
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DeleteTableHandler.java2
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DuplicateTableHandler.java2
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/RenameTableHandler.java4
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableContentProvider.java6
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableLabelProvider.java6
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/TablePropertyTester.java6
36 files changed, 111 insertions, 112 deletions
diff --git a/incoming/org.eclipse.papyrus.sysml.table.allocation/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.sysml.table.allocation/META-INF/MANIFEST.MF
index 9c43258bbaf..347842e1fd5 100644
--- a/incoming/org.eclipse.papyrus.sysml.table.allocation/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.sysml.table.allocation/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.emf.facet.infra.common.core,
org.eclipse.papyrus.diagram.common;bundle-version="0.8.0",
org.eclipse.papyrus.table.common,
org.eclipse.core.expressions,
- org.eclipse.papyrus.nattable.instance;bundle-version="0.8.0",
+ org.eclipse.papyrus.table.instance;bundle-version="0.8.0",
org.eclipse.emf.facet.widgets.nattable;bundle-version="0.1.0",
org.eclipse.emf.facet.widgets.nattable.tableconfiguration;bundle-version="0.1.0",
org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0"
diff --git a/incoming/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableCommand.java b/incoming/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableCommand.java
index 1077b1c83bd..d1ca48fa85e 100644
--- a/incoming/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableCommand.java
+++ b/incoming/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableCommand.java
@@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
import org.eclipse.emf.facet.widgets.nattable.tableconfiguration.TableConfiguration;
import org.eclipse.papyrus.core.services.ServiceException;
import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.resource.NotFoundException;
import org.eclipse.papyrus.sysml.table.allocation.editor.AllocationTableEditor;
import org.eclipse.papyrus.table.common.handlers.AbstractCreateNattableEditorCommand;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Package;
diff --git a/incoming/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/editor/AllocationTableEditor.java b/incoming/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/editor/AllocationTableEditor.java
index e152b1bee38..6c41d9ad24b 100644
--- a/incoming/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/editor/AllocationTableEditor.java
+++ b/incoming/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/editor/AllocationTableEditor.java
@@ -14,8 +14,8 @@
package org.eclipse.papyrus.sysml.table.allocation.editor;
import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.table.common.editor.AbstractNattableEditor;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
/**
diff --git a/incoming/org.eclipse.papyrus.sysml.table.requirement/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.sysml.table.requirement/META-INF/MANIFEST.MF
index 5bd0aa11f46..d6d3cb88a5d 100644
--- a/incoming/org.eclipse.papyrus.sysml.table.requirement/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.sysml.table.requirement/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.emf.facet.widgets.nattable.instance,
org.eclipse.papyrus.table.common;bundle-version="0.8.0",
org.eclipse.core.expressions,
org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",
- org.eclipse.papyrus.nattable.instance;bundle-version="0.8.0",
+ org.eclipse.papyrus.table.instance;bundle-version="0.8.0",
org.eclipse.emf.facet.widgets.nattable;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.browser.custom.core,
org.eclipse.papyrus.sysml;bundle-version="0.8.0"
diff --git a/incoming/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/editor/RequirementTableEditor.java b/incoming/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/editor/RequirementTableEditor.java
index f90ec4835a4..664dac97f24 100644
--- a/incoming/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/editor/RequirementTableEditor.java
+++ b/incoming/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/editor/RequirementTableEditor.java
@@ -14,8 +14,8 @@
package org.eclipse.papyrus.sysml.table.requirement.editor;
import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.table.common.editor.AbstractNattableEditor;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
diff --git a/incoming/org.eclipse.papyrus.table.common/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.table.common/META-INF/MANIFEST.MF
index 2a136af1b87..84463c854f3 100644
--- a/incoming/org.eclipse.papyrus.table.common/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.table.common/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.emf.facet.widgets.nattable.instance,
org.eclipse.papyrus.widgets,
org.eclipse.papyrus.properties,
org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.papyrus.nattable.instance;bundle-version="0.8.0",
+ org.eclipse.papyrus.table.instance;bundle-version="0.8.0",
org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.query.editor;bundle-version="0.1.0",
org.eclipse.emf.facet.query.java;bundle-version="0.1.0",
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/editor/AbstractNattableEditor.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/editor/AbstractNattableEditor.java
index 96063d57f9a..8413c3034ba 100644
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/editor/AbstractNattableEditor.java
+++ b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/editor/AbstractNattableEditor.java
@@ -25,9 +25,9 @@ import org.eclipse.emf.facet.widgets.nattable.internal.NatTableWidgetInternalUti
import org.eclipse.papyrus.core.services.ServiceException;
import org.eclipse.papyrus.core.services.ServicesRegistry;
import org.eclipse.papyrus.core.utils.ServiceUtils;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage;
import org.eclipse.papyrus.table.common.internal.TableEditorInput;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/AbstractNattableEditorFactory.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/AbstractNattableEditorFactory.java
index 8e632486823..9b91182dae3 100644
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/AbstractNattableEditorFactory.java
+++ b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/AbstractNattableEditorFactory.java
@@ -21,9 +21,9 @@ import org.eclipse.papyrus.core.extension.diagrameditor.AbstractEditorFactory;
import org.eclipse.papyrus.core.multidiagram.actionbarcontributor.ActionBarContributorRegistry;
import org.eclipse.papyrus.core.services.ServiceException;
import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel;
import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/AbstractCreateNattableEditorCommand.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/AbstractCreateNattableEditorCommand.java
index 4e46e3ca814..d38eb21299b 100644
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/AbstractCreateNattableEditorCommand.java
+++ b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/AbstractCreateNattableEditorCommand.java
@@ -50,8 +50,6 @@ import org.eclipse.papyrus.core.utils.EditorUtils;
import org.eclipse.papyrus.core.utils.ServiceUtils;
import org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers;
import org.eclipse.papyrus.diagram.common.Activator;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstanceFactory;
import org.eclipse.papyrus.resource.AbstractBaseModel;
import org.eclipse.papyrus.resource.IModel;
import org.eclipse.papyrus.resource.ModelSet;
@@ -62,6 +60,8 @@ import org.eclipse.papyrus.table.common.messages.Messages;
import org.eclipse.papyrus.table.common.modelresource.EMFFacetNattableModel;
import org.eclipse.papyrus.table.common.modelresource.PapyrusNattableModel;
import org.eclipse.papyrus.table.common.util.QueryRepresentation;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstanceFactory;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/NatTableEditor.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/NatTableEditor.java
index f992a452bbb..a3f7a15f58a 100644
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/NatTableEditor.java
+++ b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/NatTableEditor.java
@@ -57,9 +57,9 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.papyrus.diagram.common.providers.EditorLabelProvider;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.properties.uml.databinding.PapyrusObservableValue;
import org.eclipse.papyrus.table.common.messages.Messages;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.widgets.editors.StringEditor;
import org.eclipse.papyrus.widgets.editors.StringLabel;
import org.eclipse.swt.SWT;
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/TableEditorInput.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/TableEditorInput.java
index 7e5fc66cc5f..c485554cdf5 100644
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/TableEditorInput.java
+++ b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/TableEditorInput.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.table.common.internal;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/PapyrusNattableModel.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/PapyrusNattableModel.java
index de8b829903e..25ad302a6b0 100644
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/PapyrusNattableModel.java
+++ b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/PapyrusNattableModel.java
@@ -17,10 +17,10 @@ package org.eclipse.papyrus.table.common.modelresource;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.resource.AbstractModelWithSharedResource;
import org.eclipse.papyrus.resource.IModel;
import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
diff --git a/incoming/org.eclipse.papyrus.table.default/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.table.default/META-INF/MANIFEST.MF
index b0deeadbd91..3db30305ed8 100644
--- a/incoming/org.eclipse.papyrus.table.default/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.table.default/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.8.0.qualifier
Bundle-Activator: org.eclipse.papyrus.table.defaultt.Activator
Require-Bundle: org.eclipse.papyrus.core,
org.eclipse.papyrus.table.common;bundle-version="0.8.0",
- org.eclipse.papyrus.nattable.instance;bundle-version="0.8.0",
+ org.eclipse.papyrus.table.instance;bundle-version="0.8.0",
org.eclipse.emf.facet.widgets.nattable;bundle-version="0.1.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/editor/DefaultNattableEditor.java b/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/editor/DefaultNattableEditor.java
index 8d934e9b913..06e42cd9ec3 100644
--- a/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/editor/DefaultNattableEditor.java
+++ b/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/editor/DefaultNattableEditor.java
@@ -14,8 +14,8 @@
package org.eclipse.papyrus.table.defaultt.editor;
import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.table.common.editor.AbstractNattableEditor;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
/**
diff --git a/incoming/org.eclipse.papyrus.table.instance/.project b/incoming/org.eclipse.papyrus.table.instance/.project
index 125db82e11e..f5596956ceb 100644
--- a/incoming/org.eclipse.papyrus.table.instance/.project
+++ b/incoming/org.eclipse.papyrus.table.instance/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.nattable.instance</name>
+ <name>org.eclipse.papyrus.table.instance</name>
<comment></comment>
<projects>
</projects>
diff --git a/incoming/org.eclipse.papyrus.table.instance/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.table.instance/META-INF/MANIFEST.MF
index d48f70a26b5..46f812b5414 100644
--- a/incoming/org.eclipse.papyrus.table.instance/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.table.instance/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.nattable.instance;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.table.instance;singleton:=true
Bundle-Version: 0.8.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
@@ -12,13 +12,12 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0",
org.eclipse.ui.workbench
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.nattable.instance,
- org.eclipse.papyrus.nattable.instance.papyrustableinstance;uses:="org.eclipse.emf.ecore,org.eclipse.emf.facet.widgets.nattable.instance.tableinstance",
- org.eclipse.papyrus.nattable.instance.papyrustableinstance.util;
+Export-Package: org.eclipse.papyrus.table.instance,
+ org.eclipse.papyrus.table.instance.papyrustableinstance;uses:="org.eclipse.emf.ecore,org.eclipse.emf.facet.widgets.nattable.instance.tableinstance",
+ org.eclipse.papyrus.table.instance.papyrustableinstance.util;
uses:="org.eclipse.emf.ecore.util,
org.eclipse.emf.ecore,
- org.eclipse.papyrus.nattable.instance.papyrustableinstance,
org.eclipse.emf.common.notify.impl,
org.eclipse.emf.common.notify"
-Bundle-Activator: org.eclipse.papyrus.nattable.instance.Activator
+Bundle-Activator: org.eclipse.papyrus.table.instance.Activator
diff --git a/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.ecore b/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.ecore
index ca8c8ce5d69..7de4d7f390d 100644
--- a/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.ecore
+++ b/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.ecore
@@ -2,7 +2,7 @@
<ecore:EPackage xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="papyrustableinstance"
- nsURI="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" nsPrefix="org.eclipse.papyrus.nattable.instance.papyrustableinstance">
+ nsURI="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" nsPrefix="org.eclipse.papyrus.table.instance.papyrustableinstance">
<eClassifiers xsi:type="ecore:EClass" name="PapyrusTableInstance">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral="no name">
diff --git a/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.genmodel b/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.genmodel
index 647d8d773d0..8b4e8745c6c 100644
--- a/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.genmodel
+++ b/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.genmodel
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.nattable.instance/src"
- modelPluginID="org.eclipse.papyrus.nattable.instance" modelName="Papyrustableinstance"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.table.instance/src"
+ modelPluginID="org.eclipse.papyrus.table.instance" modelName="Papyrustableinstance"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
usedGenPackages="platform:/plugin/org.eclipse.emf.facet.widgets.celleditors/model/celleditors.genmodel#//modelCellEditor platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.facet.infra.facet/model/facet.genmodel#//facet platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.emf.facet.widgets.nattable.tableconfiguration/model/tableConfiguration.genmodel#//tableconfiguration platform:/plugin/org.eclipse.emf.facet.widgets.nattable.instance/model/tableinstance.genmodel#//tableinstance platform:/plugin/org.eclipse.emf.facet.widgets.nattable.instance/model/tableinstance2.genmodel#//tableinstance2 platform:/plugin/org.eclipse.emf.facet.infra.browser.custom/models/uiCustom.genmodel#//custom">
<foreignModel>papyrustableinstance.ecore</foreignModel>
- <genPackages prefix="Papyrustableinstance" basePackage="org.eclipse.papyrus.nattable.instance"
+ <genPackages prefix="Papyrustableinstance" basePackage="org.eclipse.papyrus.table.instance"
disposableProviderFactory="true" ecorePackage="papyrustableinstance.ecore#/">
<genClasses ecoreClass="papyrustableinstance.ecore#//PapyrusTableInstance">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrustableinstance.ecore#//PapyrusTableInstance/name"/>
diff --git a/incoming/org.eclipse.papyrus.table.instance/plugin.xml b/incoming/org.eclipse.papyrus.table.instance/plugin.xml
index b44febede37..c6ef3e422f0 100644
--- a/incoming/org.eclipse.papyrus.table.instance/plugin.xml
+++ b/incoming/org.eclipse.papyrus.table.instance/plugin.xml
@@ -13,7 +13,7 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance"
- class="org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage"
+ class="org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage"
genModel="model/papyrusnattableinstance.genmodel"/>
</extension>
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/Activator.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java
index 20be3666520..8b42788be9f 100644
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/Activator.java
+++ b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java
@@ -11,7 +11,7 @@
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.nattable.instance;
+package org.eclipse.papyrus.table.instance;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.nattable.instance"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.table.instance"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
@@ -39,7 +39,7 @@ public class Activator extends AbstractUIPlugin {
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@Override
- public void start(BundleContext context) throws Exception {
+ public void start(final BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
@@ -50,7 +50,7 @@ public class Activator extends AbstractUIPlugin {
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
@Override
- public void stop(BundleContext context) throws Exception {
+ public void stop(final BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/PapyrusTableInstance.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrusTableInstance.java
index 4122061c211..02a39dd51f6 100644
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/PapyrusTableInstance.java
+++ b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrusTableInstance.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.nattable.instance.papyrustableinstance;
+package org.eclipse.papyrus.table.instance.papyrustableinstance;
import org.eclipse.emf.common.util.EList;
@@ -22,15 +22,15 @@ import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.TableInsta
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}</li>
- * <li>{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}</li>
- * <li>{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries <em>Filling Queries</em>}</li>
+ * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}</li>
+ * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries <em>Filling Queries</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance()
* @model
* @generated
*/
@@ -45,14 +45,14 @@ public interface PapyrusTableInstance extends EObject {
* <!-- end-model-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Name()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Name()
* @model default="no name"
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
@@ -71,14 +71,14 @@ public interface PapyrusTableInstance extends EObject {
* <!-- end-model-doc -->
* @return the value of the '<em>Type</em>' attribute.
* @see #setType(String)
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Type()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Type()
* @model default="PapyrusDefaultTable"
* @generated
*/
String getType();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Type</em>' attribute.
@@ -97,14 +97,14 @@ public interface PapyrusTableInstance extends EObject {
* <!-- end-model-doc -->
* @return the value of the '<em>Is Synchronized</em>' attribute.
* @see #setIsSynchronized(boolean)
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_IsSynchronized()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_IsSynchronized()
* @model default="false"
* @generated
*/
boolean isIsSynchronized();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Is Synchronized</em>' attribute.
@@ -122,14 +122,14 @@ public interface PapyrusTableInstance extends EObject {
* <!-- end-model-doc -->
* @return the value of the '<em>Table</em>' reference.
* @see #setTable(TableInstance2)
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Table()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Table()
* @model
* @generated
*/
TableInstance2 getTable();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Table</em>' reference.
@@ -147,7 +147,7 @@ public interface PapyrusTableInstance extends EObject {
* The queries used to fill the table
* <!-- end-model-doc -->
* @return the value of the '<em>Filling Queries</em>' reference list.
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_FillingQueries()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_FillingQueries()
* @model
* @generated
*/
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/PapyrustableinstanceFactory.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java
index e4224f6b1b7..f4dd30e64ab 100644
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/PapyrustableinstanceFactory.java
+++ b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.nattable.instance.papyrustableinstance;
+package org.eclipse.papyrus.table.instance.papyrustableinstance;
import org.eclipse.emf.ecore.EFactory;
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory;
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage
* @generated
*/
public interface PapyrustableinstanceFactory extends EFactory {
@@ -23,7 +23,7 @@ public interface PapyrustableinstanceFactory extends EFactory {
* <!-- end-user-doc -->
* @generated
*/
- PapyrustableinstanceFactory eINSTANCE = org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrustableinstanceFactoryImpl.init();
+ PapyrustableinstanceFactory eINSTANCE = org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrustableinstanceFactoryImpl.init();
/**
* Returns a new object of class '<em>Papyrus Table Instance</em>'.
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/PapyrustableinstancePackage.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstancePackage.java
index eaed7f04412..59a8a4511c6 100644
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/PapyrustableinstancePackage.java
+++ b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstancePackage.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.nattable.instance.papyrustableinstance;
+package org.eclipse.papyrus.table.instance.papyrustableinstance;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstanceFactory
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstanceFactory
* @model kind="package"
* @generated
*/
@@ -49,7 +49,7 @@ public interface PapyrustableinstancePackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- String eNS_PREFIX = "org.eclipse.papyrus.nattable.instance.papyrustableinstance";
+ String eNS_PREFIX = "org.eclipse.papyrus.table.instance.papyrustableinstance";
/**
* The singleton instance of the package.
@@ -57,14 +57,14 @@ public interface PapyrustableinstancePackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- PapyrustableinstancePackage eINSTANCE = org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl.init();
+ PapyrustableinstancePackage eINSTANCE = org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl <em>Papyrus Table Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl <em>Papyrus Table Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl#getPapyrusTableInstance()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl#getPapyrusTableInstance()
* @generated
*/
int PAPYRUS_TABLE_INSTANCE = 0;
@@ -125,65 +125,65 @@ public interface PapyrustableinstancePackage extends EPackage {
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance <em>Papyrus Table Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance <em>Papyrus Table Instance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Papyrus Table Instance</em>'.
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance
* @generated
*/
EClass getPapyrusTableInstance();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getName()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getName()
* @see #getPapyrusTableInstance()
* @generated
*/
EAttribute getPapyrusTableInstance_Name();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Type</em>'.
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getType()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getType()
* @see #getPapyrusTableInstance()
* @generated
*/
EAttribute getPapyrusTableInstance_Type();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Is Synchronized</em>'.
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized()
* @see #getPapyrusTableInstance()
* @generated
*/
EAttribute getPapyrusTableInstance_IsSynchronized();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Table</em>'.
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getTable()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getTable()
* @see #getPapyrusTableInstance()
* @generated
*/
EReference getPapyrusTableInstance_Table();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries <em>Filling Queries</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries <em>Filling Queries</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>Filling Queries</em>'.
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries()
* @see #getPapyrusTableInstance()
* @generated
*/
@@ -212,11 +212,11 @@ public interface PapyrustableinstancePackage extends EPackage {
*/
interface Literals {
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl <em>Papyrus Table Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl <em>Papyrus Table Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl#getPapyrusTableInstance()
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl#getPapyrusTableInstance()
* @generated
*/
EClass PAPYRUS_TABLE_INSTANCE = eINSTANCE.getPapyrusTableInstance();
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java
index 33bfff730b2..b1a8c7563a8 100644
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java
+++ b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl;
+package org.eclipse.papyrus.table.instance.papyrustableinstance.impl;
import java.util.Collection;
@@ -24,8 +24,8 @@ import org.eclipse.emf.facet.infra.query.ModelQuery;
import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.TableInstance2;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage;
/**
* <!-- begin-user-doc -->
@@ -34,11 +34,11 @@ import org.eclipse.papyrus.nattable.instance.papyrustableinstance.Papyrustablein
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#isIsSynchronized <em>Is Synchronized</em>}</li>
- * <li>{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getTable <em>Table</em>}</li>
- * <li>{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getFillingQueries <em>Filling Queries</em>}</li>
+ * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#isIsSynchronized <em>Is Synchronized</em>}</li>
+ * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getFillingQueries <em>Filling Queries</em>}</li>
* </ul>
* </p>
*
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java
index c03e4f4fbbe..8e1eff8a5ac 100644
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java
+++ b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl;
+package org.eclipse.papyrus.table.instance.papyrustableinstance.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.*;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.*;
/**
* <!-- begin-user-doc -->
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java
index 390a553d84a..d3d504c77cc 100644
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java
+++ b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.nattable.instance.papyrustableinstance.impl;
+package org.eclipse.papyrus.table.instance.papyrustableinstance.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -17,9 +17,9 @@ import org.eclipse.emf.facet.infra.query.QueryPackage;
import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.Tableinstance2Package;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstanceFactory;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstanceFactory;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage;
/**
* <!-- begin-user-doc -->
@@ -46,7 +46,7 @@ public class PapyrustableinstancePackageImpl extends EPackageImpl implements Pap
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage#eNS_URI
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#eNS_URI
* @see #init()
* @generated
*/
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java
index d44b9e5c147..86263902a72 100644
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java
+++ b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.eclipse.papyrus.nattable.instance.papyrustableinstance.util;
+package org.eclipse.papyrus.table.instance.papyrustableinstance.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -13,14 +13,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.*;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.*;
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage
* @generated
*/
public class PapyrustableinstanceAdapterFactory extends AdapterFactoryImpl {
@@ -96,13 +96,13 @@ public class PapyrustableinstanceAdapterFactory extends AdapterFactoryImpl {
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance <em>Papyrus Table Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance <em>Papyrus Table Instance</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance
* @generated
*/
public Adapter createPapyrusTableInstanceAdapter() {
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java
index 80cb581ad9c..ffe19768518 100644
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/nattable/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java
+++ b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java
@@ -4,14 +4,14 @@
*
* $Id$
*/
-package org.eclipse.papyrus.nattable.instance.papyrustableinstance.util;
+package org.eclipse.papyrus.table.instance.papyrustableinstance.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.*;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.*;
/**
* <!-- begin-user-doc -->
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.nattable.instance.papyrustableinstance.*;
* until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrustableinstancePackage
+ * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage
* @generated
*/
public class PapyrustableinstanceSwitch<T> extends Switch<T> {
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.table.modelexplorer/META-INF/MANIFEST.MF
index 319fc2785f5..cefc7d7d11b 100644
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.table.modelexplorer/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Require-Bundle: org.eclipse.papyrus.resource,
org.eclipse.emf.facet.infra.browser.custom.core,
org.eclipse.papyrus.modelexplorer;bundle-version="0.8.0",
org.eclipse.core.expressions,
- org.eclipse.papyrus.nattable.instance;bundle-version="0.8.0",
- org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0"
+ org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0",
+ org.eclipse.papyrus.table.instance
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: %pluginName
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java
index 25ba3762c4b..bd55e95e3bd 100644
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java
+++ b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.modelexplorer.handler.AbstractCommandHandler;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.ui.PlatformUI;
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DeleteTableHandler.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DeleteTableHandler.java
index 6bdc51ef722..0826985bb33 100644
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DeleteTableHandler.java
+++ b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DeleteTableHandler.java
@@ -23,8 +23,8 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.command.RemoveCommand;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
/**
* Handler for the delete Table action
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DuplicateTableHandler.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DuplicateTableHandler.java
index df786b474cf..f5f201b8e52 100644
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DuplicateTableHandler.java
+++ b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DuplicateTableHandler.java
@@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.edit.command.AddCommand;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.table.modelexplorer.messages.Messages;
/**
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/RenameTableHandler.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/RenameTableHandler.java
index a12f308daa1..e2868a96bfc 100644
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/RenameTableHandler.java
+++ b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/RenameTableHandler.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.window.Window;
import org.eclipse.papyrus.modelexplorer.handler.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.table.modelexplorer.messages.Messages;
import org.eclipse.swt.widgets.Display;
@@ -58,7 +58,7 @@ public class RenameTableHandler extends AbstractTableModelExplorerHandler {
AbstractTransactionalCommand cmd = new AbstractTransactionalCommand(editingDomain, "RenameTableCommand", null) { //$NON-NLS-1$
@Override
- protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) {
+ protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) {
InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), Messages.RenameTableHandler_RenameAnExistingTable_Title, Messages.RenameTableHandler_NewNameMessage, currentName, null);
if(dialog.open() == Window.OK) {
final String name = dialog.getValue();
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableContentProvider.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableContentProvider.java
index de9f11c1429..50335192c8c 100644
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableContentProvider.java
+++ b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableContentProvider.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.modelexplorer.MoDiscoContentProvider;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
/**
* This class provides a NavigatorContentProvider used to display tables in the Model Explorer
@@ -39,7 +39,7 @@ public class NavigatorTableContentProvider extends MoDiscoContentProvider {
* @return
*/
@Override
- public boolean hasChildren(Object element) {
+ public boolean hasChildren(final Object element) {
return getChildren(element).length > 0;
}
@@ -68,7 +68,7 @@ public class NavigatorTableContentProvider extends MoDiscoContentProvider {
* the owner of the tables
* @return the list of tables contained by the given owner
*/
- private List<PapyrusTableInstance> findAllExistingPapyrusTables(EObject owner) {
+ private List<PapyrusTableInstance> findAllExistingPapyrusTables(final EObject owner) {
ArrayList<PapyrusTableInstance> tables = new ArrayList<PapyrusTableInstance>();
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableLabelProvider.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableLabelProvider.java
index f1e16ab516c..08a8d36090a 100644
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableLabelProvider.java
+++ b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableLabelProvider.java
@@ -14,7 +14,7 @@
package org.eclipse.papyrus.table.modelexplorer.providers;
import org.eclipse.papyrus.modelexplorer.MoDiscoLabelProvider;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.swt.graphics.Image;
/**
@@ -31,7 +31,7 @@ public class NavigatorTableLabelProvider extends MoDiscoLabelProvider {
* evaluates error markers.
*/
@Override
- public Image getImage(Object element) {
+ public Image getImage(final Object element) {
if(element instanceof PapyrusTableInstance) {
return getEditorRegistry().getEditorIcon(element);
}
@@ -46,7 +46,7 @@ public class NavigatorTableLabelProvider extends MoDiscoLabelProvider {
* @return
*/
@Override
- public String getText(Object element) {
+ public String getText(final Object element) {
if(element instanceof PapyrusTableInstance) {
return ((PapyrusTableInstance)element).getName();
}
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/TablePropertyTester.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/TablePropertyTester.java
index a54184ea83f..c3b809f1516 100644
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/TablePropertyTester.java
+++ b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/TablePropertyTester.java
@@ -18,7 +18,7 @@ import java.util.Iterator;
import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
/**
* This class provides test called by the plugin.xml in order to know if handlers should be active or not.
@@ -46,7 +46,7 @@ public class TablePropertyTester extends PropertyTester {
* @param expectedValue
* @return
*/
- public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+ public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {
if(IS_TABLE.equals(property) && receiver instanceof IStructuredSelection) {
boolean answer = isTable((IStructuredSelection)receiver);
return new Boolean(answer).equals(expectedValue);
@@ -63,7 +63,7 @@ public class TablePropertyTester extends PropertyTester {
* @return
* <code>true</code> if the selection is composed by {@link TableInstance}
*/
- private boolean isTable(IStructuredSelection selection) {
+ private boolean isTable(final IStructuredSelection selection) {
if(!selection.isEmpty()) {
Iterator<?> iter = selection.iterator();
while(iter.hasNext()) {

Back to the top