diff options
| author | ptessier | 2014-02-21 09:57:54 +0000 |
|---|---|---|
| committer | ptessier | 2014-02-21 09:57:54 +0000 |
| commit | a3d01d08c5af2a12eb6ba5cf606d7449935b2fa1 (patch) | |
| tree | 24d4cdea693f8602aea2e822d291ee489ffa8288 | |
| parent | faed100368408a1361f1f9068eaa782d03a134c3 (diff) | |
| download | org.eclipse.papyrus-a3d01d08c5af2a12eb6ba5cf606d7449935b2fa1.tar.gz org.eclipse.papyrus-a3d01d08c5af2a12eb6ba5cf606d7449935b2fa1.tar.xz org.eclipse.papyrus-a3d01d08c5af2a12eb6ba5cf606d7449935b2fa1.zip | |
Bug 386118 - [EMF Facet] Papyrus should progressively support EMF Facet
0.2
impact of package renaming
1346 files changed, 8658 insertions, 8830 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteContentPage.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteContentPage.java index 2b4208c0abe..227ebd7d1fc 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteContentPage.java +++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteContentPage.java @@ -32,15 +32,6 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EContentAdapter;
import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.facet.custom.core.ICustomizationCatalogManager;
-import org.eclipse.emf.facet.custom.core.ICustomizationCatalogManagerFactory;
-import org.eclipse.emf.facet.custom.core.ICustomizationManager;
-import org.eclipse.emf.facet.custom.core.ICustomizationManagerFactory;
-import org.eclipse.emf.facet.custom.core.internal.CustomizationCatalogManager;
-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;
-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.customizationcatalog.CustomizationcatalogFactory;
-import org.eclipse.emf.facet.custom.ui.internal.CustomizedLabelProvider;
-import org.eclipse.emf.facet.custom.ui.internal.CustomizedTreeContentProvider;
import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
import org.eclipse.gef.palette.PaletteContainer;
import org.eclipse.gef.palette.PaletteDrawer;
@@ -68,6 +59,15 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationCatalogManager;
+import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationCatalogManagerFactory;
+import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
+import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManagerFactory;
+import org.eclipse.papyrus.emf.facet.custom.core.internal.CustomizationCatalogManager;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.customizationcatalog.CustomizationcatalogFactory;
+import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedLabelProvider;
+import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedTreeContentProvider;
import org.eclipse.papyrus.uml.diagram.common.Activator;
import org.eclipse.papyrus.uml.diagram.common.Messages;
import org.eclipse.papyrus.uml.diagram.common.part.PaletteUtil;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.xml index ea7b0bf10ec..edead5c4ea3 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/plugin.xml @@ -10,4 +10,7 @@ <modelqueryset file="facet/PaletteConfiguration.querySet"/>
</extension>
-->
+ <extension point="org.eclipse.papyrus.emf.facet.util.emf.core.modeldeclaration">
+ <modeldeclaration file="facet/PaletteConfiguration.custom"/>
+</extension>
</plugin>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetDrawerLabelQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetDrawerLabelQuery.java index e277e3c17df..445f31d6b1d 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetDrawerLabelQuery.java +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetDrawerLabelQuery.java @@ -1,9 +1,9 @@ package org.eclipse.papyrus.customization.paletteconfiguration.queries; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; +import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; +import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration; /** Returns the label for a drawer */ diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetIconQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetIconQuery.java index 39f5d75a04d..2240764d22f 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetIconQuery.java +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetIconQuery.java @@ -1,9 +1,9 @@ package org.eclipse.papyrus.customization.paletteconfiguration.queries; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; +import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; +import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration; import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor; diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetToolLabelQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetToolLabelQuery.java index 1077ea87f85..422d537080d 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetToolLabelQuery.java +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/GetToolLabelQuery.java @@ -13,10 +13,10 @@ *****************************************************************************/ package org.eclipse.papyrus.customization.paletteconfiguration.queries; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; +import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; +import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration; /** Returns the Label for a tool. */ diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/HasIconQuery.java b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/HasIconQuery.java index 3bcde535f14..bbd4e0b801a 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/HasIconQuery.java +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/src/org/eclipse/papyrus/customization/paletteconfiguration/queries/HasIconQuery.java @@ -1,8 +1,8 @@ package org.eclipse.papyrus.customization.paletteconfiguration.queries; -import org.eclipse.emf.facet.efacet.core.IFacetManager; -import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException; -import org.eclipse.emf.facet.query.java.core.IJavaQuery2; -import org.eclipse.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; +import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; +import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration; /** Returns <code>true</code> if the element has a specific icon to display */ diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomEditor.java b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomEditor.java index 31a45f7e968..a537f573375 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomEditor.java +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomEditor.java @@ -84,24 +84,6 @@ import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;
-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;
-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization;
-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.provider.CustomItemProviderAdapterFactory;
-import org.eclipse.emf.facet.custom.sdk.ui.dialog.ICustomizationDialogFactory;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.provider.ExtensibleItemProviderAdapterFactory;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.provider.EFacetItemProviderAdapterFactory;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.provider.QueryItemProviderAdapterFactory;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.provider.RuntimeItemProviderAdapterFactory;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.provider.SerializationItemProviderAdapterFactory;
-import org.eclipse.emf.facet.efacet.sdk.ui.dialog.IFacetDialogFactory;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IStatusLineManager;
@@ -121,6 +103,24 @@ import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.provider.CustomItemProviderAdapterFactory;
+import org.eclipse.papyrus.emf.facet.custom.sdk.ui.dialog.ICustomizationDialogFactory;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.provider.ExtensibleItemProviderAdapterFactory;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider.EFacetItemProviderAdapterFactory;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.provider.QueryItemProviderAdapterFactory;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.provider.RuntimeItemProviderAdapterFactory;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.provider.SerializationItemProviderAdapterFactory;
+import org.eclipse.papyrus.emf.facet.efacet.sdk.ui.dialog.IFacetDialogFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.dnd.DND;
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomEditorPlugin.java b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomEditorPlugin.java index 1ef937d2ed9..88a5056dba6 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomEditorPlugin.java +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomEditorPlugin.java @@ -14,12 +14,9 @@ package org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.presentation;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.provider.Efacet2EditPlugin;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider.Efacet2EditPlugin;
/**
* This is the central singleton for the Custom editor plugin.
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomModelWizard.java b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomModelWizard.java index 09135352270..071a5c2e36d 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomModelWizard.java +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomModelWizard.java @@ -25,71 +25,48 @@ import java.util.MissingResourceException; import java.util.StringTokenizer;
import org.eclipse.emf.common.CommonPlugin;
-
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
-
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
-
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
-
import org.eclipse.core.runtime.IProgressMonitor;
-
import org.eclipse.jface.dialogs.MessageDialog;
-
import org.eclipse.jface.viewers.IStructuredSelection;
-
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
-
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.provider.CustomEditPlugin;
import org.eclipse.swt.SWT;
-
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.ModifyEvent;
-
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-
import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory;
-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage;
-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.provider.CustomEditPlugin;
-
import org.eclipse.core.runtime.Path;
-
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
-
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomViewer.java b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomViewer.java index bebfabfb479..fe51ef704fc 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomViewer.java +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/CustomViewer.java @@ -20,29 +20,6 @@ import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EParameter;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;
-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.EObjectLiteralQuery;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.FalseLiteralQuery;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.FloatLiteralQuery;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.IntegerLiteralQuery;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.IsOneOfQuery;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.NavigationQuery;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.NullLiteralQuery;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.OperationCallQuery;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.StringLiteralQuery;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.TrueLiteralQuery;
-import org.eclipse.emf.facet.query.java.core.IJavaQuery2;
-import org.eclipse.emf.facet.query.java.metamodel.v0_2_0.javaquery.JavaQuery;
-import org.eclipse.emf.facet.query.ocl.metamodel.oclquery.OclQuery;
import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -55,6 +32,29 @@ import org.eclipse.jface.viewers.TreeViewerColumn; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.EObjectLiteralQuery;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.FalseLiteralQuery;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.FloatLiteralQuery;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.IntegerLiteralQuery;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.IsOneOfQuery;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.NavigationQuery;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.NullLiteralQuery;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.OperationCallQuery;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.StringLiteralQuery;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.TrueLiteralQuery;
+import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
+import org.eclipse.papyrus.emf.facet.query.java.metamodel.v0_2_0.javaquery.JavaQuery;
+import org.eclipse.papyrus.emf.facet.query.ocl.metamodel.oclquery.OclQuery;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.graphics.Color;
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/FormStyleSashForm.java b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/FormStyleSashForm.java index 7d7d6192cce..ba498fa9e38 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/FormStyleSashForm.java +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/FormStyleSashForm.java @@ -4,8 +4,8 @@ import java.lang.reflect.Field; import java.util.ArrayList;
import java.util.Iterator;
-import org.eclipse.emf.facet.util.core.Logger;
-import org.eclipse.emf.facet.util.core.internal.Activator;
+import org.eclipse.papyrus.emf.facet.util.core.Logger;
+import org.eclipse.papyrus.emf.facet.util.core.internal.Activator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.graphics.GC;
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/ImageProvider.java b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/ImageProvider.java index 9c1903fe925..8e9037b605e 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/ImageProvider.java +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/emf/facet/custom/metamodel/v0_2_0/custom/presentation/ImageProvider.java @@ -14,9 +14,9 @@ package org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.presentation; import java.net.URL;
-import org.eclipse.emf.facet.util.core.Logger;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.emf.facet.util.core.Logger;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.checkstyle b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.checkstyle index 0a2343a20f6..32718848b88 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.checkstyle +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.checkstyle @@ -10,7 +10,7 @@ Contributors: Nicolas Bros (Mia-Software) - initial API and implementation --> <fileset-config file-format-version="1.2.0" simple-config="true"> - <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/> + <local-check-config name="EmfFacet" location="../org.eclipse.papyrus.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/> <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true"> <file-match-pattern match-pattern="." include-pattern="true"/> <file-match-pattern match-pattern="Messages.java" include-pattern="false"/> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF index f3b09276780..314abb78866 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.core;singleton:=true Bundle-Version: 0.4.0.qualifier -Bundle-Activator: org.eclipse.emf.facet.common.core.internal.Activator +Bundle-Activator: org.eclipse.papyrus.emf.facet.common.core.internal.Activator Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0", com.ibm.icu;bundle-version="4.2.1" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.emf.facet.common.core.internal, - org.eclipse.emf.facet.common.core.internal.utils +Export-Package: org.eclipse.papyrus.emf.facet.common.core.internal, + org.eclipse.papyrus.emf.facet.common.core.internal.utils diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/OSGI-INF/l10n/bundle.properties index b2f3223067f..64056c9123b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/OSGI-INF/l10n/bundle.properties +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/OSGI-INF/l10n/bundle.properties @@ -9,7 +9,7 @@ # Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
# Nicolas Guyomar (Mia-Software) - Bug 334000 Simple catalog manager
###############################################################################
-#Properties file for org.eclipse.emf.facet.common.core
+#Properties file for org.eclipse.papyrus.emf.facet.common.core
Bundle-Vendor = Eclipse Modeling Project
Bundle-Name = EMF Facet Common Core (Incubation)
extension-point.name = catalogManager
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/README.txt b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/README.txt index 96221b844ca..deddc589e7d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/README.txt +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/README.txt @@ -1,3 +1,3 @@ This plug-in contains classes common to other EMF Facet plug-ins.
These classes implement functionality that deal with EMF Facet concepts.
-Utility classes not linked to EMF Facet concepts must go in this project instead: org.eclipse.emf.facet.util.core
+Utility classes not linked to EMF Facet concepts must go in this project instead: org.eclipse.papyrus.emf.facet.util.core
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/src/org/eclipse/papyrus/emf/facet/common/core/internal/Activator.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/src/org/eclipse/papyrus/emf/facet/common/core/internal/Activator.java index f3c0a8cb2a5..30d7f7a67b5 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/src/org/eclipse/papyrus/emf/facet/common/core/internal/Activator.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/src/org/eclipse/papyrus/emf/facet/common/core/internal/Activator.java @@ -10,7 +10,7 @@ * Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
* Nicolas Guyomar (Mia-Software) - Bug 334000 Simple catalog manager
*/
-package org.eclipse.emf.facet.common.core.internal;
+package org.eclipse.papyrus.emf.facet.common.core.internal;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/src/org/eclipse/papyrus/emf/facet/common/core/internal/utils/StringMatcher.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/src/org/eclipse/papyrus/emf/facet/common/core/internal/utils/StringMatcher.java index 5ff5a00674d..b3c13c83a69 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/src/org/eclipse/papyrus/emf/facet/common/core/internal/utils/StringMatcher.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/src/org/eclipse/papyrus/emf/facet/common/core/internal/utils/StringMatcher.java @@ -9,7 +9,7 @@ * Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
*******************************************************************************/
-package org.eclipse.emf.facet.common.core.internal.utils;
+package org.eclipse.papyrus.emf.facet.common.core.internal.utils;
import java.util.Vector;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.checkstyle b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.checkstyle index cc4564edfe6..d058aea5b90 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.checkstyle +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.checkstyle @@ -10,7 +10,7 @@ Contributors: Nicolas Bros (Mia-Software) - initial API and implementation --> <fileset-config file-format-version="1.2.0" simple-config="true"> - <local-check-config name="EmfFacet" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/> + <local-check-config name="EmfFacet" location="/org.eclipse.papyrus.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/> <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true"> <file-match-pattern match-pattern="." include-pattern="true"/> <file-match-pattern match-pattern="Messages.java" include-pattern="false"/> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.settings/org.eclipse.core.resources.prefs index 0f5d1bd2ce1..010b8eb87b7 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.settings/org.eclipse.core.resources.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ eclipse.preferences.version=1
-encoding//src/org/eclipse/emf/facet/common/sdk/core/internal/messages.properties=ISO-8859-1
+encoding//src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/messages.properties=ISO-8859-1
encoding/<project>=UTF-8
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF index 86ae6de9f34..e8dd0640a08 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.sdk.core;singleton:=true
Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.emf.facet.common.sdk.core.internal.Activator
+Bundle-Activator: org.eclipse.papyrus.emf.facet.common.sdk.core.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;bundle-version="2.6.0",
@@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.jdt.launching;bundle-version="3.5.100"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.facet.common.sdk.core.internal.exported;x-friends:="org.eclipse.emf.facet.common.sdk.ui,org.eclipse.emf.facet.custom.sdk.core",
- org.eclipse.emf.facet.common.sdk.core.internal.exported.utils
+Export-Package: org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported;x-friends:="org.eclipse.papyrus.emf.facet.common.sdk.ui,org.eclipse.papyrus.emf.facet.custom.sdk.core",
+ org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.utils
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/OSGI-INF/l10n/bundle.properties index 962e0b2c97d..e49444d65bd 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/OSGI-INF/l10n/bundle.properties +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/OSGI-INF/l10n/bundle.properties @@ -8,6 +8,6 @@ # Contributors:
# Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
###############################################################################
-#Properties file for org.eclipse.emf.facet.common.sdk.core
+#Properties file for org.eclipse.papyrus.emf.facet.common.sdk.core
Bundle-Vendor = Eclipse Modeling Project
Bundle-Name = EMF Facet Common SDK Core (Incubation)
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/plugin.xml index eab024d1645..ffbad6a912f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/plugin.xml @@ -3,7 +3,7 @@ <plugin>
<extension-point id="builderRegistration" name="EMF Facet Builder registration" schema="schema/builderRegistration.exsd"/>
<extension
- id="org.eclipse.emf.facet.common.sdk.core.projectBuilder"
+ id="org.eclipse.papyrus.emf.facet.common.sdk.core.projectBuilder"
name="EMF Facet project builder"
point="org.eclipse.core.resources.builders">
<builder
@@ -11,20 +11,20 @@ hasNature="true"
isConfigurable="false">
<run
- class="org.eclipse.emf.facet.common.sdk.core.internal.EmfFacetProjectBuilder">
+ class="org.eclipse.papyrus.emf.facet.common.sdk.core.internal.EmfFacetProjectBuilder">
</run>
</builder>
</extension>
<extension
- id="org.eclipse.emf.facet.common.sdk.core.ProjectNature"
+ id="org.eclipse.papyrus.emf.facet.common.sdk.core.ProjectNature"
name="EMF Facet"
point="org.eclipse.core.resources.natures">
<runtime>
<run
- class="org.eclipse.emf.facet.common.sdk.core.internal.EmfFacetProjectNature">
+ class="org.eclipse.papyrus.emf.facet.common.sdk.core.internal.EmfFacetProjectNature">
</run>
</runtime>
- <builder id="org.eclipse.emf.facet.common.sdk.core.projectBuilder"/>
+ <builder id="org.eclipse.papyrus.emf.facet.common.sdk.core.projectBuilder"/>
<requires-nature id="org.eclipse.jdt.core.javanature"/>
<requires-nature id="org.eclipse.pde.PluginNature"/>
</extension>
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/schema/builderRegistration.exsd b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/schema/builderRegistration.exsd index 667b6d6be63..3e019b24c0f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/schema/builderRegistration.exsd +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/schema/builderRegistration.exsd @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.emf.facet.common.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.papyrus.emf.facet.common.core" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.eclipse.emf.facet.common.core" id="builderRegistration" name="EMF Facet Builder Registration"/>
+ <meta.schema plugin="org.eclipse.papyrus.emf.facet.common.core" id="builderRegistration" name="EMF Facet Builder Registration"/>
</appinfo>
<documentation>
This extension point allows to register builders that will be run when the main EMF Facet builder is run.
@@ -55,10 +55,10 @@ <attribute name="class" type="string" use="required">
<annotation>
<documentation>
- A class that implements org.eclipse.emf.facet.common.sdk.core.internal.exported.IEmfFacetProjectBuilder.
+ A class that implements org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.IEmfFacetProjectBuilder.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.emf.facet.common.sdk.core.internal.exported.IEmfFacetProjectBuilder"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.IEmfFacetProjectBuilder"/>
</appinfo>
</annotation>
</attribute>
@@ -92,8 +92,8 @@ </appinfo>
<documentation>
<pre>
- <extension point="org.eclipse.emf.facet.common.sdk.core.builderRegistration">
- <builder class="org.eclipse.emf.facet.custom.sdk.core.internal.validation.CustomizationValidationBuilder"/>
+ <extension point="org.eclipse.papyrus.emf.facet.common.sdk.core.builderRegistration">
+ <builder class="org.eclipse.papyrus.emf.facet.custom.sdk.core.internal.validation.CustomizationValidationBuilder"/>
</extension>
</pre>
</documentation>
@@ -104,7 +104,7 @@ <meta.section type="apiinfo"/>
</appinfo>
<documentation>
- The builder must implement org.eclipse.emf.facet.common.sdk.core.internal.exported.IEmfFacetProjectBuilder
+ The builder must implement org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.IEmfFacetProjectBuilder
</documentation>
</annotation>
@@ -113,8 +113,8 @@ <meta.section type="implementation"/>
</appinfo>
<documentation>
- For an example, see the customization validation builder in org.eclipse.emf.facet.custom.sdk.core:<br/>
-org.eclipse.emf.facet.custom.sdk.core.internal.validation.CustomizationValidationBuilder
+ For an example, see the customization validation builder in org.eclipse.papyrus.emf.facet.custom.sdk.core:<br/>
+org.eclipse.papyrus.emf.facet.custom.sdk.core.internal.validation.CustomizationValidationBuilder
</documentation>
</annotation>
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/Activator.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/Activator.java index 5b3303aad55..7105000da48 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/Activator.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/Activator.java @@ -8,7 +8,7 @@ * Contributors:
* Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
*******************************************************************************/
-package org.eclipse.emf.facet.common.sdk.core.internal;
+package org.eclipse.papyrus.emf.facet.common.sdk.core.internal;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/EmfFacetProjectBuilder.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/EmfFacetProjectBuilder.java index 0674bd8a8e3..bc320211f9e 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/EmfFacetProjectBuilder.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/EmfFacetProjectBuilder.java @@ -10,7 +10,7 @@ * Nicolas Bros (Mia-Software)
* Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
*******************************************************************************/
-package org.eclipse.emf.facet.common.sdk.core.internal;
+package org.eclipse.papyrus.emf.facet.common.sdk.core.internal;
import java.util.ArrayList;
import java.util.Iterator;
@@ -25,9 +25,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.facet.common.sdk.core.internal.exported.CommonConstants;
-import org.eclipse.emf.facet.common.sdk.core.internal.exported.IEmfFacetProjectBuilder;
-import org.eclipse.emf.facet.util.core.Logger;
+import org.eclipse.papyrus.emf.facet.util.core.Logger;
+import org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.CommonConstants;
+import org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.IEmfFacetProjectBuilder;
/**
* A builder for EMF Facet projects, that delegates to children builders provided by the extension point
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/EmfFacetProjectNature.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/EmfFacetProjectNature.java index 243560f9c46..6f5be62ae47 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/EmfFacetProjectNature.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/EmfFacetProjectNature.java @@ -9,7 +9,7 @@ * Fabien Giquel (Mia-Software)
* Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
*******************************************************************************/
-package org.eclipse.emf.facet.common.sdk.core.internal;
+package org.eclipse.papyrus.emf.facet.common.sdk.core.internal;
import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IProject;
@@ -17,7 +17,7 @@ import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IProjectNature;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.facet.common.sdk.core.internal.exported.CommonConstants;
+import org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.CommonConstants;
/** The implementation of the EMF Facet project nature. */
public class EmfFacetProjectNature implements IProjectNature {
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/Messages.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/Messages.java index 19b45995abb..104fe4fbbda 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/Messages.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/Messages.java @@ -8,12 +8,12 @@ * Contributors:
* Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
*******************************************************************************/
-package org.eclipse.emf.facet.common.sdk.core.internal; +package org.eclipse.papyrus.emf.facet.common.sdk.core.internal; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.emf.facet.common.sdk.core.internal.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.papyrus.emf.facet.common.sdk.core.internal.messages"; //$NON-NLS-1$ public static String ProjectUtils_createEMFFacetProject; public static String ProjectUtils_createPluginProject; static { diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/CommonConstants.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/CommonConstants.java index f2aca5e0a02..4b1437cb577 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/CommonConstants.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/CommonConstants.java @@ -8,18 +8,18 @@ * Contributors:
* Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
*******************************************************************************/
-package org.eclipse.emf.facet.common.sdk.core.internal.exported; +package org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported; public final class CommonConstants { private CommonConstants() { // not instantiable } - public static final String BUILDER_EXTENSION_POINT_ID = "org.eclipse.emf.facet.common.sdk.core.builderRegistration"; //$NON-NLS-1$ + public static final String BUILDER_EXTENSION_POINT_ID = "org.eclipse.papyrus.emf.facet.common.sdk.core.builderRegistration"; //$NON-NLS-1$ /** The builder of EMF Facet projects */ - public static final String BUILDER_NAME = "org.eclipse.emf.facet.common.sdk.core.projectBuilder"; //$NON-NLS-1$ + public static final String BUILDER_NAME = "org.eclipse.papyrus.emf.facet.common.sdk.core.projectBuilder"; //$NON-NLS-1$ /** The nature of EMF Facet projects */ - public static final String NATURE_ID = "org.eclipse.emf.facet.common.sdk.core.ProjectNature"; //$NON-NLS-1$ + public static final String NATURE_ID = "org.eclipse.papyrus.emf.facet.common.sdk.core.ProjectNature"; //$NON-NLS-1$ } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/IEmfFacetProjectBuilder.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/IEmfFacetProjectBuilder.java index 50a8947e488..6f094a19aa7 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/IEmfFacetProjectBuilder.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/IEmfFacetProjectBuilder.java @@ -9,7 +9,7 @@ * Grégoire Dupé (Mia-Software) - Initial API
* Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
*******************************************************************************/
-package org.eclipse.emf.facet.common.sdk.core.internal.exported;
+package org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported;
import java.util.Map;
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor; /**
* The EMF Facet project builder delegates its build behavior to a set of classes
* implementing this interface. This set of classes is defined through the use of
- * the <tt>org.eclipse.emf.facet.common.sdk.core.builderRegistration</tt> extension
+ * the <tt>org.eclipse.papyrus.emf.facet.common.sdk.core.builderRegistration</tt> extension
* point.
*
* @author Grégoire Dupé (Mia-Software)
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/utils/ProjectUtils.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/utils/ProjectUtils.java index 89dee115fcd..d3f8f9ecc6d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/utils/ProjectUtils.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/utils/ProjectUtils.java @@ -11,7 +11,7 @@ * Nicolas Bros (Mia-Software)
* Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
*******************************************************************************/
-package org.eclipse.emf.facet.common.sdk.core.internal.exported.utils;
+package org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.utils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -34,18 +34,18 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.facet.common.sdk.core.internal.Activator;
-import org.eclipse.emf.facet.common.sdk.core.internal.Messages;
-import org.eclipse.emf.facet.common.sdk.core.internal.exported.CommonConstants;
-import org.eclipse.emf.facet.util.core.Logger;
-import org.eclipse.emf.facet.util.core.internal.exported.FileUtils;
-import org.eclipse.emf.facet.util.core.internal.exported.FolderUtils;
+import org.eclipse.papyrus.emf.facet.util.core.Logger;
+import org.eclipse.papyrus.emf.facet.util.core.internal.exported.FileUtils;
+import org.eclipse.papyrus.emf.facet.util.core.internal.exported.FolderUtils;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.papyrus.emf.facet.common.sdk.core.internal.Activator;
+import org.eclipse.papyrus.emf.facet.common.sdk.core.internal.Messages;
+import org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.CommonConstants;
import com.ibm.icu.lang.UCharacter;
@@ -97,7 +97,7 @@ public final class ProjectUtils { .append("Bundle-Activator: " + ProjectUtils.bundleActivatorQualifiedName(packageName) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
//manifestSB.append("Bundle-Vendor: bundle vendor\n"); //$NON-NLS-1$
manifestSB.append("Require-Bundle: org.eclipse.core.runtime,\n"); //$NON-NLS-1$
- manifestSB.append(" org.eclipse.emf.facet.util.core\n"); //$NON-NLS-1$
+ manifestSB.append(" org.eclipse.papyrus.emf.facet.util.core\n"); //$NON-NLS-1$
manifestSB.append("Bundle-RequiredExecutionEnvironment: " //$NON-NLS-1$
+ ProjectUtils.JAVA_VERSION + "\n"); //$NON-NLS-1$
manifestSB.append("Bundle-ActivationPolicy: lazy\n"); //$NON-NLS-1$
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.checkstyle b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.checkstyle index cf229b786b2..6858fec30f6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.checkstyle +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.checkstyle @@ -10,7 +10,7 @@ Contributors: Nicolas Guyomar (Mia-Software)
-->
<fileset-config file-format-version="1.2.0" simple-config="true">
- <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+ <local-check-config name="EmfFacet" location="../org.eclipse.papyrus.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
<fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
<file-match-pattern match-pattern="." include-pattern="true"/>
<file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.settings/org.eclipse.core.resources.prefs index 0475629b705..ebb1f3c7ee6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.settings/org.eclipse.core.resources.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ eclipse.preferences.version=1
-encoding//src/org/eclipse/emf/facet/common/ui/internal/messages.properties=ISO-8859-1
+encoding//src/org/eclipse/papyrus/emf/facet/common/ui/internal/messages.properties=ISO-8859-1
encoding/<project>=UTF-8
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/API.README.txt b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/API.README.txt index 74b3fd9e6ee..b31caf7d2fb 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/API.README.txt +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/API.README.txt @@ -8,15 +8,15 @@ *
* Contributors:
* Nicolas Guyomar (Mia-Software) - Bug 339723 - Add x-friend on EMF Facet internal package
- * Gregoire Dupe (Mia-Software) - Bug 339710 - org.eclipse.emf.facet.common.ui API Cleaning
+ * Gregoire Dupe (Mia-Software) - Bug 339710 - org.eclipse.papyrus.emf.facet.common.ui API Cleaning
*******************************************************************************/
- org.eclipse.emf.facet.common.ui.internal.controls
- x-internal:=used by org.eclipse.emf.facet.infra.*. No x-friends because we don't care about the warning in the "infra" plug-ins.
+ org.eclipse.papyrus.emf.facet.common.ui.internal.controls
+ x-internal:=used by org.eclipse.papyrus.emf.facet.infra.*. No x-friends because we don't care about the warning in the "infra" plug-ins.
- org.eclipse.emf.facet.common.ui.internal.views
- x-friends:="org.eclipse.emf.facet.util.emf.ui" for EMF Facet internal utilization
+ org.eclipse.papyrus.emf.facet.common.ui.internal.views
+ x-friends:="org.eclipse.papyrus.emf.facet.util.emf.ui" for EMF Facet internal utilization
-org.eclipse.emf.facet.common.ui.internal.widgets
- x-friends:="org.eclipse.emf.facet.efacet.ui" for EMF Facet internal utilization
- x-friends:="org.eclipse.emf.facet.util.emf.ui" for EMF Facet internal utilization
\ No newline at end of file +org.eclipse.papyrus.emf.facet.common.ui.internal.widgets
+ x-friends:="org.eclipse.papyrus.emf.facet.efacet.ui" for EMF Facet internal utilization
+ x-friends:="org.eclipse.papyrus.emf.facet.util.emf.ui" for EMF Facet internal utilization
\ No newline at end of file diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF index 3b5b221702b..422a0d118f8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.ui;singleton:=true Bundle-Version: 0.4.0.qualifier -Bundle-Activator: org.eclipse.emf.facet.common.ui.internal.Activator +Bundle-Activator: org.eclipse.papyrus.emf.facet.common.ui.internal.Activator Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -13,11 +13,11 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.emf.facet.common.core;bundle-version="0.4.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.emf.facet.common.ui.internal, - org.eclipse.emf.facet.common.ui.internal.controls, - org.eclipse.emf.facet.common.ui.internal.controls.wrappers, - org.eclipse.emf.facet.common.ui.internal.exported.views, - org.eclipse.emf.facet.common.ui.internal.preference.pages, - org.eclipse.emf.facet.common.ui.internal.views, - org.eclipse.emf.facet.common.ui.internal.widgets +Export-Package: org.eclipse.papyrus.emf.facet.common.ui.internal, + org.eclipse.papyrus.emf.facet.common.ui.internal.controls, + org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers, + org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views, + org.eclipse.papyrus.emf.facet.common.ui.internal.preference.pages, + org.eclipse.papyrus.emf.facet.common.ui.internal.views, + org.eclipse.papyrus.emf.facet.common.ui.internal.widgets diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/OSGI-INF/l10n/bundle.properties index 1d886dbddc4..ecf19a13eab 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/OSGI-INF/l10n/bundle.properties +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/OSGI-INF/l10n/bundle.properties @@ -9,7 +9,7 @@ # Gregoire Dupe (Mia-Software) - Bug 366804 - [Restructuring] Table widget upgrade
# Grégoire Dupé (Mia-Software) - Bug 388422 - [Table] Queries for InstanciationMethod needs to have 2 parameters
###############################################################################
-#Properties file for org.eclipse.emf.facet.common.ui
+#Properties file for org.eclipse.papyrus.emf.facet.common.ui
page.name = EMF Facet
Bundle-Vendor = Eclipse Modeling Project
Bundle-Name = EMF Facet Common UI (Incubation)
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/plugin.xml index 03a577f902b..f08078f521b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/plugin.xml @@ -16,22 +16,22 @@ <extension
point="org.eclipse.ui.preferencePages">
<page
- class="org.eclipse.emf.facet.common.ui.internal.preference.pages.EmfFacetRootPreferencePage"
- id="org.eclipse.emf.facet.common.ui.preference.pages.EmfFacetRootPreferencePage"
+ class="org.eclipse.papyrus.emf.facet.common.ui.internal.preference.pages.EmfFacetRootPreferencePage"
+ id="org.eclipse.papyrus.emf.facet.common.ui.preference.pages.EmfFacetRootPreferencePage"
name="%page.name">
</page>
</extension>
<extension
point="org.eclipse.ui.views">
<category
- id="org.eclipse.emf.facet.common.ui.views"
+ id="org.eclipse.papyrus.emf.facet.common.ui.views"
name="%category.name">
</category>
</extension>
<extension point="org.eclipse.ui.newWizards">
<category
- id="org.eclipse.emf.facet.common.ui.wizardsCategory"
+ id="org.eclipse.papyrus.emf.facet.common.ui.wizardsCategory"
name="%category.name">
</category>
</extension>
@@ -41,7 +41,7 @@ allPopups="false"
locationURI="popup:org.eclipse.ui.popup.any">
<menu
- id="org.eclipse.emf.facet.common.ui.menu.examples"
+ id="org.eclipse.papyrus.emf.facet.common.ui.menu.examples"
label="%emf.facet.examples">
<visibleWhen
checkEnabled="true">
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Activator.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Activator.java index c5b166774cc..5a7dc2ec9d9 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Activator.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Activator.java @@ -9,7 +9,7 @@ * Contributors:
* Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
*/
-package org.eclipse.emf.facet.common.ui.internal;
+package org.eclipse.papyrus.emf.facet.common.ui.internal;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -19,7 +19,7 @@ import org.osgi.framework.BundleContext; */
public class Activator extends AbstractUIPlugin {
- public static final String PLUGIN_ID = "org.eclipse.emf.facet.common.ui"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.emf.facet.common.ui"; //$NON-NLS-1$
private static Activator plugin;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Messages.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Messages.java index e7cbdcb86fd..4cf3eb89dc8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Messages.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/Messages.java @@ -8,12 +8,12 @@ * Contributors:
* Nicolas Bros (Mia-Software) - Bug 372732 - [Facet] Rewrite the catalog views for 0.2
*******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal;
+package org.eclipse.papyrus.emf.facet.common.ui.internal;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.emf.facet.common.ui.internal.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.emf.facet.common.ui.internal.messages"; //$NON-NLS-1$
public static String ElementsView_refreshJobTitle;
static {
// initialize resource bundle
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/PersistableColumn.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/PersistableColumn.java index 56a7b5875aa..42a59e307a7 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/PersistableColumn.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/PersistableColumn.java @@ -9,18 +9,11 @@ * Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
*******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.Column;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.SortableTable;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.SortableTree;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.SortableWidget;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.SortableWidgetFactory;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.TableColumn;
-import org.eclipse.emf.facet.common.ui.internal.controls.wrappers.TreeColumn;
import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
@@ -29,6 +22,13 @@ import org.eclipse.jface.viewers.TreeViewerColumn; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerColumn;
import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.Column;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.SortableTable;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.SortableTree;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.SortableWidget;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.SortableWidgetFactory;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.TableColumn;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers.TreeColumn;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ControlAdapter;
import org.eclipse.swt.events.ControlEvent;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/Column.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/Column.java index 74ceb3887e2..02a8d2aae95 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/Column.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/Column.java @@ -9,7 +9,7 @@ * Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
*******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
import org.eclipse.swt.events.ControlListener;
import org.eclipse.swt.events.SelectionListener;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTable.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTable.java index ef0b7552551..88f5753d3f8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTable.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTable.java @@ -9,7 +9,7 @@ * Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
*******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.ViewerSorter;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTree.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTree.java index 3f66f24fb0e..b031edab28f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTree.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableTree.java @@ -9,7 +9,7 @@ * Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
*******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.ViewerSorter;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidget.java index ff9dfd9e921..d13cb9c8f2b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidget.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidget.java @@ -9,7 +9,7 @@ * Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
*******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.swt.widgets.Table;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java index ea310f5ab6b..5f2704bde9e 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java @@ -9,7 +9,7 @@ * Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
*******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TableColumn.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TableColumn.java index 141a06fa1f9..ee83b33fb76 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TableColumn.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TableColumn.java @@ -9,7 +9,7 @@ * Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
*******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
import org.eclipse.swt.events.ControlListener;
import org.eclipse.swt.events.SelectionListener;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TreeColumn.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TreeColumn.java index c30a1fb87c7..abf8f5d4d16 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TreeColumn.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/controls/wrappers/TreeColumn.java @@ -9,7 +9,7 @@ * Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 334116 - common tree view with columns
*******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.controls.wrappers;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers;
import org.eclipse.swt.events.ControlListener;
import org.eclipse.swt.events.SelectionListener;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IColumnDescription.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IColumnDescription.java index 6aa019910c6..073c8310c54 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IColumnDescription.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IColumnDescription.java @@ -8,7 +8,7 @@ * Contributors:
* Nicolas Bros (Mia-Software) - Bug 372732 - [Facet] Rewrite the catalog views for 0.2
*******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.exported.views;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views;
import org.eclipse.jface.viewers.ColumnLabelProvider;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IElementsViewFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IElementsViewFactory.java index 271e4c969a0..9f4b83777f9 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IElementsViewFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/exported/views/IElementsViewFactory.java @@ -9,14 +9,14 @@ * Nicolas Bros (Mia-Software) - Bug 372732 - [Facet] Rewrite the catalog views for 0.2
*******************************************************************************/
-package org.eclipse.emf.facet.common.ui.internal.exported.views;
+package org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views;
import java.util.Collection;
-import org.eclipse.emf.facet.common.ui.internal.views.ElementsViewFactory;
import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.IOpenListener;
import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.views.ElementsViewFactory;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.part.ViewPart;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java index 28708ad05ef..cad26029c06 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java @@ -8,10 +8,10 @@ * Contributors: * Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser ***********************************************************************************/ -package org.eclipse.emf.facet.common.ui.internal.preference.pages; +package org.eclipse.papyrus.emf.facet.common.ui.internal.preference.pages; -import org.eclipse.emf.facet.common.ui.internal.Activator; import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.papyrus.emf.facet.common.ui.internal.Activator; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/AbstractTreeView.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/AbstractTreeView.java index 5b176128e26..5390a16587a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/AbstractTreeView.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/views/AbstractTreeView.java @@ -10,7 +10,7 @@ |