diff options
author | cletavernie | 2011-11-10 08:14:45 +0000 |
---|---|---|
committer | cletavernie | 2011-11-10 08:14:45 +0000 |
commit | 4f79bbf2b74ba4c2373f3a7d529cc7e3cfdbe53a (patch) | |
tree | 5145c33a6bfdefe55f674e2dd4737e9a8f8130f2 | |
parent | f860ac488f517747a1d69c92be2e6541d03e1afc (diff) | |
download | org.eclipse.papyrus-4f79bbf2b74ba4c2373f3a7d529cc7e3cfdbe53a.tar.gz org.eclipse.papyrus-4f79bbf2b74ba4c2373f3a7d529cc7e3cfdbe53a.tar.xz org.eclipse.papyrus-4f79bbf2b74ba4c2373f3a7d529cc7e3cfdbe53a.zip |
362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name
https://bugs.eclipse.org/bugs/show_bug.cgi?id=362162
243 files changed, 758 insertions, 770 deletions
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.core.resources.prefs b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.core.resources.prefs index a9200897c0a..e2ae99e6efc 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.core.resources.prefs +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Thu Feb 24 14:23:44 CET 2011
+#Fri Nov 04 17:01:15 CET 2011
eclipse.preferences.version=1
-encoding//src/org/eclipse/papyrus/table/common/messages/messages.properties=ISO-8859-1
+encoding//src/org/eclipse/papyrus/infra/table/common/messages/messages.properties=ISO-8859-1
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF index 1b6614f9ec0..c373852c7ad 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF @@ -12,21 +12,21 @@ Require-Bundle: org.eclipse.emf.facet.widgets.nattable.instance, org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",
org.eclipse.papyrus.infra.services.edit;bundle-version="0.9.0",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.9.0"
-Export-Package: org.eclipse.papyrus.table.common,
- org.eclipse.papyrus.table.common.dialog,
- org.eclipse.papyrus.table.common.editor,
- org.eclipse.papyrus.table.common.factory,
- org.eclipse.papyrus.table.common.handlers,
- org.eclipse.papyrus.table.common.messages,
- org.eclipse.papyrus.table.common.modelresource,
- org.eclipse.papyrus.table.common.util
+Export-Package: org.eclipse.papyrus.infra.table.common,
+ org.eclipse.papyrus.infra.table.common.dialog,
+ org.eclipse.papyrus.infra.table.common.editor,
+ org.eclipse.papyrus.infra.table.common.factory,
+ org.eclipse.papyrus.infra.table.common.handlers,
+ org.eclipse.papyrus.infra.table.common.messages,
+ org.eclipse.papyrus.infra.table.common.modelresource,
+ org.eclipse.papyrus.infra.table.common.util
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.table.common.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.table.common.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.table.common;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.properties b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.properties index fb4c3c55ce0..63682e7d5e8 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.properties +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.properties @@ -1,3 +1,3 @@ -#Properties file for org.eclipse.papyrus.table.common
+#Properties file for org.eclipse.papyrus.infra.table.common
providerName = Eclipse Modeling Project
pluginName = Common Plugin for Papyrus Table Editor
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.xml b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.xml index 10c8c162afc..32fd466c15b 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.xml +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.xml @@ -4,10 +4,10 @@ <plugin>
<!--We declare the model used for the Papyrus Table Editor -->
- <extension point="org.eclipse.papyrus.core.model">
- <model classname="org.eclipse.papyrus.table.common.modelresource.EMFFacetNattableModel" description="Model for Papyrus Table editors">
+ <extension point="org.eclipse.papyrus.infra.core.model">
+ <model classname="org.eclipse.papyrus.infra.table.common.modelresource.EMFFacetNattableModel" description="Model for Papyrus Table editors">
</model>
- <model classname="org.eclipse.papyrus.table.common.modelresource.PapyrusNattableModel" description="Model for Papyrus Table editors">
+ <model classname="org.eclipse.papyrus.infra.table.common.modelresource.PapyrusNattableModel" description="Model for Papyrus Table editors">
</model>
</extension>
<extension id="papyrus.table.menuspapyrus.table.menu" name="Papyrus Table Menus" point="org.eclipse.ui.menus">
@@ -15,11 +15,11 @@ <menu icon="icons/table.gif" id="org.eclipse.papyrus.views.modelexplorer.popupmenu.createtable" label="New Table" mnemonic="&T" tooltip="The table menu">
</menu>
</menuContribution>
- <menuContribution allPopups="false" locationURI="menu:org.eclipse.papyrus.ui.menu?after=org.eclipse.papyrus.diagram.ui.menu.diagrams">
+ <menuContribution allPopups="false" locationURI="menu:org.eclipse.papyrus.ui.menu?after=org.eclipse.papyrus.uml.diagram.ui.menu.diagrams">
<menu icon="icons/table.gif" id="org.eclipse.papyrus.table.ui.menu.tables" label="Tables" mnemonic="&T" tooltip="The table menu">
</menu>
</menuContribution>
- <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?endof=org.eclipse.papyrus.diagram.ui.toolbar">
+ <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?endof=org.eclipse.papyrus.uml.diagram.ui.toolbar">
<toolbar id="org.eclipse.papyrus.table.ui.toolbar" label="Papyrus Table Toolbar">
</toolbar>
</menuContribution>
@@ -30,7 +30,7 @@ <extension
point="org.eclipse.emf.facet.widgets.celleditors.commandFactories">
<commandFactory
- class="org.eclipse.papyrus.table.common.factory.PapyrusCommandFactory">
+ class="org.eclipse.papyrus.infra.table.common.factory.PapyrusCommandFactory">
</commandFactory>
</extension>
</plugin>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/Activator.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/Activator.java index 9a9581ec2e2..8eea7633de3 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/Activator.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/Activator.java @@ -11,9 +11,9 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.common;
+package org.eclipse.papyrus.infra.table.common;
-import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/dialog/TwoInputDialog.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/dialog/TwoInputDialog.java index c52bd76b058..2c2f14a47d2 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/dialog/TwoInputDialog.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/dialog/TwoInputDialog.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.common.dialog;
+package org.eclipse.papyrus.infra.table.common.dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IInputValidator;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/editor/AbstractNattableEditor.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/editor/AbstractNattableEditor.java index 9a5a55c1d24..83c32982429 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/editor/AbstractNattableEditor.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/editor/AbstractNattableEditor.java @@ -11,7 +11,7 @@ * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
* Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.table.common.editor;
+package org.eclipse.papyrus.infra.table.common.editor;
import java.util.ArrayList;
import java.util.Collection;
@@ -38,15 +38,15 @@ import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstan import org.eclipse.emf.facet.widgets.nattable.internal.NatTableWidgetInternalUtils;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.TriggerListener;
-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.table.common.internal.IPapyrusNatTableWidget;
-import org.eclipse.papyrus.table.common.internal.TableEditorInput;
-import org.eclipse.papyrus.table.common.listener.ModelTriggerListener;
-import org.eclipse.papyrus.table.common.listener.TableTriggerListener;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.table.common.internal.IPapyrusNatTableWidget;
+import org.eclipse.papyrus.infra.table.common.internal.TableEditorInput;
+import org.eclipse.papyrus.infra.table.common.listener.ModelTriggerListener;
+import org.eclipse.papyrus.infra.table.common.listener.TableTriggerListener;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
@@ -57,7 +57,7 @@ import org.eclipse.ui.PartInitException; *
*
*/
-public abstract class AbstractNattableEditor extends org.eclipse.papyrus.table.common.internal.NatTableEditor {
+public abstract class AbstractNattableEditor extends org.eclipse.papyrus.infra.table.common.internal.NatTableEditor {
/** the service registry */
protected ServicesRegistry servicesRegistry;
@@ -121,7 +121,7 @@ public abstract class AbstractNattableEditor extends org.eclipse.papyrus.table.c /**
*
- * @see org.eclipse.papyrus.table.common.internal.NatTableEditor#dispose()
+ * @see org.eclipse.papyrus.infra.table.common.internal.NatTableEditor#dispose()
*
* {@inheritDoc}
*/
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/factory/AbstractNattableEditorFactory.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/AbstractNattableEditorFactory.java index 9b91182dae3..5c05e155184 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/factory/AbstractNattableEditorFactory.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/AbstractNattableEditorFactory.java @@ -11,19 +11,19 @@ * Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
* Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.table.common.factory;
+package org.eclipse.papyrus.infra.table.common.factory;
import java.lang.reflect.Constructor;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.core.editor.BackboneException;
-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.sasheditor.contentprovider.IEditorModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.extension.diagrameditor.AbstractEditorFactory;
+import org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor.ActionBarContributorRegistry;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
@@ -53,7 +53,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor /**
* Create the IPageModel that is used by the SashWindows to manage the editor.
*
- * @see org.eclipse.papyrus.core.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)
+ * @see org.eclipse.papyrus.infra.core.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)
*
* @param pageIdentifier
* The model pushed in the sashmodel by the creation command
@@ -64,7 +64,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor }
/**
- * @see org.eclipse.papyrus.core.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)
+ * @see org.eclipse.papyrus.infra.core.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)
*
* @param pageIdentifier
* @return
@@ -112,7 +112,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor /**
* Create the IEditor for the diagram.
*
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#createIEditorPart()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart()
* @return
* @throws PartInitException
*
@@ -137,7 +137,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor /**
* Get the action bar requested by the Editor.
*
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#getActionBarContributor()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor()
* @return
*
*/
@@ -176,7 +176,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor /**
* Get the underlying RawModel. Return the Diagram.
*
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getRawModel()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel()
* @return
*
*/
@@ -187,7 +187,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor /**
* Get the icon to be shown by Tabs
*
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabIcon()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabIcon()
* @return
*
*/
@@ -202,7 +202,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor /**
* Get the title of the Diagram.
*
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabTitle()
+ * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabTitle()
* @return
*
*/
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/factory/PapyrusCommandFactory.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/PapyrusCommandFactory.java index 90f8af5cacd..e8cb358cef0 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/factory/PapyrusCommandFactory.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/PapyrusCommandFactory.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.common.factory;
+package org.eclipse.papyrus.infra.table.common.factory;
import java.util.ArrayList;
import java.util.List;
@@ -40,9 +40,9 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest; import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.service.edit.service.IElementEditService;
-import org.eclipse.papyrus.table.common.Activator;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.table.common.Activator;
/**
*
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/handlers/AbstractCreateNattableEditorCommand.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/handlers/AbstractCreateNattableEditorCommand.java index 13f7bd8bdcc..90b12229ecf 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/handlers/AbstractCreateNattableEditorCommand.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/handlers/AbstractCreateNattableEditorCommand.java @@ -12,7 +12,7 @@ * Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.table.common.handlers;
+package org.eclipse.papyrus.infra.table.common.handlers;
import java.util.ArrayList;
import java.util.Collection;
@@ -49,26 +49,26 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.commands.CheckedOperationHistory;
-import org.eclipse.papyrus.core.editor.BackboneException;
-import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
-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.resource.AbstractBaseModel;
-import org.eclipse.papyrus.resource.IModel;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.NotFoundException;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.table.common.Activator;
-import org.eclipse.papyrus.table.common.dialog.TwoInputDialog;
-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.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.NotFoundException;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
+import org.eclipse.papyrus.infra.table.common.Activator;
+import org.eclipse.papyrus.infra.table.common.dialog.TwoInputDialog;
+import org.eclipse.papyrus.infra.table.common.messages.Messages;
+import org.eclipse.papyrus.infra.table.common.modelresource.EMFFacetNattableModel;
+import org.eclipse.papyrus.infra.table.common.modelresource.PapyrusNattableModel;
+import org.eclipse.papyrus.infra.table.common.util.QueryRepresentation;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstanceFactory;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
import org.eclipse.uml2.uml.Element;
@@ -405,7 +405,7 @@ public abstract class AbstractCreateNattableEditorCommand extends AbstractHandle if(modelSet != null) {
- IModel model = modelSet.getModel(org.eclipse.papyrus.resource.uml.UmlModel.MODEL_ID);
+ IModel model = modelSet.getModel(org.eclipse.papyrus.infra.core.resource.uml.UmlModel.MODEL_ID);
if(model instanceof AbstractBaseModel) {
return getRootElement(((AbstractBaseModel)model).getResource());
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/handlers/CreateNewElementContributionItem.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/handlers/CreateNewElementContributionItem.java index 090a854e064..82b8367cd71 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/handlers/CreateNewElementContributionItem.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/handlers/CreateNewElementContributionItem.java @@ -9,7 +9,7 @@ * Contributors:
* Nicolas Guyomar (Mia-Software) - Bug 335020 - Nattable widget should use the Eclipse framework
*******************************************************************************/
-package org.eclipse.papyrus.table.common.handlers;
+package org.eclipse.papyrus.infra.table.common.handlers;
import org.eclipse.emf.facet.widgets.nattable.INatTableWidget;
import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/internal/IPapyrusNatTableWidget.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/IPapyrusNatTableWidget.java index f135c973753..e0499976409 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/internal/IPapyrusNatTableWidget.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/IPapyrusNatTableWidget.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.common.internal;
+package org.eclipse.papyrus.infra.table.common.internal;
import java.util.List;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/internal/NatTableEditor.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/NatTableEditor.java index 5643657d0ea..4a5f53d4b78 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/internal/NatTableEditor.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/NatTableEditor.java @@ -19,7 +19,7 @@ * Nicolas Guyomar (Mia-Software) - Bug 335154 - Sort Column By Type : Cannot modify resource set without a write transaction
* Nicolas Guyomar (Mia-Software) - Bug 335020 - Nattable widget should use the Eclipse framework
*******************************************************************************/
-package org.eclipse.papyrus.table.common.internal;
+package org.eclipse.papyrus.infra.table.common.internal;
import java.util.EventObject;
import java.util.HashMap;
@@ -56,14 +56,14 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.properties.databinding.EMFObservableValue;
-import org.eclipse.papyrus.table.common.messages.Messages;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage;
+import org.eclipse.papyrus.infra.table.common.messages.Messages;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage;
+import org.eclipse.papyrus.infra.widgets.editors.BooleanRadio;
+import org.eclipse.papyrus.infra.widgets.editors.StringEditor;
+import org.eclipse.papyrus.infra.widgets.editors.StringLabel;
import org.eclipse.papyrus.uml.diagram.common.providers.EditorLabelProvider;
-import org.eclipse.papyrus.widgets.editors.BooleanRadio;
-import org.eclipse.papyrus.widgets.editors.StringEditor;
-import org.eclipse.papyrus.widgets.editors.StringLabel;
+import org.eclipse.papyrus.views.properties.databinding.EMFObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -197,8 +197,8 @@ public class NatTableEditor extends EditorPart implements ISelectionProvider, IE this.menuMgr.setRemoveAllWhenShown(true);
final Composite editorComposite = createCompositeCompositeWthTableBorder(parent);
-// createFirstLine(editorComposite);
-// createDescription(editorComposite);
+ // createFirstLine(editorComposite);
+ // createDescription(editorComposite);
// the composite owning the table
final Composite tableComposite = new Composite(editorComposite, SWT.NONE);
@@ -223,7 +223,7 @@ public class NatTableEditor extends EditorPart implements ISelectionProvider, IE // the nattable widget itself
//old instanciation
// this.natTableWidget = INatTableWidgetFactory.INSTANCE.createNatTableWidget(tableComposite, this, this.tableEditorInput.getPapyrusTableInstance().getTable(), this.menuMgr);
- this.natTableWidget = new PapyrusNatTableWidget(tableComposite, natTableEditor, table, this.menuMgr);
+ this.natTableWidget = new PapyrusNatTableWidget(tableComposite, natTableEditor, table, this.menuMgr);
final GridData tableGridData = new GridData();
tableGridData.grabExcessHorizontalSpace = true;
tableGridData.grabExcessVerticalSpace = true;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/internal/PapyrusNatTableWidget.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/PapyrusNatTableWidget.java index e57391b94bc..f947cdeb9b5 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/internal/PapyrusNatTableWidget.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/PapyrusNatTableWidget.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.common.internal;
+package org.eclipse.papyrus.infra.table.common.internal;
import java.util.ArrayList;
import java.util.HashSet;
@@ -89,7 +89,7 @@ public class PapyrusNatTableWidget extends NatTableWidget implements IPapyrusNat /**
*
- * @see org.eclipse.papyrus.table.common.internal.IPapyrusNatTableWidget#addRowsOutOfCommandStack(java.util.List)
+ * @see org.eclipse.papyrus.infra.table.common.internal.IPapyrusNatTableWidget#addRowsOutOfCommandStack(java.util.List)
*
* {@inheritDoc}
*/
@@ -174,7 +174,7 @@ public class PapyrusNatTableWidget extends NatTableWidget implements IPapyrusNat /**
*
- * @see org.eclipse.papyrus.table.common.internal.IPapyrusNatTableWidget#removeRowsOutOfCommandStack(java.util.List)
+ * @see org.eclipse.papyrus.infra.table.common.internal.IPapyrusNatTableWidget#removeRowsOutOfCommandStack(java.util.List)
*
* {@inheritDoc}
*/
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/internal/TableEditorInput.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/TableEditorInput.java index ec776c5db29..621e09c3891 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/internal/TableEditorInput.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/TableEditorInput.java @@ -10,11 +10,11 @@ * Nicolas Guyomar (Mia-Software) - Bug 332924 - To be able to save the table
* Nicolas Guyomar (Mia-Software) - Bug 333029 - To be able to save the size of the lines and the columns
*******************************************************************************/
-package org.eclipse.papyrus.table.common.internal;
+package org.eclipse.papyrus.infra.table.common.internal;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/listener/AbstractSynchronizedTableTriggerListener.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/AbstractSynchronizedTableTriggerListener.java index 872a0dabb56..1e04bb33546 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/listener/AbstractSynchronizedTableTriggerListener.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/AbstractSynchronizedTableTriggerListener.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.common.listener;
+package org.eclipse.papyrus.infra.table.common.listener;
import java.util.ArrayList;
import java.util.Collection;
@@ -44,8 +44,8 @@ import org.eclipse.emf.transaction.TriggerListener; import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.table.common.Activator;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.common.Activator;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
/**
*
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/listener/ModelTriggerListener.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/ModelTriggerListener.java index 7d924deef18..549f1e3ce8b 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/listener/ModelTriggerListener.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/ModelTriggerListener.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.common.listener;
+package org.eclipse.papyrus.infra.table.common.listener;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.notify.Notification;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.xmi.XMIResource;
import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
/**
*
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/listener/TableTriggerListener.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/TableTriggerListener.java index ec0fbfae751..423fffede80 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/listener/TableTriggerListener.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/TableTriggerListener.java @@ -11,15 +11,15 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.common.listener;
+package org.eclipse.papyrus.infra.table.common.listener;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage;
/**
*
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/messages/Messages.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/Messages.java index f40e49d1226..ea598f974a1 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/messages/Messages.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/Messages.java @@ -11,13 +11,13 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.common.messages;
+package org.eclipse.papyrus.infra.table.common.messages;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.table.common.messages.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.table.common.messages.messages"; //$NON-NLS-1$
public static String AbstractCreateNattableEditorCommand_CreateNewTableDialog_TableDescriptionMessage;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/messages/messages.properties b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/messages.properties index 4a229edb74b..4a229edb74b 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/messages/messages.properties +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/messages.properties diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/modelresource/EMFFacetNattableModel.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/EMFFacetNattableModel.java index 284e618801b..566b81730f0 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/modelresource/EMFFacetNattableModel.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/EMFFacetNattableModel.java @@ -12,14 +12,14 @@ *
*****************************************************************************/
-package org.eclipse.papyrus.table.common.modelresource;
+package org.eclipse.papyrus.infra.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.resource.AbstractModelWithSharedResource;
-import org.eclipse.papyrus.resource.IModel;
-import org.eclipse.papyrus.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
@@ -69,7 +69,7 @@ public class EMFFacetNattableModel extends /* AbstractBaseModel */AbstractModelW /**
* Get the file extension used for this model.
*
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
*
* @return
*/
@@ -81,7 +81,7 @@ public class EMFFacetNattableModel extends /* AbstractBaseModel */AbstractModelW /**
* Get the identifier used to register this model.
*
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
*
* @return
*/
@@ -113,7 +113,7 @@ public class EMFFacetNattableModel extends /* AbstractBaseModel */AbstractModelW /**
*
- * @see org.eclipse.papyrus.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)
*
* @param object
* @return
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/modelresource/PapyrusNattableModel.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/PapyrusNattableModel.java index 25ad302a6b0..c31d7de1ee6 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/modelresource/PapyrusNattableModel.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/PapyrusNattableModel.java @@ -12,15 +12,15 @@ *
*****************************************************************************/
-package org.eclipse.papyrus.table.common.modelresource;
+package org.eclipse.papyrus.infra.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.resource.AbstractModelWithSharedResource;
-import org.eclipse.papyrus.resource.IModel;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
@@ -70,7 +70,7 @@ public class PapyrusNattableModel extends AbstractModelWithSharedResource<TableI /**
* Get the file extension used for this model.
*
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
*
* @return
*/
@@ -82,7 +82,7 @@ public class PapyrusNattableModel extends AbstractModelWithSharedResource<TableI /**
* Get the identifier used to register this model.
*
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
*
* @return
*/
@@ -114,7 +114,7 @@ public class PapyrusNattableModel extends AbstractModelWithSharedResource<TableI /**
*
- * @see org.eclipse.papyrus.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)
*
* @param object
* @return
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/util/QueryRepresentation.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/util/QueryRepresentation.java index 53a73f4d714..24ccc28fba2 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/util/QueryRepresentation.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/util/QueryRepresentation.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.common.util;
+package org.eclipse.papyrus.infra.table.common.util;
/**
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF index 1796c948505..062d037463c 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0
-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;
+Export-Package: org.eclipse.papyrus.infra.table.instance,
+ org.eclipse.papyrus.infra.table.instance.papyrustableinstance;uses:="org.eclipse.emf.ecore,org.eclipse.emf.facet.widgets.nattable.instance.tableinstance",
+ org.eclipse.papyrus.infra.table.instance.papyrustableinstance.util;
uses:="org.eclipse.emf.ecore.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common.notify.impl,
@@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.core.runtime, Bundle-Vendor: %providerName
Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.table.instance.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.table.instance.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.table.instance;singleton:=true
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.ecore b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.ecore index 7de4d7f390d..5b9bc30260d 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.ecore +++ b/plugins/infra/table/org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance">
+ nsURI="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" nsPrefix="org.eclipse.papyrus.infra.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/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.genmodel b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.genmodel index 8b4e8745c6c..d98cf5d65bd 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.genmodel +++ b/plugins/infra/table/org.eclipse.papyrus.infra.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.table.instance/src"
- modelPluginID="org.eclipse.papyrus.table.instance" modelName="Papyrustableinstance"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.table.instance/src"
+ modelPluginID="org.eclipse.papyrus.infra.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.table.instance"
+ <genPackages prefix="Papyrustableinstance" basePackage="org.eclipse.papyrus.infra.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/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/plugin.xml b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/plugin.xml index c6ef3e422f0..77083607b71 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/plugin.xml +++ b/plugins/infra/table/org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrustableinstancePackage"
+ class="org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage"
genModel="model/papyrusnattableinstance.genmodel"/>
</extension>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/Activator.java index 76f15d18a6f..06103eb245a 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/Activator.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.instance;
+package org.eclipse.papyrus.infra.table.instance;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrusTableInstance.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrusTableInstance.java index 02a39dd51f6..e9f2fdcd902 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrusTableInstance.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrusTableInstance.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.table.instance.papyrustableinstance;
+package org.eclipse.papyrus.infra.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.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>
+ * <li>{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries <em>Filling Queries</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance()
+ * @see org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Name()
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Name()
* @model default="no name"
* @generated
*/
String getName();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Type()
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Type()
* @model default="PapyrusDefaultTable"
* @generated
*/
String getType();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_IsSynchronized()
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_IsSynchronized()
* @model default="false"
* @generated
*/
boolean isIsSynchronized();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Table()
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Table()
* @model
* @generated
*/
TableInstance2 getTable();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_FillingQueries()
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_FillingQueries()
* @model
* @generated
*/
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java index f4dd30e64ab..a724600c975 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.table.instance.papyrustableinstance;
+package org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrustableinstancePackage
+ * @see org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.impl.PapyrustableinstanceFactoryImpl.init();
+ PapyrustableinstanceFactory eINSTANCE = org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrustableinstanceFactoryImpl.init();
/**
* Returns a new object of class '<em>Papyrus Table Instance</em>'.
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstancePackage.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstancePackage.java index 59a8a4511c6..73a0a9eba01 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstancePackage.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstancePackage.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.table.instance.papyrustableinstance;
+package org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrustableinstanceFactory
+ * @see org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance";
+ String eNS_PREFIX = "org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl.init();
+ PapyrustableinstancePackage eINSTANCE = org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl <em>Papyrus Table Instance</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl <em>Papyrus Table Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl#getPapyrusTableInstance()
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl
+ * @see org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrusTableInstance <em>Papyrus Table Instance</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrusTableInstance
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance
* @generated
*/
EClass getPapyrusTableInstance();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrusTableInstance#getName()
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance#getName()
* @see #getPapyrusTableInstance()
* @generated
*/
EAttribute getPapyrusTableInstance_Name();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrusTableInstance#getType()
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance#getType()
* @see #getPapyrusTableInstance()
* @generated
*/
EAttribute getPapyrusTableInstance_Type();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized()
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized()
* @see #getPapyrusTableInstance()
* @generated
*/
EAttribute getPapyrusTableInstance_IsSynchronized();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrusTableInstance#getTable()
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance#getTable()
* @see #getPapyrusTableInstance()
* @generated
*/
EReference getPapyrusTableInstance_Table();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries <em>Filling Queries</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries()
+ * @see org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl <em>Papyrus Table Instance</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl <em>Papyrus Table Instance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl#getPapyrusTableInstance()
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl#getPapyrusTableInstance()
* @generated
*/
EClass PAPYRUS_TABLE_INSTANCE = eINSTANCE.getPapyrusTableInstance();
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java index b1a8c7563a8..3576d8b1e01 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.table.instance.papyrustableinstance.impl;
+package org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage;
/**
* <!-- begin-user-doc -->
@@ -34,11 +34,11 @@ import org.eclipse.papyrus.table.instance.papyrustableinstance.Papyrustableinsta * <p>
* The following features are implemented:
* <ul>
- * <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>
+ * <li>{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#isIsSynchronized <em>Is Synchronized</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getFillingQueries <em>Filling Queries</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java index 8e1eff8a5ac..fd7ec822bdc 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.table.instance.papyrustableinstance.impl;
+package org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.*;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.*;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java index d3d504c77cc..f123b955917 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.table.instance.papyrustableinstance.impl;
+package org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstanceFactory;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstanceFactory;
+import org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrustableinstancePackage#eNS_URI
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage#eNS_URI
* @see #init()
* @generated
*/
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java index 86263902a72..a3019bd5522 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java @@ -4,7 +4,7 @@ *
* $Id$
*/
-package org.eclipse.papyrus.table.instance.papyrustableinstance.util;
+package org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.*;
+import org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrustableinstancePackage
+ * @see org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrusTableInstance <em>Papyrus Table Instance</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.PapyrusTableInstance
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance
* @generated
*/
public Adapter createPapyrusTableInstanceAdapter() {
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java index ffe19768518..d33a6d049ce 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java @@ -4,14 +4,14 @@ *
* $Id$
*/
-package org.eclipse.papyrus.table.instance.papyrustableinstance.util;
+package org.eclipse.papyrus.infra.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.table.instance.papyrustableinstance.*;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.*;
/**
* <!-- begin-user-doc -->
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.table.instance.papyrustableinstance.*; * until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage
+ * @see org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage
* @generated
*/
public class PapyrustableinstanceSwitch<T> extends Switch<T> {
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.core.resources.prefs b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.core.resources.prefs index 5bdce069f07..f6b3322e995 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.core.resources.prefs +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Thu Feb 10 14:50:02 CET 2011
+#Fri Nov 04 17:02:25 CET 2011
eclipse.preferences.version=1
-encoding//src/org/eclipse/papyrus/table/menu/messages/messages.properties=ISO-8859-1
+encoding//src/org/eclipse/papyrus/infra/table/menu/messages/messages.properties=ISO-8859-1
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF index 836710819af..d042fe18c88 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF @@ -8,16 +8,16 @@ Require-Bundle: org.eclipse.core.expressions, org.eclipse.emf.facet.widgets.nattable,
org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0",
org.eclipse.emf.facet.widgets.nattable.workbench;bundle-version="0.1.0"
-Export-Package: org.eclipse.papyrus.table.menu,
- org.eclipse.papyrus.table.menu.handler,
- org.eclipse.papyrus.table.menu.providers
+Export-Package: org.eclipse.papyrus.infra.table.menu,
+ org.eclipse.papyrus.infra.table.menu.handler,
+ org.eclipse.papyrus.infra.table.menu.providers
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.table.menu.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.table.menu.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.table.menu;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.properties b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.properties index e3c95ea18bc..65cf0585d22 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.properties +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.properties @@ -1,3 +1,3 @@ -#Properties file for org.eclipse.papyrus.table.menu
+#Properties file for org.eclipse.papyrus.infra.table.menu
providerName = Eclipse.org
pluginName = Papyrus Table Menu
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.xml b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.xml index 2720aa46f84..5eab9e3f08c 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.xml +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.xml @@ -5,23 +5,23 @@ point="org.eclipse.ui.commands">
<command
categoryId="org.eclipse.emf.facet.widgets.nattable.command.category"
- defaultHandler="org.eclipse.papyrus.table.menu.handler.CommonColumnHandler"
+ defaultHandler="org.eclipse.papyrus.infra.table.menu.handler.CommonColumnHandler"
description="Show only the common columns"
id="org.eclipse.emf.facet.widget.nattable.common.columns.command"
name="Common Columns Command">
<state
- class="org.eclipse.papyrus.table.menu.handler.states.OnlyCommonColumnsState"
+ class="org.eclipse.papyrus.infra.table.menu.handler.states.OnlyCommonColumnsState"
id="org.eclipse.ui.commands.toggleState">
</state>
</command>
<command
categoryId="org.eclipse.emf.facet.widgets.nattable.command.category"
- defaultHandler="org.eclipse.papyrus.table.menu.handler.HideEmptyColumnsHandler"
+ defaultHandler="org.eclipse.papyrus.infra.table.menu.handler.HideEmptyColumnsHandler"
description="This command hides the empty columns"
id="org.eclipse.emf.facet.widget.nattable.empty.columns.command"
name="Hide Empty Columns Command">
<state
- class="org.eclipse.papyrus.table.menu.handler.states.HideEmptyColumnState"
+ class="org.eclipse.papyrus.infra.table.menu.handler.states.HideEmptyColumnState"
id="org.eclipse.ui.commands.toggleState">
</state>
</command>
@@ -167,7 +167,7 @@ <with
variable="activeEditor">
<instanceof
- value="org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor">
+ value="org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor">
</instanceof>
</with>
</and>
@@ -194,7 +194,7 @@ <with
variable="activeEditor">
<instanceof
- value="org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor">
+ value="org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor">
</instanceof>
</with>
</and>
@@ -204,7 +204,7 @@ <with
variable="activeEditorId">
<equals
- value="org.eclipse.papyrus.core.papyrusEditor">
+ value="org.eclipse.papyrus.infra.core.papyrusEditor">
</equals>
</with>
</visibleWhen>
@@ -238,7 +238,7 @@ <with
variable="activeEditor">
<instanceof
- value="org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor">
+ value="org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor">
</instanceof>
</with>
<with
@@ -273,7 +273,7 @@ <with
variable="activeEditor">
<instanceof
- value="org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor">
+ value="org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor">
</instanceof>
</with>
<with
@@ -290,19 +290,19 @@ </menuContribution>
<menuContribution
allPopups="true"
- class="org.eclipse.papyrus.table.menu.handler.CreateNewElementInPopupContributionItem"
+ class="org.eclipse.papyrus.infra.table.menu.handler.CreateNewElementInPopupContributionItem"
locationURI="popup:org.eclipse.ui.popup.any">
</menuContribution>
<menuContribution
allPopups="false"
- class="org.eclipse.papyrus.table.menu.handler.CreateNewElementInTableMenuContributionItem"
+ class="org.eclipse.papyrus.infra.table.menu.handler.CreateNewElementInTableMenuContributionItem"
locationURI="menu:org.eclipse.papyrus.table.menu?before=org.eclipse.papyrus.table.menu.load.customization">
</menuContribution>
</extension>
<extension
point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
- class="org.eclipse.papyrus.table.menu.providers.TableTester"
+ class="org.eclipse.papyrus.infra.table.menu.providers.TableTester"
id="org.eclipse.papyrus.table.menu.providers.TableTester"
namespace="org.eclipse.papyrus.table.menu.providers.TableTester"
properties="isTable"
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/Activator.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/Activator.java index c5fd5e9272e..4db2eb8032c 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/Activator.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/Activator.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.menu;
+package org.eclipse.papyrus.infra.table.menu;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/AbstractTableExtensionContributionFactory.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/AbstractTableExtensionContributionFactory.java index 0b801ea847a..cf94a5db334 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/AbstractTableExtensionContributionFactory.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/AbstractTableExtensionContributionFactory.java @@ -9,11 +9,11 @@ * Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.table.menu.handler;
+package org.eclipse.papyrus.infra.table.menu.handler;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
-import org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/CommonColumnHandler.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CommonColumnHandler.java index f39d4fde129..d8dc8a0008a 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/CommonColumnHandler.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CommonColumnHandler.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.menu.handler;
+package org.eclipse.papyrus.infra.table.menu.handler;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/CreateNewElementInPopupContributionItem.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInPopupContributionItem.java index b62e526a1f1..916dfd3ac1a 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/CreateNewElementInPopupContributionItem.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInPopupContributionItem.java @@ -9,7 +9,7 @@ * Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.table.menu.handler;
+package org.eclipse.papyrus.infra.table.menu.handler;
import org.eclipse.core.expressions.EvaluationResult;
@@ -22,7 +22,7 @@ import org.eclipse.emf.facet.widgets.nattable.tableconfiguration.InstantiationMe import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.MenuManager;
-import org.eclipse.papyrus.table.menu.messages.Messages;
+import org.eclipse.papyrus.infra.table.menu.messages.Messages;
import org.eclipse.papyrus.uml.diagram.common.Activator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/CreateNewElementInTableMenuContributionItem.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInTableMenuContributionItem.java index 59c19b12af9..39bee33f3a1 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/CreateNewElementInTableMenuContributionItem.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInTableMenuContributionItem.java @@ -9,7 +9,7 @@ * Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.table.menu.handler;
+package org.eclipse.papyrus.infra.table.menu.handler;
import java.util.List;
import org.eclipse.core.expressions.EvaluationResult;
@@ -23,7 +23,7 @@ import org.eclipse.jface.action.ContributionItem; import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.papyrus.table.menu.messages.Messages;
+import org.eclipse.papyrus.infra.table.menu.messages.Messages;
import org.eclipse.papyrus.uml.diagram.common.Activator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -136,7 +136,7 @@ public class CreateNewElementInTableMenuContributionItem extends AbstractTableEx }
});
-
+
}
boolean enabled = menu.getItemCount() != 0;
menu.setEnabled(enabled);
@@ -154,7 +154,7 @@ public class CreateNewElementInTableMenuContributionItem extends AbstractTableEx };
manager.add(item);
-
+
Expression visibleWhen = new Expression() {
/**
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/HideEmptyColumnsHandler.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/HideEmptyColumnsHandler.java index fc9946a5d85..662c29687ac 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/HideEmptyColumnsHandler.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/HideEmptyColumnsHandler.java @@ -9,7 +9,7 @@ * Contributors:
* Nicolas Guyomar (Mia-Software) - Bug 335020 - Nattable widget should use the Eclipse framework
*******************************************************************************/
-package org.eclipse.papyrus.table.menu.handler;
+package org.eclipse.papyrus.infra.table.menu.handler;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/AbstractToggleStateProvider.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/states/AbstractToggleStateProvider.java index 30d77857b68..4b6dfdc1ed3 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/AbstractToggleStateProvider.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/states/AbstractToggleStateProvider.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.menu.handler.states;
+package org.eclipse.papyrus.infra.table.menu.handler.states;
import org.eclipse.jface.commands.ToggleState;
import org.eclipse.jface.viewers.ISelection;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/HideEmptyColumnState.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/states/HideEmptyColumnState.java index 64a72088c62..ffcb5c98d28 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/HideEmptyColumnState.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/states/HideEmptyColumnState.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.menu.handler.states;
+package org.eclipse.papyrus.infra.table.menu.handler.states;
import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
import org.eclipse.ui.IEditorPart;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/OnlyCommonColumnsState.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/states/OnlyCommonColumnsState.java index d39c1c380db..3f58ea73dd9 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/OnlyCommonColumnsState.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/states/OnlyCommonColumnsState.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.menu.handler.states;
+package org.eclipse.papyrus.infra.table.menu.handler.states;
import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
import org.eclipse.ui.IEditorPart;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/messages/Messages.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/Messages.java index c26e8ea785d..d6efab40964 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/messages/Messages.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/Messages.java @@ -11,13 +11,13 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.menu.messages;
+package org.eclipse.papyrus.infra.table.menu.messages;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.table.menu.messages.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.table.menu.messages.messages"; //$NON-NLS-1$
public static String CreateMenuForNewElementInPopupContributionItem_CreateNewElementMenu;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/messages/messages.properties b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/messages.properties index 6bd6c4265d8..6bd6c4265d8 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/messages/messages.properties +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/messages.properties diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/providers/TableTester.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/providers/TableTester.java index 77507b143bd..2c22bf7f74c 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/providers/TableTester.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/providers/TableTester.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.menu.providers;
+package org.eclipse.papyrus.infra.table.menu.providers;
import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs index ce87eeafde2..c82fec208fa 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Thu Feb 24 14:02:49 CET 2011
+#Fri Nov 04 17:02:59 CET 2011
eclipse.preferences.version=1
-encoding//src/org/eclipse/papyrus/table/modelexplorer/messages/messages.properties=ISO-8859-1
+encoding//src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties=ISO-8859-1
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF index 44ef7e6ecce..dc327a042d4 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF @@ -8,17 +8,17 @@ Require-Bundle: org.eclipse.papyrus.resource;bundle-version="0.9.0", org.eclipse.papyrus.infra.table.instance;bundle-version="0.9.0",
org.eclipse.uml2.uml,
org.eclipse.emf.facet.infra.query.core
-Export-Package: org.eclipse.papyrus.table.modelexplorer,
- org.eclipse.papyrus.table.modelexplorer.handlers,
- org.eclipse.papyrus.table.modelexplorer.messages,
- org.eclipse.papyrus.table.modelexplorer.providers
+Export-Package: org.eclipse.papyrus.infra.table.modelexplorer,
+ org.eclipse.papyrus.infra.table.modelexplorer.handlers,
+ org.eclipse.papyrus.infra.table.modelexplorer.messages,
+ org.eclipse.papyrus.infra.table.modelexplorer.providers
Bundle-Vendor: %pluginProvider
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.table.modelexplorer.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.table.modelexplorer.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.table.modelexplorer;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties index c3c053f7a7e..9b380b81921 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties @@ -1,3 +1,3 @@ -#Properties file for org.eclipse.papyrus.table.modelexplorer
+#Properties file for org.eclipse.papyrus.infra.table.modelexplorer
pluginProvider = Eclipse Modeling Project
pluginName = Table Customization For Model Explorer
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml index 202a0b26156..35efde5e3ed 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml @@ -4,7 +4,7 @@ <plugin>
<!-- we provide a new navigator content for the tables. To be called, this navigator content should have an id beginning with org.eclipse.papyrus.views.modelexplorer.* -->
<extension point="org.eclipse.ui.handlers">
- <handler class="org.eclipse.papyrus.table.modelexplorer.handlers.DeleteTableHandler" commandId="org.eclipse.ui.edit.delete">
+ <handler class="org.eclipse.papyrus.infra.table.modelexplorer.handlers.DeleteTableHandler" commandId="org.eclipse.ui.edit.delete">
<activeWhen>
<or>
<with variable="selection">
@@ -20,7 +20,7 @@ </or>
</activeWhen>
</handler>
- <handler class="org.eclipse.papyrus.table.modelexplorer.handlers.DuplicateTableHandler" commandId="org.eclipse.papyrus.views.modelexplorer.duplicate.command">
+ <handler class="org.eclipse.papyrus.infra.table.modelexplorer.handlers.DuplicateTableHandler" commandId="org.eclipse.papyrus.views.modelexplorer.duplicate.command">
<activeWhen>
<and>
<with variable="selection">
@@ -38,7 +38,7 @@ </and>
</activeWhen>
</handler>
- <handler class="org.eclipse.papyrus.table.modelexplorer.handlers.RenameTableHandler" commandId="org.eclipse.ui.edit.rename">
+ <handler class="org.eclipse.papyrus.infra.table.modelexplorer.handlers.RenameTableHandler" commandId="org.eclipse.ui.edit.rename">
<activeWhen>
<or>
<with variable="selection">
@@ -56,7 +56,7 @@ </handler>
</extension>
<extension point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester class="org.eclipse.papyrus.table.modelexplorer.providers.TablePropertyTester" id="org.eclipse.papyrus.table.modelexplorer.tester" namespace="org.eclipse.papyrus.table.modelexplorer.tester" properties="isTable" type="org.eclipse.jface.viewers.IStructuredSelection">
+ <propertyTester class="org.eclipse.papyrus.infra.table.modelexplorer.providers.TablePropertyTester" id="org.eclipse.papyrus.table.modelexplorer.tester" namespace="org.eclipse.papyrus.table.modelexplorer.tester" properties="isTable" type="org.eclipse.jface.viewers.IStructuredSelection">
</propertyTester>
</extension>
<extension point="org.eclipse.emf.facet.infra.facet.registration">
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet index 0a52039ebe8..e9c26762aa7 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet @@ -3,19 +3,19 @@ <associatedMetamodels href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#/"/>
<associatedMetamodels href="http://www.eclipse.org/emf/2002/Ecore#/"/>
<associatedMetamodels href="http://www.eclipse.org/uml2/3.0.0/UML#/"/>
- <queries xsi:type="query:JavaModelQuery" name="IsTableContainer" description="Returns true if the element contains a Table" implementationClassName="org.eclipse.papyrus.table.modelexplorer.queries.IsTableContainer">
+ <queries xsi:type="query:JavaModelQuery" name="IsTableContainer" description="Returns true if the element contains a Table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.IsTableContainer">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
<scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
</queries>
- <queries xsi:type="query:JavaModelQuery" name="GetContainedTables" description="Get the collection of all contained tables" upperBound="-1" implementationClassName="org.eclipse.papyrus.table.modelexplorer.queries.GetContainedTables">
+ <queries xsi:type="query:JavaModelQuery" name="GetContainedTables" description="Get the collection of all contained tables" upperBound="-1" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetContainedTables">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#//PapyrusTableInstance"/>
<scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
</queries>
- <queries xsi:type="query:JavaModelQuery" name="GetTableIcon" description="Return the path to the icon of the corresponding table" implementationClassName="org.eclipse.papyrus.table.modelexplorer.queries.GetTableIcon">
+ <queries xsi:type="query:JavaModelQuery" name="GetTableIcon" description="Return the path to the icon of the corresponding table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetTableIcon">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
<scope href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#//PapyrusTableInstance"/>
</queries>
- <queries xsi:type="query:JavaModelQuery" name="GetTableName" description="Return the name for the table" implementationClassName="org.eclipse.papyrus.table.modelexplorer.queries.GetTableName">
+ <queries xsi:type="query:JavaModelQuery" name="GetTableName" description="Return the name for the table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetTableName">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
<scope href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#//PapyrusTableInstance"/>
</queries>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/Activator.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/Activator.java index af8c949991e..6709bfb96a9 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/Activator.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/Activator.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer;
+package org.eclipse.papyrus.infra.table.modelexplorer;
import java.util.List;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java index 3405bf18124..9ff84a43227 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.handlers;
+package org.eclipse.papyrus.infra.table.modelexplorer.handlers;
import java.util.ArrayList;
import java.util.Iterator;
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;
import org.eclipse.ui.PlatformUI;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DeleteTableHandler.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeleteTableHandler.java index 7396dc0daf7..2ce62732d00 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DeleteTableHandler.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeleteTableHandler.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2011 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
@@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.handlers;
+package org.eclipse.papyrus.infra.table.modelexplorer.handlers;
import java.util.List;
@@ -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.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
/**
* Handler for the delete Table action
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DuplicateTableHandler.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicateTableHandler.java index 0a275056a5e..c4215e3f6ad 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DuplicateTableHandler.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicateTableHandler.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2011 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
@@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.handlers;
+package org.eclipse.papyrus.infra.table.modelexplorer.handlers;
import java.util.List;
@@ -22,9 +22,9 @@ 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.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.modelexplorer.messages.Messages;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.modelexplorer.messages.Messages;
/**
* This handler provides the duplicate action for the tables
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/RenameTableHandler.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenameTableHandler.java index d687d6d714b..3c007165413 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/RenameTableHandler.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenameTableHandler.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.handlers;
+package org.eclipse.papyrus.infra.table.modelexplorer.handlers;
import java.util.List;
@@ -25,8 +25,8 @@ 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.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.modelexplorer.messages.Messages;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.modelexplorer.messages.Messages;
import org.eclipse.swt.widgets.Display;
/**
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/Messages.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/Messages.java index f8803135861..b90725d4502 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/Messages.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/Messages.java @@ -11,13 +11,13 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.messages;
+package org.eclipse.papyrus.infra.table.modelexplorer.messages;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.table.modelexplorer.messages.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.table.modelexplorer.messages.messages"; //$NON-NLS-1$
public static String DuplicateTableHandler_CopyOf;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/messages.properties b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties index 0d415e3dab5..0d415e3dab5 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/messages.properties +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableContentProvider.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/NavigatorTableContentProvider.java index f8b67e3f907..5cc72e2b0f9 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableContentProvider.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/NavigatorTableContentProvider.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.providers;
+package org.eclipse.papyrus.infra.table.modelexplorer.providers;
import java.util.ArrayList;
import java.util.Iterator;
@@ -20,10 +20,10 @@ import java.util.List; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.uml.UmlModel;
-import org.eclipse.papyrus.resource.uml.UmlUtils;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.uml.UmlModel;
+import org.eclipse.papyrus.infra.core.resource.uml.UmlUtils;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.views.modelexplorer.MoDiscoContentProvider;
import org.eclipse.uml2.uml.util.UMLUtil;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableLabelProvider.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/NavigatorTableLabelProvider.java index e5bd7dc92fb..0053a880e4b 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableLabelProvider.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/NavigatorTableLabelProvider.java @@ -11,9 +11,9 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.providers;
+package org.eclipse.papyrus.infra.table.modelexplorer.providers;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
import org.eclipse.papyrus.views.modelexplorer.MoDiscoLabelProvider;
import org.eclipse.swt.graphics.Image;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/TablePropertyTester.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/TablePropertyTester.java index f9b1216deeb..04e1a500a64 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/TablePropertyTester.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/TablePropertyTester.java @@ -11,14 +11,13 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.providers;
+package org.eclipse.papyrus.infra.table.modelexplorer.providers;
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.table.instance.papyrustableinstance.PapyrusTableInstance;
+import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
/**
* This class provides test called by the plugin.xml in order to know if handlers should be active or not.
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/queries/GetContainedTables.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedTables.java index e93e45fa34a..f87c025fa49 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/queries/GetContainedTables.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedTables.java @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2011 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,26 +12,19 @@ * *****************************************************************************/ -package org.eclipse.papyrus.table.modelexplorer.queries; +package org.eclipse.papyrus.infra.table.modelexplorer.queries; import java.util.ArrayList; import java.util.Collection; -import org.eclipse.papyrus.core.editor.IMultiDiagramEditor; -import org.eclipse.papyrus.core.services.ServiceException; -import org.eclipse.papyrus.core.services.ServicesRegistry; -import org.eclipse.papyrus.core.utils.EditorUtils; -import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr; -import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance; -import org.eclipse.papyrus.table.modelexplorer.messages.Messages; -import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery; -import org.eclipse.uml2.uml.Element; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; - -import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance; +import org.eclipse.papyrus.infra.table.modelexplorer.messages.Messages; +import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery; /** Get the collection of all contained tables */ public class GetContainedTables extends AbstractEditorContainerQuery implements IJavaModelQuery<EObject, Collection<PapyrusTableInstance>> { diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/queries/GetTableIcon.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableIcon.java index 0b905595e63..010338a069e 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/queries/GetTableIcon.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableIcon.java @@ -11,19 +11,14 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation * *****************************************************************************/ -package org.eclipse.papyrus.table.modelexplorer.queries; +package org.eclipse.papyrus.infra.table.modelexplorer.queries; -import org.eclipse.papyrus.core.editorsfactory.IPageIconsRegistry; -import org.eclipse.papyrus.core.editorsfactory.IPageIconsRegistryExtended; -import org.eclipse.papyrus.core.editorsfactory.PageIconsRegistry; -import org.eclipse.papyrus.core.services.ServiceException; -import org.eclipse.papyrus.core.utils.EditorUtils; -import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance; -import org.eclipse.papyrus.views.modelexplorer.queries.AbstractGetEditorIconQuery; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; -import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.papyrus.infra.core.editorsfactory.IPageIconsRegistryExtended; +import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance; +import org.eclipse.papyrus.views.modelexplorer.queries.AbstractGetEditorIconQuery; /** Return the path to the icon of the corresponding table */ public class GetTableIcon extends AbstractGetEditorIconQuery implements IJavaModelQuery<PapyrusTableInstance, String> { diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/queries/GetTableName.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableName.java index 6104390e1e8..a1da86b8526 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/queries/GetTableName.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableName.java @@ -12,12 +12,12 @@ * *****************************************************************************/ -package org.eclipse.papyrus.table.modelexplorer.queries; +package org.eclipse.papyrus.infra.table.modelexplorer.queries; -import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; +import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance; /** Return the name for the table */ public class GetTableName implements IJavaModelQuery<PapyrusTableInstance, String> { diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/queries/IsTableContainer.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsTableContainer.java index ea87772cd79..aaab00fdc76 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/queries/IsTableContainer.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsTableContainer.java @@ -11,15 +11,15 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation * *****************************************************************************/ -package org.eclipse.papyrus.table.modelexplorer.queries; +package org.eclipse.papyrus.infra.table.modelexplorer.queries; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList; -import org.eclipse.papyrus.core.services.ServiceException; -import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance; -import org.eclipse.papyrus.table.modelexplorer.messages.Messages; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance; +import org.eclipse.papyrus.infra.table.modelexplorer.messages.Messages; import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery; /** Returns true if the element contains a Table */ diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF index afb31bac2db..3958cef2e6d 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Bundle-Version: 0.9.0.qualifier Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.properties.table.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.table.properties.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.table.properties;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/Environment.xmi b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/Environment.xmi index 2e6c01b7a67..a308a421d64 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/Environment.xmi +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/Environment.xmi @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="ASCII"?>
<environment:Environment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:environment="http://www.eclipse.org/papyrus/properties/environment">
- <modelElementFactories name="PapyrusTableFactory" factoryClass="org.eclipse.papyrus.properties.table.modelelement.PapyrusTableFactory"/>
+ <modelElementFactories name="PapyrusTableFactory" factoryClass="org.eclipse.papyrus.infra.table.properties.modelelement.PapyrusTableFactory"/>
</environment:Environment>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstance.ctx b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstance.ctx index 588d42bf2dc..7efe8ad4932 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstance.ctx +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstance.ctx @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ASCII"?>
<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts" name="papyrustableinstance">
- <dependencies href="ppe:/context/org.eclipse.papyrus.properties.table/model/tableinstance2.ctx#/"/>
+ <dependencies href="ppe:/context/org.eclipse.papyrus.infra.table.properties/model/tableinstance2.ctx#/"/>
<tabs label="Default" id="default" category="default">
<sections name="Single PapyrusTableInstance" sectionFile="ui/SinglePapyrusTableInstance.xwt">
<widget href="ui/SinglePapyrusTableInstance.xwt#/"/>
@@ -11,14 +11,14 @@ </tabs>
<views name="Single PapyrusTableInstance" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
<constraints xsi:type="contexts:SimpleConstraint" name="isSinglePapyrusTableInstance">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="PapyrusTableInstance"/>
</constraints>
</views>
<views name="Multiple PapyrusTableInstance" sections="//@tabs.0/@sections.1" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePapyrusTableInstance">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="PapyrusTableInstance"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance"/>
</constraints>
@@ -31,6 +31,6 @@ <properties name="table" type="Reference"/>
<properties name="fillingQueries" type="Reference" multiplicity="-1"/>
</elements>
- <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.properties.table/model/Environment.xmi#//@modelElementFactories.0"/>
+ <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.table.properties/model/Environment.xmi#//@modelElementFactories.0"/>
</dataContexts>
</contexts:Context>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance.ctx b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance.ctx index d4dc61bc0be..a7ac61599f0 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance.ctx +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance.ctx @@ -94,210 +94,210 @@ </tabs>
<views name="Single TableInstance" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleTableInstance">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="TableInstance"/>
</constraints>
</views>
<views name="Single QueryTableInstance" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleQueryTableInstance">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="QueryTableInstance"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Single Column" sections="//@tabs.0/@sections.2" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="Column"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Single QueryColumn" sections="//@tabs.0/@sections.3" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleQueryColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="QueryColumn"/>
</constraints>
</views>
<views name="Single ReferenceColumn" sections="//@tabs.0/@sections.4" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleReferenceColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="ReferenceColumn"/>
</constraints>
</views>
<views name="Single ContextColumn" sections="//@tabs.0/@sections.5" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleContextColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="ContextColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Single MetaClassColumn" sections="//@tabs.0/@sections.6" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleMetaClassColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="MetaClassColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Single AttributeColumn" sections="//@tabs.0/@sections.7" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleAttributeColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="AttributeColumn"/>
</constraints>
</views>
<views name="Single EContainerColumn" sections="//@tabs.0/@sections.8" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleEContainerColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="EContainerColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Single DefaultLabelColumn" sections="//@tabs.0/@sections.9" automaticContext="true" datacontexts="//@dataContexts.0/@elements.9">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleDefaultLabelColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="DefaultLabelColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Single FeatureColumn" sections="//@tabs.0/@sections.10" automaticContext="true" datacontexts="//@dataContexts.0/@elements.10">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleFeatureColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="FeatureColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Single Row" sections="//@tabs.0/@sections.11" automaticContext="true" datacontexts="//@dataContexts.0/@elements.11">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleRow">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="Row"/>
</constraints>
</views>
<views name="Single FacetAttributeColumn" sections="//@tabs.0/@sections.12" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleFacetAttributeColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="FacetAttributeColumn"/>
</constraints>
</views>
<views name="Single FacetReferenceColumn" sections="//@tabs.0/@sections.13" automaticContext="true" datacontexts="//@dataContexts.0/@elements.13">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleFacetReferenceColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="FacetReferenceColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Single FacetFeatureColumn" sections="//@tabs.0/@sections.14" automaticContext="true" datacontexts="//@dataContexts.0/@elements.14">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleFacetFeatureColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="FacetFeatureColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Multiple TableInstance" sections="//@tabs.0/@sections.15" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTableInstance">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="TableInstance"/>
</constraints>
</views>
<views name="Multiple QueryTableInstance" sections="//@tabs.0/@sections.16" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleQueryTableInstance">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="QueryTableInstance"/>
</constraints>
</views>
<views name="Multiple Column" sections="//@tabs.0/@sections.17" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="Column"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Multiple QueryColumn" sections="//@tabs.0/@sections.18" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleQueryColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="QueryColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Multiple ReferenceColumn" sections="//@tabs.0/@sections.19" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReferenceColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="ReferenceColumn"/>
</constraints>
</views>
<views name="Multiple ContextColumn" sections="//@tabs.0/@sections.20" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleContextColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="ContextColumn"/>
</constraints>
</views>
<views name="Multiple MetaClassColumn" sections="//@tabs.0/@sections.21" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMetaClassColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="MetaClassColumn"/>
</constraints>
</views>
<views name="Multiple AttributeColumn" sections="//@tabs.0/@sections.22" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAttributeColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="AttributeColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Multiple EContainerColumn" sections="//@tabs.0/@sections.23" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleEContainerColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="EContainerColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Multiple DefaultLabelColumn" sections="//@tabs.0/@sections.24" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.9">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDefaultLabelColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="DefaultLabelColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Multiple FeatureColumn" sections="//@tabs.0/@sections.25" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.10">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFeatureColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="FeatureColumn"/>
</constraints>
</views>
<views name="Multiple Row" sections="//@tabs.0/@sections.26" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.11">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRow">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="Row"/>
</constraints>
</views>
<views name="Multiple FacetAttributeColumn" sections="//@tabs.0/@sections.27" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFacetAttributeColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="FacetAttributeColumn"/>
</constraints>
</views>
<views name="Multiple FacetReferenceColumn" sections="//@tabs.0/@sections.28" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.13">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFacetReferenceColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="FacetReferenceColumn"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
</constraints>
</views>
<views name="Multiple FacetFeatureColumn" sections="//@tabs.0/@sections.29" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.14">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFacetFeatureColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="FacetFeatureColumn"/>
</constraints>
@@ -354,6 +354,6 @@ <elements name="FacetFeatureColumn">
<properties name="facetFeature" type="Reference"/>
</elements>
- <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@modelElementFactories.0"/>
+ <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@modelElementFactories.0"/>
</dataContexts>
</contexts:Context>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance2.ctx b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance2.ctx index b3c90246d32..32477c24d43 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance2.ctx +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance2.ctx @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ASCII"?>
<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts" name="tableinstance2">
- <dependencies href="ppe:/context/org.eclipse.papyrus.properties.table/model/tableinstance.ctx#/"/>
+ <dependencies href="ppe:/context/org.eclipse.papyrus.infra.table.properties/model/tableinstance.ctx#/"/>
<tabs label="Default" id="default" category="default">
<sections name="Single TableInstance2" sectionFile="ui/SingleTableInstance2.xwt">
<widget href="ui/SingleTableInstance2.xwt#/"/>
@@ -44,84 +44,84 @@ </tabs>
<views name="Single TableInstance2" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleTableInstance2">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="TableInstance2"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
</constraints>
</views>
<views name="Single QueryRow" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleQueryRow">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="QueryRow"/>
</constraints>
</views>
<views name="Single PrimitiveTypeQueryRow" sections="//@tabs.0/@sections.2" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">
<constraints xsi:type="contexts:SimpleConstraint" name="isSinglePrimitiveTypeQueryRow">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="PrimitiveTypeQueryRow"/>
</constraints>
</views>
<views name="Single EObjectQueryRow" sections="//@tabs.0/@sections.3" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleEObjectQueryRow">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="EObjectQueryRow"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
</constraints>
</views>
<views name="Single ValueColumn" sections="//@tabs.0/@sections.4" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleValueColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="ValueColumn"/>
</constraints>
</views>
<views name="Single QueryTableInstance2" sections="//@tabs.0/@sections.5" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">
<constraints xsi:type="contexts:SimpleConstraint" name="isSingleQueryTableInstance2">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="QueryTableInstance2"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
</constraints>
</views>
<views name="Multiple TableInstance2" sections="//@tabs.0/@sections.6" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTableInstance2">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="TableInstance2"/>
</constraints>
</views>
<views name="Multiple QueryRow" sections="//@tabs.0/@sections.7" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleQueryRow">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="QueryRow"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
</constraints>
</views>
<views name="Multiple PrimitiveTypeQueryRow" sections="//@tabs.0/@sections.8" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePrimitiveTypeQueryRow">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="PrimitiveTypeQueryRow"/>
</constraints>
</views>
<views name="Multiple EObjectQueryRow" sections="//@tabs.0/@sections.9" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleEObjectQueryRow">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="EObjectQueryRow"/>
</constraints>
</views>
<views name="Multiple ValueColumn" sections="//@tabs.0/@sections.10" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleValueColumn">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="ValueColumn"/>
</constraints>
</views>
<views name="Multiple QueryTableInstance2" sections="//@tabs.0/@sections.11" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">
<constraints xsi:type="contexts:SimpleConstraint" name="isMultipleQueryTableInstance2">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
<properties xsi:type="contexts:ValueProperty" name="className" value="QueryTableInstance2"/>
</constraints>
@@ -143,6 +143,6 @@ <elements name="QueryTableInstance2">
<properties name="queryResults2" type="Reference" multiplicity="-1"/>
</elements>
- <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@modelElementFactories.0"/>
+ <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@modelElementFactories.0"/>
</dataContexts>
</contexts:Context>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/Description.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/Description.xwt index 534b3d5b68f..0bd60d339d4 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/Description.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/Description.xwt @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
</Composite.layout>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleAttributeColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleAttributeColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleAttributeColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleAttributeColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleColumn.xwt index 166f1fc4446..a6d30c037c5 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="tableinstance:Column:isHidden"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="tableinstance:Column:width"></ppe:IntegerEditor></Composite></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="tableinstance:Column:isHidden"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="tableinstance:Column:width"></ppe:IntegerEditor></Composite></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleContextColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleContextColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleContextColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleContextColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleDefaultLabelColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleDefaultLabelColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleDefaultLabelColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleDefaultLabelColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEContainerColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEContainerColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEContainerColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEContainerColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEObjectQueryRow.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEObjectQueryRow.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEObjectQueryRow.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEObjectQueryRow.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetAttributeColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetAttributeColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetAttributeColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetAttributeColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetFeatureColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetFeatureColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetFeatureColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetFeatureColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetReferenceColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetReferenceColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetReferenceColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetReferenceColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFeatureColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFeatureColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFeatureColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFeatureColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleMetaClassColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleMetaClassColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleMetaClassColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleMetaClassColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePapyrusTableInstance.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePapyrusTableInstance.xwt index 5b1bcbf19f6..00d54e1643f 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePapyrusTableInstance.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePapyrusTableInstance.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="papyrustableinstance:PapyrusTableInstance:isSynchronized"></ppe:BooleanRadio></Composite></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="papyrustableinstance:PapyrusTableInstance:isSynchronized"></ppe:BooleanRadio></Composite></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePrimitiveTypeQueryRow.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePrimitiveTypeQueryRow.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePrimitiveTypeQueryRow.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePrimitiveTypeQueryRow.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryRow.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryRow.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryRow.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryRow.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance2.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance2.xwt index b46518daf35..ad504480cfd 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance2.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance2.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleReferenceColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleReferenceColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleReferenceColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleReferenceColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleRow.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleRow.xwt index 8df809ff0c4..7b8b905d447 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleRow.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleRow.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="tableinstance:Row:height"></ppe:IntegerEditor></Composite></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="tableinstance:Row:height"></ppe:IntegerEditor></Composite></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance2.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance2.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance2.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance2.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleValueColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleValueColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleValueColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleValueColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleAttributeColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleAttributeColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleAttributeColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleAttributeColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleContextColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleContextColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleContextColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleContextColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleDefaultLabelColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleDefaultLabelColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleDefaultLabelColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleDefaultLabelColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEContainerColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEContainerColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEContainerColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEContainerColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEObjectQueryRow.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEObjectQueryRow.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEObjectQueryRow.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEObjectQueryRow.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetAttributeColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetAttributeColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetAttributeColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetAttributeColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetFeatureColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetFeatureColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetFeatureColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetFeatureColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetReferenceColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetReferenceColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetReferenceColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetReferenceColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFeatureColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFeatureColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFeatureColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFeatureColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleMetaClassColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleMetaClassColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleMetaClassColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleMetaClassColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePapyrusTableInstance.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePapyrusTableInstance.xwt index 9b65ae3528d..1ca67ee240a 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePapyrusTableInstance.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePapyrusTableInstance.xwt @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePrimitiveTypeQueryRow.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePrimitiveTypeQueryRow.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePrimitiveTypeQueryRow.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePrimitiveTypeQueryRow.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryRow.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryRow.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryRow.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryRow.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance2.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance2.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance2.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance2.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleReferenceColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleReferenceColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleReferenceColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleReferenceColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleRow.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleRow.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleRow.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleRow.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance.xwt index d94c6f8d837..8d6757fd352 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="tableinstance:TableInstance:description"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="tableinstance:TableInstance:hideEmptyColumns"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="tableinstance:TableInstance:onlyShowCommonColumns"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="tableinstance:TableInstance:facets"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="tableinstance:TableInstance:context"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="tableinstance:TableInstance:customizations"></ppe:MultiReference></Composite></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="tableinstance:TableInstance:description"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="tableinstance:TableInstance:hideEmptyColumns"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="tableinstance:TableInstance:onlyShowCommonColumns"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="tableinstance:TableInstance:facets"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="tableinstance:TableInstance:context"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="tableinstance:TableInstance:customizations"></ppe:MultiReference></Composite></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance2.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance2.xwt index 7b1bad01412..491cbc46f17 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance2.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance2.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="tableinstance2:TableInstance2:localCustomizations"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="tableinstance2:TableInstance2:facets2"></ppe:MultiReference></Composite></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="tableinstance2:TableInstance2:localCustomizations"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="tableinstance2:TableInstance2:facets2"></ppe:MultiReference></Composite></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleValueColumn.xwt b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleValueColumn.xwt index 9f2fd49ad6a..a2ae62ef794 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleValueColumn.xwt +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleValueColumn.xwt @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file +<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.properties b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.properties index 7fdd9404855..3e01e911349 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.properties +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.properties @@ -1,3 +1,3 @@ -#Properties file for org.eclipse.papyrus.properties.table
+#Properties file for org.eclipse.papyrus.infra.table.properties
providerName = Eclipse Modeling Project (Incubation)
pluginName = Papyrus Table Property View
\ No newline at end of file diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.xml b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.xml index ff4c3326a2f..25ff0388afc 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.xml +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.xml @@ -3,7 +3,7 @@ <plugin>
<extension
- point="org.eclipse.papyrus.properties.context">
+ point="org.eclipse.papyrus.views.properties.context">
<context
contextModel="model/papyrustableinstance.ctx"
loadDefault="true">
@@ -18,7 +18,7 @@ </context>
</extension>
<extension
- point="org.eclipse.papyrus.properties.environment">
+ point="org.eclipse.papyrus.views.properties.environment">
<environment
environmentModel="model/Environment.xmi">
</environment>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/Activator.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/Activator.java index 2b38d138c3a..7d655b26980 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/Activator.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/Activator.java @@ -11,9 +11,9 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.properties.table;
+package org.eclipse.papyrus.infra.table.properties;
-import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableFactory.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableFactory.java index 796c17e8001..09c8635392d 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableFactory.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableFactory.java @@ -11,16 +11,16 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.properties.table.modelelement;
+package org.eclipse.papyrus.infra.table.properties.modelelement;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.papyrus.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.properties.modelelement.EMFModelElementFactory;
-import org.eclipse.papyrus.properties.modelelement.ModelElement;
-import org.eclipse.papyrus.properties.table.Activator;
-import org.eclipse.papyrus.properties.util.EMFHelper;
+import org.eclipse.papyrus.infra.table.properties.Activator;
+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.views.properties.modelelement.EMFModelElementFactory;
+import org.eclipse.papyrus.views.properties.modelelement.ModelElement;
+import org.eclipse.papyrus.views.properties.util.EMFHelper;
/**
*
@@ -31,7 +31,7 @@ public class PapyrusTableFactory extends EMFModelElementFactory{ /**
*
- * @see org.eclipse.papyrus.properties.modelelement.EMFModelElementFactory#createFromSource(java.lang.Object, org.eclipse.papyrus.properties.contexts.DataContextElement)
+ * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElementFactory#createFromSource(java.lang.Object, org.eclipse.papyrus.views.properties.contexts.DataContextElement)
*
* @param sourceElement
* @param context
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableModelElement.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableModelElement.java index b1228331051..fdc1d809549 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableModelElement.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableModelElement.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.properties.table.modelelement;
+package org.eclipse.papyrus.infra.table.properties.modelelement;
import org.eclipse.core.runtime.Assert;
@@ -22,13 +22,13 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.TableInstance2;
import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.properties.modelelement.EMFModelElement;
-import org.eclipse.papyrus.properties.table.provider.CustomizationContentProvider;
-import org.eclipse.papyrus.properties.table.provider.CustomizationLabelProvider;
-import org.eclipse.papyrus.properties.table.provider.FacetLabelProvider;
-import org.eclipse.papyrus.properties.table.provider.FillingQueriesContentProvider;
-import org.eclipse.papyrus.widgets.creation.ReferenceValueFactory;
-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.table.properties.provider.CustomizationContentProvider;
+import org.eclipse.papyrus.infra.table.properties.provider.CustomizationLabelProvider;
+import org.eclipse.papyrus.infra.table.properties.provider.FacetLabelProvider;
+import org.eclipse.papyrus.infra.table.properties.provider.FillingQueriesContentProvider;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;
@@ -82,7 +82,7 @@ public class PapyrusTableModelElement extends EMFModelElement { /**
*
- * @see org.eclipse.papyrus.properties.modelelement.EMFModelElement#getContentProvider(java.lang.String)
+ * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElement#getContentProvider(java.lang.String)
*
* @param propertyPath
* @return
@@ -105,7 +105,7 @@ public class PapyrusTableModelElement extends EMFModelElement { /**
*
- * @see org.eclipse.papyrus.properties.modelelement.EMFModelElement#getLabelProvider(java.lang.String)
+ * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElement#getLabelProvider(java.lang.String)
*
* @param propertyPath
* @return
@@ -126,7 +126,7 @@ public class PapyrusTableModelElement extends EMFModelElement { /**
*
- * @see org.eclipse.papyrus.properties.modelelement.EMFModelElement#getValueFactory(java.lang.String)
+ * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElement#getValueFactory(java.lang.String)
*
* @param propertyPath
* @return
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/provider/CustomizationContentProvider.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationContentProvider.java index 110052f1874..a9e037f5942 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/provider/CustomizationContentProvider.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationContentProvider.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.properties.table.provider;
+package org.eclipse.papyrus.infra.table.properties.provider;
import java.util.ArrayList;
import java.util.List;
@@ -21,8 +21,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;
import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.TableInstance2;
-import org.eclipse.papyrus.properties.providers.EcoreReferenceContentProvider;
-import org.eclipse.papyrus.properties.table.modelelement.PapyrusTableModelElement;
+import org.eclipse.papyrus.infra.table.properties.modelelement.PapyrusTableModelElement;
+import org.eclipse.papyrus.views.properties.providers.EcoreReferenceContentProvider;
/**
*
@@ -66,7 +66,7 @@ public class CustomizationContentProvider extends EcoreReferenceContentProvider /**
*
- * @see org.eclipse.papyrus.properties.providers.EcoreReferenceContentProvider#getElements()
+ * @see org.eclipse.papyrus.views.properties.providers.EcoreReferenceContentProvider#getElements()
*
* @return
*/
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/provider/CustomizationLabelProvider.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationLabelProvider.java index fe970fd380a..4c60d0bf35f 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/provider/CustomizationLabelProvider.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationLabelProvider.java @@ -11,12 +11,12 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.properties.table.provider;
+package org.eclipse.papyrus.infra.table.properties.provider;
import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;
import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.TableInstance2;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.papyrus.properties.table.modelelement.PapyrusTableModelElement;
+import org.eclipse.papyrus.infra.table.properties.modelelement.PapyrusTableModelElement;
/**
*
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/provider/FacetLabelProvider.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FacetLabelProvider.java index d458375464a..3c4872d0ab2 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/provider/FacetLabelProvider.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FacetLabelProvider.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.properties.table.provider;
+package org.eclipse.papyrus.infra.table.properties.provider;
import org.eclipse.emf.facet.infra.facet.Facet;
import org.eclipse.jface.viewers.LabelProvider;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/provider/FillingQueriesContentProvider.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FillingQueriesContentProvider.java index dd93158fb23..2c78d470d45 100644 --- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/provider/FillingQueriesContentProvider.java +++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FillingQueriesContentProvider.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.properties.table.provider;
+package org.eclipse.papyrus.infra.table.properties.provider;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,8 +25,8 @@ import org.eclipse.emf.facet.infra.query.ModelQuerySet; import org.eclipse.emf.facet.infra.query.core.ModelQuerySetCatalog;
import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.widgets.providers.IHierarchicContentProvider;
-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
/**
*
@@ -42,7 +42,7 @@ public class FillingQueriesContentProvider implements IHierarchicContentProvider /**
*
- * @see org.eclipse.papyrus.widgets.providers.IStaticContentProvider#getElements()
+ * @see org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider#getElements()
*
* @return
*/
@@ -149,7 +149,7 @@ public class FillingQueriesContentProvider implements IHierarchicContentProvider /**
*
- * @see org.eclipse.papyrus.widgets.providers.IHierarchicContentProvider#isValidValue(java.lang.Object)
+ * @see org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider#isValidValue(java.lang.Object)
*
* @param element
* @return
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF index b8147e2e705..fc8f0c4ad91 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF @@ -2,24 +2,24 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
org.eclipse.core.runtime,
org.eclipse.ui
-Export-Package: org.eclipse.papyrus.ui.toolbox,
- org.eclipse.papyrus.ui.toolbox.dialog,
- org.eclipse.papyrus.ui.toolbox.draw2d,
- org.eclipse.papyrus.ui.toolbox.notification,
- org.eclipse.papyrus.ui.toolbox.notification.builders,
- org.eclipse.papyrus.ui.toolbox.notification.dialogs,
- org.eclipse.papyrus.ui.toolbox.notification.exception,
- org.eclipse.papyrus.ui.toolbox.notification.popups,
- org.eclipse.papyrus.ui.toolbox.notification.utils,
- org.eclipse.papyrus.ui.toolbox.notification.view,
- org.eclipse.papyrus.ui.toolbox.utils
+Export-Package: org.eclipse.papyrus.infra.widgets.toolbox,
+ org.eclipse.papyrus.infra.widgets.toolbox.dialog,
+ org.eclipse.papyrus.infra.widgets.toolbox.draw2d,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.builders,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.exception,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.popups,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.utils,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.view,
+ org.eclipse.papyrus.infra.widgets.toolbox.utils
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.ui.toolbox.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.widgets.toolbox.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets.toolbox;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/plugin.xml b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/plugin.xml index daa530d7f17..acebb9874ab 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/plugin.xml +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/plugin.xml @@ -20,7 +20,7 @@ point="org.eclipse.ui.views"> <view category="org.eclipse.papyrus.views.category" - class="org.eclipse.papyrus.ui.toolbox.notification.view.PapyrusNotificationView" + class="org.eclipse.papyrus.infra.widgets.toolbox.notification.view.PapyrusNotificationView" icon="icons/sample.gif" id="org.eclipse.papyrus.ui.toolbox.notification.view.PapyrusNotificationView" name="Papyrus Notification"> @@ -29,13 +29,13 @@ <extension point="org.eclipse.papyrus.ui.toolbox.papyrusNotificationBuilder"> <BuilderInstance - builder="org.eclipse.papyrus.ui.toolbox.notification.builders.PopupBuilder"> + builder="org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.PopupBuilder"> </BuilderInstance> <BuilderInstance - builder="org.eclipse.papyrus.ui.toolbox.notification.builders.ViewBuilder"> + builder="org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.ViewBuilder"> </BuilderInstance> <BuilderInstance - builder="org.eclipse.papyrus.ui.toolbox.notification.builders.AsyncNotifierBuilder"> + builder="org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.AsyncNotifierBuilder"> </BuilderInstance> </extension> </plugin> diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/schema/papyrusNotificationBuilder.exsd b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/schema/papyrusNotificationBuilder.exsd index 4c460984403..0a4b77c3cb3 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/schema/papyrusNotificationBuilder.exsd +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/schema/papyrusNotificationBuilder.exsd @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.ui.toolbox" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.papyrus.infra.widgets.toolbox" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
- <meta.schema plugin="org.eclipse.papyrus.ui.toolbox" id="papyrusNotificationBuilder" name="Papyrus Notification Builder"/>
+ <meta.schema plugin="org.eclipse.papyrus.infra.widgets.toolbox" id="papyrusNotificationBuilder" name="Papyrus Notification Builder"/>
</appInfo>
<documentation>
This extension point allows developers to define custom IBuilder instance to be managed by notification Builder.
@@ -57,7 +57,7 @@ Take care to not always return true in the method accept to avoid intercepting a the builder instance. The implementation shall implement the methods to recognize and run a notification.
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.ui.toolbox.notification.IBuilder"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder"/>
</appInfo>
</annotation>
</attribute>
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/Activator.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/Activator.java index 393786bf4dc..c7af1de12d0 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/Activator.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/Activator.java @@ -11,7 +11,7 @@ * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox;
+package org.eclipse.papyrus.infra.widgets.toolbox;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/LookForElement.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/LookForElement.java index 8a0e9243e53..68b054ea4c3 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/LookForElement.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/LookForElement.java @@ -11,10 +11,10 @@ * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox;
+package org.eclipse.papyrus.infra.widgets.toolbox;
import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/SwtUtil.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/SwtUtil.java index 76555f573ff..117903fa934 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/SwtUtil.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/SwtUtil.java @@ -10,7 +10,7 @@ * Mik Kersten
* Steffen Pingel
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox;
+package org.eclipse.papyrus.infra.widgets.toolbox;
import java.util.Set;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/dialog/InformationDialog.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/dialog/InformationDialog.java index fb1e8b8c169..8e485d0e438 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/dialog/InformationDialog.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/dialog/InformationDialog.java @@ -11,7 +11,7 @@ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.dialog;
+package org.eclipse.papyrus.infra.widgets.toolbox.dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/draw2d/ManuallyDrawnShortcutDecorationFigure.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/draw2d/ManuallyDrawnShortcutDecorationFigure.java index 4572df55038..cac6e80d960 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/draw2d/ManuallyDrawnShortcutDecorationFigure.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/draw2d/ManuallyDrawnShortcutDecorationFigure.java @@ -9,7 +9,7 @@ * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation * ******************************************************************************/ -package org.eclipse.papyrus.ui.toolbox.draw2d; +package org.eclipse.papyrus.infra.widgets.toolbox.draw2d; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Polygon; diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/IBuilder.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/IBuilder.java index bcde963919a..bd814e753a9 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/IBuilder.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/IBuilder.java @@ -9,10 +9,10 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.PropertyWrapper;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.PropertyWrapper;
import org.eclipse.ui.forms.widgets.FormToolkit;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/ICallBack.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICallBack.java index c9f86820794..ebf1e5e9008 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/ICallBack.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICallBack.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/ICompositeCreator.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICompositeCreator.java index fb90105c9f2..88c438936ee 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/ICompositeCreator.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICompositeCreator.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/INotification.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/INotification.java index b64fbf4ad24..fbe844e7086 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/INotification.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/INotification.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/NotificationRunnable.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/NotificationRunnable.java index 1a66bbc0e87..1555f07e6ff 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/NotificationRunnable.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/NotificationRunnable.java @@ -9,9 +9,9 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.IContext;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;
/**
* a runnable
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/PapyrusToolkit.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/PapyrusToolkit.java index 28f0f55ee2e..028354eaed0 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/PapyrusToolkit.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/PapyrusToolkit.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/Type.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/Type.java index ed1fe45d90f..25eeff5fd7a 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/Type.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/Type.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/AsyncNotifierBuilder.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/AsyncNotifierBuilder.java index 142f828b126..71a560e4623 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/AsyncNotifierBuilder.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/AsyncNotifierBuilder.java @@ -9,15 +9,15 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.builders;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
-import org.eclipse.papyrus.ui.toolbox.notification.IBuilder;
-import org.eclipse.papyrus.ui.toolbox.notification.ICompositeCreator;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
-import org.eclipse.papyrus.ui.toolbox.notification.dialogs.AsyncNotification;
-import org.eclipse.papyrus.ui.toolbox.notification.dialogs.ImagePapyrusAsyncNotificationPopup;
-import org.eclipse.papyrus.ui.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup;
-import org.eclipse.papyrus.ui.toolbox.notification.utils.PapyrusControlsFactory;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.AsyncNotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.ImagePapyrusAsyncNotificationPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -34,7 +34,7 @@ public class AsyncNotifierBuilder implements IBuilder { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.IBuilder#build(org.eclipse.papyrus.ui.toolbox.notification.PropertyWrapper,
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,
* org.eclipse.ui.forms.widgets.FormToolkit)
*/
public INotification build(PropertyWrapper wrapper, final FormToolkit toolkit) {
@@ -90,7 +90,7 @@ public class AsyncNotifierBuilder implements IBuilder { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
*/
public boolean accept(String parameterName, Object value) {
if(NotificationBuilder.ASYNCHRONOUS.equals(parameterName)) {
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/CombinedPopupAndViewBuilder.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/CombinedPopupAndViewBuilder.java index 0f7440fb5e5..65868b12b1a 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/CombinedPopupAndViewBuilder.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/CombinedPopupAndViewBuilder.java @@ -11,21 +11,21 @@ * CEA LIST - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.builders;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
import java.util.HashSet;
-import org.eclipse.papyrus.ui.toolbox.notification.IBuilder;
-import org.eclipse.papyrus.ui.toolbox.notification.ICompositeCreator;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
-import org.eclipse.papyrus.ui.toolbox.notification.NotificationRunnable;
-import org.eclipse.papyrus.ui.toolbox.notification.dialogs.AsyncNotification;
-import org.eclipse.papyrus.ui.toolbox.notification.dialogs.ImagePapyrusAsyncNotificationPopup;
-import org.eclipse.papyrus.ui.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup;
-import org.eclipse.papyrus.ui.toolbox.notification.utils.PapyrusControlsFactory;
-import org.eclipse.papyrus.ui.toolbox.notification.view.AbstractInsideComposite;
-import org.eclipse.papyrus.ui.toolbox.notification.view.PapyrusNotificationView;
-import org.eclipse.papyrus.ui.toolbox.notification.view.ViewNotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.AsyncNotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.ImagePapyrusAsyncNotificationPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.AbstractInsideComposite;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.PapyrusNotificationView;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.ViewNotification;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbenchPage;
@@ -54,7 +54,7 @@ public class CombinedPopupAndViewBuilder implements IBuilder { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.IBuilder#build(org.eclipse.papyrus.ui.toolbox.notification.PropertyWrapper,
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,
* org.eclipse.ui.forms.widgets.FormToolkit)
*/
public INotification build(PropertyWrapper wrapper, FormToolkit toolkit) {
@@ -83,7 +83,7 @@ public class CombinedPopupAndViewBuilder implements IBuilder { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
*/
public boolean accept(String parameterName, Object value) {
return true;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/IContext.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/IContext.java index 6e6a9cff962..7de5a886e2f 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/IContext.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/IContext.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.builders;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
import java.util.HashMap;
import java.util.Map;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/NotificationBuilder.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java index 4f08762e69b..646281bd0f1 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/NotificationBuilder.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.builders;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
import java.util.Collection;
import java.util.HashMap;
@@ -23,13 +23,13 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.ui.toolbox.notification.IBuilder;
-import org.eclipse.papyrus.ui.toolbox.notification.ICompositeCreator;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
-import org.eclipse.papyrus.ui.toolbox.notification.NotificationRunnable;
-import org.eclipse.papyrus.ui.toolbox.notification.PapyrusToolkit;
-import org.eclipse.papyrus.ui.toolbox.notification.Type;
-import org.eclipse.papyrus.ui.toolbox.notification.popups.PopupNotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.PopupNotification;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
@@ -99,7 +99,7 @@ public class NotificationBuilder { */
private static Map<Class<? extends IBuilder>, IBuilder> getBuilders() {
Map<Class<? extends IBuilder>, IBuilder> result = new HashMap<Class<? extends IBuilder>, IBuilder>();
- IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.ui.toolbox.papyrusNotificationBuilder");
+ IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.infra.widgets.toolbox.papyrusNotificationBuilder");
for(IConfigurationElement e : elements) {
IBuilder instance;
try {
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/PopupBuilder.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PopupBuilder.java index 723db14be6f..342119c84f1 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/PopupBuilder.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PopupBuilder.java @@ -9,14 +9,14 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.builders;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
-import org.eclipse.papyrus.ui.toolbox.notification.IBuilder;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
-import org.eclipse.papyrus.ui.toolbox.notification.dialogs.PapyrusPopup;
-import org.eclipse.papyrus.ui.toolbox.notification.popups.IconAndMessagePapyrusPopup;
-import org.eclipse.papyrus.ui.toolbox.notification.popups.MessagePapyrusPopup;
-import org.eclipse.papyrus.ui.toolbox.notification.popups.PopupNotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.IconAndMessagePapyrusPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.MessagePapyrusPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.PopupNotification;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -31,7 +31,7 @@ public class PopupBuilder implements IBuilder { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.IBuilder#build(org.eclipse.papyrus.ui.toolbox.notification.PropertyWrapper,
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,
* org.eclipse.ui.forms.widgets.FormToolkit)
*/
public INotification build(PropertyWrapper wrapper, FormToolkit toolkit) {
@@ -71,7 +71,7 @@ public class PopupBuilder implements IBuilder { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
*/
public boolean accept(String parameterName, Object value) {
if(NotificationBuilder.ASYNCHRONOUS.equals(parameterName)) {
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/PropertyWrapper.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PropertyWrapper.java index b2319bdac8e..3bec6feff06 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/PropertyWrapper.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PropertyWrapper.java @@ -9,15 +9,15 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.builders;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.papyrus.ui.toolbox.notification.ICompositeCreator;
-import org.eclipse.papyrus.ui.toolbox.notification.NotificationRunnable;
-import org.eclipse.papyrus.ui.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
import org.eclipse.swt.graphics.Image;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/ViewBuilder.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/ViewBuilder.java index af04403284d..8713b01204d 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/builders/ViewBuilder.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/ViewBuilder.java @@ -9,16 +9,16 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.builders;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
-import org.eclipse.papyrus.ui.toolbox.notification.IBuilder;
-import org.eclipse.papyrus.ui.toolbox.notification.ICompositeCreator;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
-import org.eclipse.papyrus.ui.toolbox.notification.Type;
-import org.eclipse.papyrus.ui.toolbox.notification.utils.PapyrusControlsFactory;
-import org.eclipse.papyrus.ui.toolbox.notification.view.AbstractInsideComposite;
-import org.eclipse.papyrus.ui.toolbox.notification.view.PapyrusNotificationView;
-import org.eclipse.papyrus.ui.toolbox.notification.view.ViewNotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.AbstractInsideComposite;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.PapyrusNotificationView;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.ViewNotification;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
@@ -40,7 +40,7 @@ public class ViewBuilder implements IBuilder { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.IBuilder#build(org.eclipse.papyrus.ui.toolbox.notification.PropertyWrapper,
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,
* org.eclipse.ui.forms.widgets.FormToolkit)
*/
public INotification build(PropertyWrapper wrapper, FormToolkit toolkit) {
@@ -82,7 +82,7 @@ public class ViewBuilder implements IBuilder { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
*/
public boolean accept(String parameterName, Object value) {
boolean found = false;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/AbstractNotificationPopup.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AbstractNotificationPopup.java index 841df43962f..3d790920cae 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/AbstractNotificationPopup.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AbstractNotificationPopup.java @@ -9,7 +9,7 @@ * Benjamin Pasero - intial API and implementation
* Tasktop Technologies - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.dialogs;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -18,9 +18,9 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.resource.LocalResourceManager;
import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.core.utils.PapyrusImageUtils;
-import org.eclipse.papyrus.ui.toolbox.SwtUtil;
-import org.eclipse.papyrus.ui.toolbox.SwtUtil.FadeJob;
+import org.eclipse.papyrus.infra.core.utils.PapyrusImageUtils;
+import org.eclipse.papyrus.infra.widgets.toolbox.SwtUtil;
+import org.eclipse.papyrus.infra.widgets.toolbox.SwtUtil.FadeJob;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ControlAdapter;
import org.eclipse.swt.events.ControlEvent;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/AsyncNotification.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AsyncNotification.java index d893b60396f..e70983735f7 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/AsyncNotification.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AsyncNotification.java @@ -9,9 +9,9 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.dialogs;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
/**
* The INotification corresponding to the async builder
@@ -30,7 +30,7 @@ public class AsyncNotification implements INotification { /**
* delete the current notification
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.INotification#delete()
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#delete()
*/
public void delete() {
// delete immediately to avoid superposition with another
@@ -40,7 +40,7 @@ public class AsyncNotification implements INotification { /**
* whether the current notification is deleted
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.INotification#isDeleted()
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#isDeleted()
*
* @return true if notification is deleted
*/
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/CommonFonts.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/CommonFonts.java index 4968ab5f9c7..bd2a910ce14 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/CommonFonts.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/CommonFonts.java @@ -9,7 +9,7 @@ * Benjamin Pasero - intial API and implementation
* Tasktop Technologies - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.dialogs;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
import java.lang.reflect.Field;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/ImagePapyrusAsyncNotificationPopup.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/ImagePapyrusAsyncNotificationPopup.java index d0c8791c389..8f9db7fdbb7 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/ImagePapyrusAsyncNotificationPopup.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/ImagePapyrusAsyncNotificationPopup.java @@ -9,10 +9,10 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.dialogs;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
-import org.eclipse.papyrus.ui.toolbox.notification.Type;
-import org.eclipse.papyrus.ui.toolbox.notification.utils.PapyrusControlsFactory;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
@@ -58,7 +58,7 @@ public class ImagePapyrusAsyncNotificationPopup extends PapyrusAsyncNotification /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup#doCreateClient(org.eclipse.swt.widgets.Composite)
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup#doCreateClient(org.eclipse.swt.widgets.Composite)
*
* @Override
*/
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/NotificationPopupColors.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/NotificationPopupColors.java index e33bc73182e..010e941333a 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/NotificationPopupColors.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/NotificationPopupColors.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.dialogs;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
import org.eclipse.jface.resource.DeviceResourceException;
import org.eclipse.jface.resource.ResourceManager;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java index f2d6c82a6d1..24cdb50a1f2 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java @@ -9,14 +9,14 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.dialogs;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
import java.util.Collection;
import java.util.LinkedList;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
-import org.eclipse.papyrus.ui.toolbox.notification.NotificationRunnable;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.IContext;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/PapyrusPopup.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusPopup.java index 8e570e38bb6..37142de4012 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/dialogs/PapyrusPopup.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusPopup.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.dialogs;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
import java.util.Collection;
import java.util.HashMap;
@@ -18,12 +18,12 @@ import java.util.Map; import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.papyrus.core.utils.PapyrusImageUtils;
-import org.eclipse.papyrus.ui.toolbox.notification.ICompositeCreator;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
-import org.eclipse.papyrus.ui.toolbox.notification.NotificationRunnable;
-import org.eclipse.papyrus.ui.toolbox.notification.PapyrusToolkit;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.IContext;
+import org.eclipse.papyrus.infra.core.utils.PapyrusImageUtils;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/exception/NotificationException.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/exception/NotificationException.java index 65e8cfe4c5b..a12e688cdb5 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/exception/NotificationException.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/exception/NotificationException.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.exception;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.exception;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/popups/IconAndMessagePapyrusPopup.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/IconAndMessagePapyrusPopup.java index 2c23ec7bcbf..ee72f147c8e 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/popups/IconAndMessagePapyrusPopup.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/IconAndMessagePapyrusPopup.java @@ -9,11 +9,11 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.popups;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.popups;
-import org.eclipse.papyrus.ui.toolbox.notification.PapyrusToolkit;
-import org.eclipse.papyrus.ui.toolbox.notification.Type;
-import org.eclipse.papyrus.ui.toolbox.notification.utils.PapyrusControlsFactory;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/popups/MessagePapyrusPopup.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/MessagePapyrusPopup.java index c10503e3b7e..7f6c2b3882f 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/popups/MessagePapyrusPopup.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/MessagePapyrusPopup.java @@ -9,9 +9,9 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.popups;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.popups;
-import org.eclipse.papyrus.ui.toolbox.notification.dialogs.PapyrusPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusPopup;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/popups/PopupNotification.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/PopupNotification.java index bcdd635c6be..8bd83669057 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/popups/PopupNotification.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/PopupNotification.java @@ -9,10 +9,10 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.popups;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.popups;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
-import org.eclipse.papyrus.ui.toolbox.notification.dialogs.PapyrusPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusPopup;
import org.eclipse.swt.SWT;
/**
@@ -38,7 +38,7 @@ public class PopupNotification implements INotification { /**
* Whether the popup has been closed
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.INotification#isDeleted()
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#isDeleted()
*
* @return true
*/
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/utils/PapyrusControlsFactory.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/utils/PapyrusControlsFactory.java index 0ebc373b194..abbd2838d5b 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/utils/PapyrusControlsFactory.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/utils/PapyrusControlsFactory.java @@ -9,13 +9,13 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.utils;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.utils;
-import org.eclipse.papyrus.ui.toolbox.notification.ICompositeCreator;
-import org.eclipse.papyrus.ui.toolbox.notification.PapyrusToolkit;
-import org.eclipse.papyrus.ui.toolbox.notification.Type;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.IContext;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/view/AbstractInsideComposite.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/AbstractInsideComposite.java index e2eec162db4..291132c9783 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/view/AbstractInsideComposite.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/AbstractInsideComposite.java @@ -9,16 +9,16 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.view;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.view;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
-import org.eclipse.papyrus.ui.toolbox.notification.ICallBack;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
-import org.eclipse.papyrus.ui.toolbox.notification.NotificationRunnable;
-import org.eclipse.papyrus.ui.toolbox.notification.builders.IContext;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICallBack;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/view/MessageComposite.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/MessageComposite.java index d4c236508d9..a57dcb00405 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/view/MessageComposite.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/MessageComposite.java @@ -9,12 +9,12 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.view;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.view;
import java.util.Collection;
-import org.eclipse.papyrus.ui.toolbox.notification.ICallBack;
-import org.eclipse.papyrus.ui.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICallBack;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/view/PapyrusNotificationView.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/PapyrusNotificationView.java index ad5ed9c9487..5ec5843b912 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/view/PapyrusNotificationView.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/PapyrusNotificationView.java @@ -9,7 +9,7 @@ * Contributors: * Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation *****************************************************************************/ -package org.eclipse.papyrus.ui.toolbox.notification.view; +package org.eclipse.papyrus.infra.widgets.toolbox.notification.view; import java.util.Collection; @@ -20,14 +20,14 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; -import org.eclipse.papyrus.core.utils.PapyrusImageUtils; -import org.eclipse.papyrus.ui.toolbox.notification.ICallBack; -import org.eclipse.papyrus.ui.toolbox.notification.ICompositeCreator; -import org.eclipse.papyrus.ui.toolbox.notification.NotificationRunnable; -import org.eclipse.papyrus.ui.toolbox.notification.PapyrusToolkit; -import org.eclipse.papyrus.ui.toolbox.notification.Type; -import org.eclipse.papyrus.ui.toolbox.notification.utils.PapyrusControlsFactory; -import org.eclipse.papyrus.ui.toolbox.utils.ToolbooxImageUtils; +import org.eclipse.papyrus.infra.core.utils.PapyrusImageUtils; +import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICallBack; +import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator; +import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable; +import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit; +import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type; +import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory; +import org.eclipse.papyrus.infra.widgets.toolbox.utils.ToolbooxImageUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.FormAttachment; @@ -53,7 +53,7 @@ public class PapyrusNotificationView extends ViewPart implements ICallBack { /** * The ID of the view as specified by the extension. */ - public static final String ID = "org.eclipse.papyrus.ui.toolbox.notification.view.PapyrusNotificationView"; + public static final String ID = "org.eclipse.papyrus.infra.widgets.toolbox.notification.view.PapyrusNotificationView"; private Action closeAllAction; @@ -305,7 +305,7 @@ public class PapyrusNotificationView extends ViewPart implements ICallBack { }; allDefaultAction.setText("Run all default action"); allDefaultAction.setToolTipText("Run all default action"); - allDefaultAction.setImageDescriptor(ToolbooxImageUtils.getImageDescriptor(org.eclipse.papyrus.ui.toolbox.utils.ISharedImages.IMG_RUN)); + allDefaultAction.setImageDescriptor(ToolbooxImageUtils.getImageDescriptor(org.eclipse.papyrus.infra.widgets.toolbox.utils.ISharedImages.IMG_RUN)); closeAllAction = new Action() { public void run() { @@ -363,7 +363,7 @@ public class PapyrusNotificationView extends ViewPart implements ICallBack { * (non-Javadoc) * this method update the after and previous attributes to update the layout * - * @see org.eclipse.papyrus.ui.toolbox.notification.view.ICloseCallBack#closed(java.lang.Object) + * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.view.ICloseCallBack#closed(java.lang.Object) */ public void callBack(Object element) { destroy(element); diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/view/ViewNotification.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/ViewNotification.java index c22d42fc2e3..f88016ca139 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/notification/view/ViewNotification.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/ViewNotification.java @@ -9,9 +9,9 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.notification.view;
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.view;
-import org.eclipse.papyrus.ui.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
/**
* The INotification corresponding to the view builder
@@ -35,7 +35,7 @@ public class ViewNotification implements INotification { *
* whether the current notification is deleted
*
- * @see org.eclipse.papyrus.ui.toolbox.notification.INotification#isDeleted()
+ * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#isDeleted()
* @return true if notification is deleted
*/
public boolean isDeleted() {
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/utils/ISharedImages.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ISharedImages.java index 685349d914a..a2105106c1e 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/utils/ISharedImages.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ISharedImages.java @@ -9,7 +9,7 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.utils;
+package org.eclipse.papyrus.infra.widgets.toolbox.utils;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/utils/ToolbooxImageUtils.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ToolbooxImageUtils.java index 0e28c2dff30..3214f4736fa 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/utils/ToolbooxImageUtils.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ToolbooxImageUtils.java @@ -9,14 +9,14 @@ * Contributors:
* Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.ui.toolbox.utils;
+package org.eclipse.papyrus.infra.widgets.toolbox.utils;
import java.io.IOException;
import java.net.URL;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.papyrus.ui.toolbox.Activator;
+import org.eclipse.papyrus.infra.widgets.toolbox.Activator;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.widgets.Display;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF index c4df50c0413..ab618c38e87 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF @@ -8,20 +8,20 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.ui.ide;bundle-version="3.7.0"
-Export-Package: org.eclipse.papyrus.widgets,
- org.eclipse.papyrus.widgets.creation,
- org.eclipse.papyrus.widgets.databinding,
- org.eclipse.papyrus.widgets.editors,
- org.eclipse.papyrus.widgets.providers,
- org.eclipse.papyrus.widgets.selectors,
- org.eclipse.papyrus.widgets.util
+Export-Package: org.eclipse.papyrus.infra.widgets,
+ org.eclipse.papyrus.infra.widgets.creation,
+ org.eclipse.papyrus.infra.widgets.databinding,
+ org.eclipse.papyrus.infra.widgets.editors,
+ org.eclipse.papyrus.infra.widgets.providers,
+ org.eclipse.papyrus.infra.widgets.selectors,
+ org.eclipse.papyrus.infra.widgets.util
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.widgets.Activator
+Bundle-Activator: org.eclipse.papyrus.infra.widgets.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/Activator.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/Activator.java index 2321144e4b8..1d81148d7fe 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/Activator.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/Activator.java @@ -9,11 +9,11 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets;
+package org.eclipse.papyrus.infra.widgets;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/creation/ReferenceValueFactory.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/ReferenceValueFactory.java index 8d30f6d7f83..25586368f79 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/creation/ReferenceValueFactory.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/ReferenceValueFactory.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.creation;
+package org.eclipse.papyrus.infra.widgets.creation;
import java.util.Collection;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/creation/StringEditionFactory.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/StringEditionFactory.java index 1ca6106bbe7..bd82e1940a1 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/creation/StringEditionFactory.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/StringEditionFactory.java @@ -9,14 +9,14 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.creation;
+package org.eclipse.papyrus.infra.widgets.creation;
import java.util.Collection;
import org.eclipse.jface.dialogs.IInputValidator;
import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.widgets.editors.InputDialog;
-import org.eclipse.papyrus.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.editors.InputDialog;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
import org.eclipse.swt.widgets.Control;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/AggregatedObservable.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/AggregatedObservable.java index fca632d3c23..ecb8fc9f30a 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/AggregatedObservable.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/AggregatedObservable.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.databinding;
+package org.eclipse.papyrus.infra.widgets.databinding;
import org.eclipse.core.databinding.observable.IObservable;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/CLabelObservableValue.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CLabelObservableValue.java index 9be4d0cf068..64031f2a893 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/CLabelObservableValue.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CLabelObservableValue.java @@ -9,13 +9,13 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.databinding;
+package org.eclipse.papyrus.infra.widgets.databinding;
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.papyrus.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
import org.eclipse.swt.custom.CLabel;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/ComboObservableValue.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ComboObservableValue.java index 862e0fbef6e..03e0988c2c6 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/ComboObservableValue.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ComboObservableValue.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.databinding;
+package org.eclipse.papyrus.infra.widgets.databinding;
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -20,9 +20,9 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.widgets.providers.ComboLabelProvider;
-import org.eclipse.papyrus.widgets.providers.UnchangedObject;
-import org.eclipse.papyrus.widgets.providers.UnsetObject;
+import org.eclipse.papyrus.infra.widgets.providers.ComboLabelProvider;
+import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;
+import org.eclipse.papyrus.infra.widgets.providers.UnsetObject;
public class ComboObservableValue extends AbstractObservableValue implements ISelectionChangedListener {
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/GrayedCheckboxObservableValue.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/GrayedCheckboxObservableValue.java index 1918a781dca..db3ca5b4dd0 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/GrayedCheckboxObservableValue.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/GrayedCheckboxObservableValue.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.databinding;
+package org.eclipse.papyrus.infra.widgets.databinding;
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
import org.eclipse.core.databinding.observable.value.ValueDiff;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/ReferenceDialogObservableValue.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ReferenceDialogObservableValue.java index 3acebe7cd19..09e62043378 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/ReferenceDialogObservableValue.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ReferenceDialogObservableValue.java @@ -9,11 +9,11 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.databinding;
+package org.eclipse.papyrus.infra.widgets.databinding;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.widgets.editors.ReferenceDialog;
+import org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog;
import org.eclipse.swt.custom.CLabel;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/TextObservableValue.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/TextObservableValue.java index 20e8d37c669..8799a33033d 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/TextObservableValue.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/TextObservableValue.java @@ -1,10 +1,10 @@ -package org.eclipse.papyrus.widgets.databinding;
+package org.eclipse.papyrus.infra.widgets.databinding;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.ValueDiff;
-import org.eclipse.papyrus.widgets.providers.UnchangedObject;
+import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/UnknownValueDiff.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/UnknownValueDiff.java index 96612f9b464..47818d3f4b9 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/databinding/UnknownValueDiff.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/UnknownValueDiff.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.databinding;
+package org.eclipse.papyrus.infra.widgets.databinding;
import org.eclipse.core.databinding.observable.value.ValueDiff;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/AbstractEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java index c0db1864835..4f0a654cf88 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/AbstractEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.HashSet;
import java.util.Set;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/AbstractListEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractListEditor.java index 9a91eab38c0..f91c35bdb5e 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/AbstractListEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractListEditor.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.databinding.UpdateListStrategy;
import org.eclipse.core.databinding.conversion.IConverter;
@@ -131,7 +131,7 @@ public abstract class AbstractListEditor extends AbstractEditor { *
* When overriding this method, you should also override {@link #refreshValue()}
*
- * @see org.eclipse.papyrus.widgets.AbstractEditor#doBinding()
+ * @see org.eclipse.papyrus.infra.widgets.AbstractEditor#doBinding()
*/
@Override
protected void doBinding() {
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/AbstractValueEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractValueEditor.java index c28b45302de..016ca92ca9a 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/AbstractValueEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractValueEditor.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.databinding.UpdateValueStrategy;
import org.eclipse.core.databinding.conversion.IConverter;
@@ -145,7 +145,7 @@ public abstract class AbstractValueEditor extends AbstractEditor { *
* When overriding this method, you should also override {@link #refreshValue()}
*
- * @see org.eclipse.papyrus.widgets.AbstractEditor#doBinding()
+ * @see org.eclipse.papyrus.infra.widgets.AbstractEditor#doBinding()
*/
@Override
protected void doBinding() {
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/BooleanCheckbox.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCheckbox.java index 05b9ac3b8de..9a99333e888 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/BooleanCheckbox.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCheckbox.java @@ -9,12 +9,12 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.papyrus.widgets.databinding.AggregatedObservable;
-import org.eclipse.papyrus.widgets.databinding.GrayedCheckboxObservableValue;
+import org.eclipse.papyrus.infra.widgets.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.widgets.databinding.GrayedCheckboxObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/BooleanCombo.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCombo.java index c9b3e214b2c..2524cf4fc4f 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/BooleanCombo.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCombo.java @@ -9,13 +9,13 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.jface.databinding.viewers.ViewerProperties;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.widgets.providers.AbstractStaticContentProvider;
-import org.eclipse.papyrus.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/BooleanRadio.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanRadio.java index 83934ec86b0..937b0a36391 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/BooleanRadio.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanRadio.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.SelectObservableValue;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/BooleanToggle.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanToggle.java index d675a25b164..348b96f4a8c 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/BooleanToggle.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanToggle.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.swt.SWT;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/CompactMultipleIntegerEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleIntegerEditor.java index d259e6ce350..0c27d7bdf45 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/CompactMultipleIntegerEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleIntegerEditor.java @@ -9,9 +9,9 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
-import org.eclipse.papyrus.widgets.selectors.IntegerSelector;
+import org.eclipse.papyrus.infra.widgets.selectors.IntegerSelector;
import org.eclipse.swt.widgets.Composite;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/CompactMultipleReferenceEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleReferenceEditor.java index ac1e11c4de7..c4847d34267 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/CompactMultipleReferenceEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleReferenceEditor.java @@ -9,11 +9,11 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
-import org.eclipse.papyrus.widgets.selectors.ReferenceSelector;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
import org.eclipse.swt.widgets.Composite;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/CompactMultipleStringEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleStringEditor.java index cfb34fee10a..d3d743268a4 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/CompactMultipleStringEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleStringEditor.java @@ -9,9 +9,9 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
-import org.eclipse.papyrus.widgets.selectors.StringSelector;
+import org.eclipse.papyrus.infra.widgets.selectors.StringSelector;
import org.eclipse.swt.widgets.Composite;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/CompactMultipleValueEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleValueEditor.java index bab759d2ca9..6d24e587343 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/CompactMultipleValueEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleValueEditor.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.Collection;
import java.util.LinkedList;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/EnumCombo.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumCombo.java index 8cc1d5ab9d4..8f4441d3c8f 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/EnumCombo.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumCombo.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/EnumRadio.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumRadio.java index 1da6169c869..deb384f69d2 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/EnumRadio.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumRadio.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.HashMap;
import java.util.Map;
@@ -19,8 +19,8 @@ import org.eclipse.core.databinding.observable.value.SelectObservableValue; import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.papyrus.widgets.messages.Messages;
-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/FloatEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/FloatEditor.java index b49360c24e3..4053e538216 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/FloatEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/FloatEditor.java @@ -9,12 +9,12 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.databinding.conversion.IConverter;
import org.eclipse.core.databinding.conversion.NumberToStringConverter;
import org.eclipse.core.databinding.conversion.StringToNumberConverter;
-import org.eclipse.papyrus.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.Activator;
import org.eclipse.swt.widgets.Composite;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/ICommitListener.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ICommitListener.java index 3ae0aa31249..cf2599a97d6 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/ICommitListener.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ICommitListener.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.databinding.observable.IObservable;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/IElementSelectionListener.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelectionListener.java index ac44710a12d..fdbc1891a32 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/IElementSelectionListener.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelectionListener.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
public interface IElementSelectionListener {
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/IElementSelector.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelector.java index 3503c05a8b2..1520e662e04 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/IElementSelector.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelector.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/ITreeSelectorDialog.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ITreeSelectorDialog.java index 2a0f8e62c46..4e3f8c93463 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/ITreeSelectorDialog.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ITreeSelectorDialog.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.List;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/InputDialog.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/InputDialog.java index 352c81b66cf..343d775cf15 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/InputDialog.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/InputDialog.java @@ -9,13 +9,13 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.Collections;
import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.papyrus.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.Activator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/IntegerEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerEditor.java index 5b045753d2e..65033c479ee 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/IntegerEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerEditor.java @@ -9,12 +9,12 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.databinding.conversion.IConverter;
import org.eclipse.core.databinding.conversion.NumberToStringConverter;
import org.eclipse.core.databinding.conversion.StringToNumberConverter;
-import org.eclipse.papyrus.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.Activator;
import org.eclipse.swt.widgets.Composite;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/IntegerMask.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerMask.java index a4b27acfc3d..f9ad94a5103 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/IntegerMask.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerMask.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.HashMap;
import java.util.Map;
@@ -17,8 +17,8 @@ import java.util.Map.Entry; import org.eclipse.core.databinding.observable.ChangeEvent;
import org.eclipse.core.databinding.observable.IChangeListener;
-import org.eclipse.papyrus.widgets.Activator;
-import org.eclipse.papyrus.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/IntegerSpinner.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerSpinner.java index 3d108b33c8f..1a6624f1630 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/IntegerSpinner.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerSpinner.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.databinding.conversion.IConverter;
import org.eclipse.core.databinding.conversion.StringToNumberConverter;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/MultipleIntegerEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleIntegerEditor.java index f4fe3d3b655..d117ae3a5cb 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/MultipleIntegerEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleIntegerEditor.java @@ -9,9 +9,9 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
-import org.eclipse.papyrus.widgets.selectors.IntegerSelector;
+import org.eclipse.papyrus.infra.widgets.selectors.IntegerSelector;
import org.eclipse.swt.widgets.Composite;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/MultipleReferenceEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleReferenceEditor.java index 5189150c559..0f60c6ce37a 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/MultipleReferenceEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleReferenceEditor.java @@ -9,14 +9,14 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.widgets.providers.EmptyContentProvider;
-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
-import org.eclipse.papyrus.widgets.providers.WrappedLabelProvider;
-import org.eclipse.papyrus.widgets.selectors.ReferenceSelector;
+import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.WrappedLabelProvider;
+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
import org.eclipse.swt.widgets.Composite;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/MultipleStringEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringEditor.java index 737646587fc..d5940e99da6 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/MultipleStringEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringEditor.java @@ -9,10 +9,10 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
-import org.eclipse.papyrus.widgets.creation.StringEditionFactory;
-import org.eclipse.papyrus.widgets.selectors.StringSelector;
+import org.eclipse.papyrus.infra.widgets.creation.StringEditionFactory;
+import org.eclipse.papyrus.infra.widgets.selectors.StringSelector;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/MultipleValueEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java index 0b11ed5654b..810743971be 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/MultipleValueEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.Arrays;
import java.util.Collection;
@@ -25,10 +25,10 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.widgets.Activator;
-import org.eclipse.papyrus.widgets.creation.ReferenceValueFactory;
-import org.eclipse.papyrus.widgets.messages.Messages;
-import org.eclipse.papyrus.widgets.providers.TreeCollectionContentProvider;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.TreeCollectionContentProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.SelectionEvent;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/MultipleValueSelectorDialog.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialog.java index 2dbf5f29645..508293c8f22 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/MultipleValueSelectorDialog.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialog.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.Arrays;
import java.util.Collection;
@@ -23,10 +23,10 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ListViewer;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.widgets.Activator;
-import org.eclipse.papyrus.widgets.creation.ReferenceValueFactory;
-import org.eclipse.papyrus.widgets.messages.Messages;
-import org.eclipse.papyrus.widgets.providers.CollectionContentProvider;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/ReferenceCombo.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceCombo.java index d3f256dffb5..8213bd6c1d0 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/ReferenceCombo.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceCombo.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.runtime.Assert;
@@ -17,12 +17,12 @@ import org.eclipse.jface.viewers.ComboViewer; import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.widgets.databinding.AggregatedObservable;
-import org.eclipse.papyrus.widgets.databinding.ComboObservableValue;
-import org.eclipse.papyrus.widgets.providers.EncapsulatedContentProvider;
-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
-import org.eclipse.papyrus.widgets.providers.UnchangedObject;
-import org.eclipse.papyrus.widgets.providers.UnsetObject;
+import org.eclipse.papyrus.infra.widgets.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.widgets.databinding.ComboObservableValue;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;
+import org.eclipse.papyrus.infra.widgets.providers.UnsetObject;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.graphics.Color;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/ReferenceDialog.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java index 00f437c41e1..fa3b8291d77 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/ReferenceDialog.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.Collection;
import java.util.Collections;
@@ -18,14 +18,14 @@ import java.util.List; import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.widgets.Activator;
-import org.eclipse.papyrus.widgets.creation.ReferenceValueFactory;
-import org.eclipse.papyrus.widgets.databinding.CLabelObservableValue;
-import org.eclipse.papyrus.widgets.databinding.ReferenceDialogObservableValue;
-import org.eclipse.papyrus.widgets.messages.Messages;
-import org.eclipse.papyrus.widgets.providers.EncapsulatedContentProvider;
-import org.eclipse.papyrus.widgets.providers.IAdaptableContentProvider;
-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.databinding.CLabelObservableValue;
+import org.eclipse.papyrus.infra.widgets.databinding.ReferenceDialogObservableValue;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.DisposeEvent;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/SelectionEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionEditor.java index 0acd6c5c2b8..f9ba058be9b 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/SelectionEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionEditor.java @@ -11,7 +11,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.ArrayList;
import java.util.Arrays;
@@ -22,9 +22,9 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ListViewer;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.widgets.Activator;
-import org.eclipse.papyrus.widgets.messages.Messages;
-import org.eclipse.papyrus.widgets.providers.CollectionContentProvider;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/StringCombo.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringCombo.java index 96ea882b8bb..5fb10328026 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/StringCombo.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringCombo.java @@ -9,15 +9,15 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.ValueDiff;
-import org.eclipse.papyrus.widgets.databinding.AggregatedObservable;
-import org.eclipse.papyrus.widgets.providers.EncapsulatedContentProvider;
-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
-import org.eclipse.papyrus.widgets.providers.UnchangedObject;
+import org.eclipse.papyrus.infra.widgets.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.FocusListener;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/StringEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringEditor.java index 4cc4d4d0755..613db74d505 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/StringEditor.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringEditor.java @@ -9,13 +9,13 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.Timer;
import java.util.TimerTask;
import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.papyrus.widgets.databinding.TextObservableValue;
+import org.eclipse.papyrus.infra.widgets.databinding.TextObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/StringFileSelector.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringFileSelector.java index 4cb95821b3f..38241f4d0ca 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/StringFileSelector.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringFileSelector.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.io.File;
import java.util.Arrays;
@@ -20,8 +20,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.widgets.messages.Messages;
-import org.eclipse.papyrus.widgets.util.FileUtil;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.util.FileUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/StringLabel.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringLabel.java index 9974190a6ad..d59d5965dc8 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/StringLabel.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringLabel.java @@ -9,13 +9,13 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import org.eclipse.core.databinding.observable.ChangeEvent;
import org.eclipse.core.databinding.observable.IChangeListener;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.papyrus.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.Activator;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/TreeSelectorDialog.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/TreeSelectorDialog.java index 5bb5135cf70..b773c6aeedc 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/editors/TreeSelectorDialog.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/TreeSelectorDialog.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.editors;
+package org.eclipse.papyrus.infra.widgets.editors;
import java.util.Collections;
import java.util.HashSet;
@@ -28,10 +28,10 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.papyrus.widgets.Activator;
-import org.eclipse.papyrus.widgets.providers.IAdaptableContentProvider;
-import org.eclipse.papyrus.widgets.providers.IGraphicalContentProvider;
-import org.eclipse.papyrus.widgets.providers.IHierarchicContentProvider;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IGraphicalContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/messages/Messages.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/Messages.java index 282dfefeb02..93d89944b39 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/messages/Messages.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/Messages.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.messages;
+package org.eclipse.papyrus.infra.widgets.messages;
import org.eclipse.osgi.util.NLS;
@@ -19,7 +19,7 @@ import org.eclipse.osgi.util.NLS; public class Messages extends NLS {
/** The Constant BUNDLE_NAME. */
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.widgets.messages.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.widgets.messages.messages"; //$NON-NLS-1$
/** The Multiple value editor_ add elements. */
public static String MultipleValueEditor_AddElements;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/messages/messages.properties b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/messages.properties index 8457d053eeb..8457d053eeb 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/messages/messages.properties +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/messages.properties diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/AbstractFilteredContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractFilteredContentProvider.java index f917bc53647..632cbc9ba6d 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/AbstractFilteredContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractFilteredContentProvider.java @@ -9,14 +9,14 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.papyrus.widgets.editors.AbstractEditor;
-import org.eclipse.papyrus.widgets.editors.ICommitListener;
-import org.eclipse.papyrus.widgets.editors.StringEditor;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.StringEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/AbstractStaticContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractStaticContentProvider.java index 145f249b911..9d421be3bcd 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/AbstractStaticContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractStaticContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.Viewer;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/AbstractTreeFilter.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractTreeFilter.java index e8c029d5b45..0ec3462cb48 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/AbstractTreeFilter.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractTreeFilter.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/CollectionContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CollectionContentProvider.java index 98a64e04060..dda77df673a 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/CollectionContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CollectionContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import java.util.Collection;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/ComboLabelProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/ComboLabelProvider.java index 151ac984c37..1f71b36e9b4 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/ComboLabelProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/ComboLabelProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.ILabelProvider;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/EmptyContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EmptyContentProvider.java index 7506406c3f1..6677b40bb9f 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/EmptyContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EmptyContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.Viewer;
@@ -41,7 +41,7 @@ public class EmptyContentProvider implements IStaticContentProvider { }
/**
- * @see org.eclipse.papyrus.widgets.providers.IStaticContentProvider#getElements()
+ * @see org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider#getElements()
*
* @return
* an empty array
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/EncapsulatedContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EncapsulatedContentProvider.java index 2370bb84691..d2d6f154e3a 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/EncapsulatedContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EncapsulatedContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import java.util.LinkedHashSet;
import java.util.LinkedList;
@@ -18,8 +18,8 @@ import java.util.Set; import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.widgets.editors.AbstractEditor;
-import org.eclipse.papyrus.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
import org.eclipse.swt.widgets.Composite;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/HierarchicToFlatContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/HierarchicToFlatContentProvider.java index 58358fa6b00..7ba654007c9 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/HierarchicToFlatContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/HierarchicToFlatContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import java.util.Collection;
import java.util.HashSet;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/IAdaptableContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IAdaptableContentProvider.java index 3942fc67d37..07e684e9c00 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/IAdaptableContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IAdaptableContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.IStructuredContentProvider;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/IDetailLabelProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IDetailLabelProvider.java index 9a5ae27f5c7..90a39fa6d3a 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/IDetailLabelProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IDetailLabelProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.ILabelProvider;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/IGraphicalContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IGraphicalContentProvider.java index 41070812a9c..bfd80887e7b 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/IGraphicalContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IGraphicalContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/IHierarchicContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IHierarchicContentProvider.java index a32667b42ad..74c6dd9f7b1 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/IHierarchicContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IHierarchicContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.ITreeContentProvider;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/IStaticContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IStaticContentProvider.java index 3f1a9232472..107248f9ce1 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/IStaticContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IStaticContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.IContentProvider;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/PatternViewerFilter.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/PatternViewerFilter.java index 99609f9d5e2..b322bbd331e 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/PatternViewerFilter.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/PatternViewerFilter.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.ILabelProvider;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/StaticContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/StaticContentProvider.java index 849016db5b5..437e46a911b 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/StaticContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/StaticContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.Viewer;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/TreeCollectionContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeCollectionContentProvider.java index 061b168a9e1..acffd427a5f 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/TreeCollectionContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeCollectionContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import java.util.Collection;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/TreeToFlatContentProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeToFlatContentProvider.java index b68b6dbb628..569c1903143 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/TreeToFlatContentProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeToFlatContentProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import java.util.Collection;
import java.util.HashSet;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/UnchangedObject.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnchangedObject.java index e6662f51828..a5e88e8f10a 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/UnchangedObject.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnchangedObject.java @@ -9,9 +9,9 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
-import org.eclipse.papyrus.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
public class UnchangedObject {
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/UnsetObject.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnsetObject.java index a2a0aa5a4af..9cc3d3de349 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/UnsetObject.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnsetObject.java @@ -9,9 +9,9 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
-import org.eclipse.papyrus.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
public class UnsetObject {
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/WrappedLabelProvider.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WrappedLabelProvider.java index 7f16c250914..f2a2e38e1fa 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/providers/WrappedLabelProvider.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WrappedLabelProvider.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.providers;
+package org.eclipse.papyrus.infra.widgets.providers;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/selectors/IntegerSelector.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/IntegerSelector.java index 27bf131e13e..9f22c4147d1 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/selectors/IntegerSelector.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/IntegerSelector.java @@ -9,7 +9,8 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.selectors;
+package org.eclipse.papyrus.infra.widgets.selectors;
+
/**
* A Selector for Integer values
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/selectors/ReferenceSelector.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/ReferenceSelector.java index 2e34b40d0fe..50bbfb8a9a8 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/selectors/ReferenceSelector.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/ReferenceSelector.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.selectors;
+package org.eclipse.papyrus.infra.widgets.selectors;
import java.util.Arrays;
import java.util.Collection;
@@ -23,10 +23,10 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.papyrus.widgets.editors.IElementSelectionListener;
-import org.eclipse.papyrus.widgets.editors.IElementSelector;
-import org.eclipse.papyrus.widgets.providers.EncapsulatedContentProvider;
-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -41,7 +41,7 @@ import org.eclipse.ui.dialogs.PatternFilter; /**
* A Selector for Multiple Reference values, with a filter
*
- * This selector is compatible with {@link org.eclipse.papyrus.widgets.providers.IAdaptableContentProvider}
+ * This selector is compatible with {@link org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider}
*
* @author Camille Letavernier
*
@@ -146,7 +146,7 @@ public class ReferenceSelector implements IElementSelector { * The array of elements wrapped in their container
*
* @see #getSemanticElements(Object[])
- * @see org.eclipse.papyrus.widgets.providers.IAdaptableContentProvider
+ * @see org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider
*/
private Object[] getContainerElements(Object[] semanticElements) {
Object[] containerElements = new Object[semanticElements.length];
@@ -173,7 +173,7 @@ public class ReferenceSelector implements IElementSelector { * The array of semantic elements to be converted
*
* @see #getContainerElements(Object[])
- * @see org.eclipse.papyrus.widgets.providers.IAdaptableContentProvider
+ * @see org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider
*/
private Object[] getSemanticElements(Object[] containerElements) {
Object[] semanticElements = new Object[containerElements.length];
@@ -193,7 +193,7 @@ public class ReferenceSelector implements IElementSelector { * @return
* The filtered array
*
- * @see org.eclipse.papyrus.widgets.providers.IHierarchicContentProvider#isValidValue(Object)
+ * @see org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider#isValidValue(Object)
*/
protected Object[] getElementsToMove(Object[] selection) {
List<Object> elementsToMove = new LinkedList<Object>();
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/selectors/StandardSelector.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StandardSelector.java index 359427ac86d..5fd3258a1c3 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/selectors/StandardSelector.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StandardSelector.java @@ -9,19 +9,19 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.selectors;
+package org.eclipse.papyrus.infra.widgets.selectors;
import java.lang.reflect.Constructor;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.papyrus.widgets.Activator;
-import org.eclipse.papyrus.widgets.editors.AbstractEditor;
-import org.eclipse.papyrus.widgets.editors.AbstractValueEditor;
-import org.eclipse.papyrus.widgets.editors.ICommitListener;
-import org.eclipse.papyrus.widgets.editors.IElementSelectionListener;
-import org.eclipse.papyrus.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractValueEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/selectors/StringSelector.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StringSelector.java index af98b04fba8..e3062ce462f 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/selectors/StringSelector.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StringSelector.java @@ -9,13 +9,13 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.selectors;
+package org.eclipse.papyrus.infra.widgets.selectors;
import java.util.HashSet;
import java.util.Set;
-import org.eclipse.papyrus.widgets.editors.IElementSelectionListener;
-import org.eclipse.papyrus.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/util/FileUtil.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/FileUtil.java index 3ee8b00b4a5..66e8a8528fa 100644 --- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/util/FileUtil.java +++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/FileUtil.java @@ -9,7 +9,7 @@ * Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.widgets.util;
+package org.eclipse.papyrus.infra.widgets.util;
import java.io.File;
@@ -18,8 +18,8 @@ import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.papyrus.widgets.Activator;
-import org.eclipse.papyrus.widgets.editors.StringFileSelector;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.editors.StringFileSelector;
/**
* A helper class for resolving files and path, either in the workspace or
|