diff options
| author | Philippe ROLAND | 2014-03-13 16:05:07 +0000 |
|---|---|---|
| committer | Philippe ROLAND | 2014-03-13 16:28:26 +0000 |
| commit | 5ea83367dd34acd76edd43bc26b8fd66cd2f5ac9 (patch) | |
| tree | 69cec42779b35b8b6c13e85f3c0167e98de4c67e | |
| parent | ebe840eb8d0b25b6db19eec327c1aa9236c86df0 (diff) | |
| download | org.eclipse.papyrus-5ea83367dd34acd76edd43bc26b8fd66cd2f5ac9.tar.gz org.eclipse.papyrus-5ea83367dd34acd76edd43bc26b8fd66cd2f5ac9.tar.xz org.eclipse.papyrus-5ea83367dd34acd76edd43bc26b8fd66cd2f5ac9.zip | |
425560: [Collaborative] Migrate collaborative mode from Indigo to Luna : Renamed, Reversioned projects
109 files changed, 534 insertions, 494 deletions
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.options b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.options index 963a4693dda..058af1e91aa 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.options +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.options @@ -1,2 +1,2 @@ -org.eclipse.papyrus.team.collaborative.connector.svn/debug=true -org.eclipse.papyrus.team.collaborative.connector.svn/debug/commit=true +org.eclipse.papyrus.team.collaborative.core.connector.svn/debug=true +org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/commit=true diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.project b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.project index 2f1c7d80aef..8ac71ef3f16 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.project +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.papyrus.team.collaborative.connector.svn</name> + <name>org.eclipse.papyrus.team.collaborative.svn</name> <comment></comment> <projects> </projects> diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/META-INF/MANIFEST.MF index 46b1d627ce4..df6c5346cc9 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/META-INF/MANIFEST.MF +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: SVN Connector
-Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.connector.svn;singleton:=true
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.svn;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.team.collaborative.connector.svn.Activator
+Bundle-Activator: org.eclipse.papyrus.team.collaborative.svn.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.team.collaborative,
+ org.eclipse.papyrus.team.collaborative.core;bundle-version="1.0.0",
org.eclipse.emf.ecore,
com.google.guava,
org.eclipse.core.resources,
@@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.team.svn.ui
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.papyrus.team.collaborative.connector.svn,
- org.eclipse.papyrus.team.collaborative.connector.svn.tracing,
- org.eclipse.papyrus.team.collaborative.connector.svn.utils,
- org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller
-Bundle-Vendor: Atos
+Export-Package: org.eclipse.papyrus.team.collaborative.svn,
+ org.eclipse.papyrus.team.collaborative.svn.tracing,
+ org.eclipse.papyrus.team.collaborative.svn.utils,
+ org.eclipse.papyrus.team.collaborative.svn.versioncontroller
+Bundle-Vendor: %providerName
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/plugin.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/plugin.properties new file mode 100644 index 00000000000..e62f4e4b682 --- /dev/null +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/plugin.properties @@ -0,0 +1,12 @@ +#/***************************************************************************** +# * Copyright (c) 2014 Atos Origin. +# * +# * +# * 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 +# * http://www.eclipse.org/legal/epl-v10.html +# * +# *****************************************************************************/ +pluginName = Collaborative SVN Connector +providerName = Eclipse Modeling Project diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/plugin.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/plugin.xml index 29d2ca60d4c..cbbbe02cc78 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/plugin.xml +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/plugin.xml @@ -2,10 +2,10 @@ <?eclipse version="3.4"?>
<plugin>
<extension
- point="org.eclipse.papyrus.team.collaborative.contribution">
+ point="org.eclipse.papyrus.team.collaborative.core.contribution">
<ParticipantFactory
- id="org.eclipse.papyrus.team.collaborative.connector.svn"
- impl="org.eclipse.papyrus.team.collaborative.connector.svn.SVNCollabFactory"
+ id="org.eclipse.papyrus.team.collaborative.svn"
+ impl="org.eclipse.papyrus.team.collaborative.svn.SVNCollabFactory"
priority="10">
</ParticipantFactory>
</extension>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/AbstractExtendedURIBuilderForFile.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/AbstractExtendedURIBuilderForFile.java index 577905b30db..10886703966 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/AbstractExtendedURIBuilderForFile.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/AbstractExtendedURIBuilderForFile.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn;
+package org.eclipse.papyrus.team.collaborative.svn;
import java.util.Collection;
import java.util.Set;
@@ -17,8 +17,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.participants.AbstractExtendedURIBuilder;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.AbstractExtendedURIBuilder;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/Activator.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/Activator.java index a2a850be44c..1ade1df9c6a 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/Activator.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn; +package org.eclipse.papyrus.team.collaborative.svn; 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 { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.connector.svn"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.core.connector.svn"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/CollabResourceSelector.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/CollabResourceSelector.java index 696b11eaef9..9871b632336 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/CollabResourceSelector.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/CollabResourceSelector.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn; +package org.eclipse.papyrus.team.collaborative.svn; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/SVNCollabFactory.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/SVNCollabFactory.java index a306293f90d..374ac4ca477 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/SVNCollabFactory.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/SVNCollabFactory.java @@ -9,7 +9,7 @@ * Arthur Daussy - initial implementation
* Philippe Roland (Atos) philippe.roland@atos.net - added workaround for eclipse bug 385394
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn;
+package org.eclipse.papyrus.team.collaborative.svn;
import java.util.HashSet;
import java.util.Set;
@@ -18,19 +18,19 @@ import java.util.WeakHashMap; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.ICollabFactory;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.locker.SVNLocker;
-import org.eclipse.papyrus.team.collaborative.connector.svn.locker.SVNUnlocker;
-import org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller.SVNCommitter;
-import org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller.SVNReverter;
-import org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller.SVNUpdater;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker;
-import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IReverter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.core.ICollabFactory;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.svn.locker.SVNLocker;
+import org.eclipse.papyrus.team.collaborative.svn.locker.SVNUnlocker;
+import org.eclipse.papyrus.team.collaborative.svn.versioncontroller.SVNCommitter;
+import org.eclipse.papyrus.team.collaborative.svn.versioncontroller.SVNReverter;
+import org.eclipse.papyrus.team.collaborative.svn.versioncontroller.SVNUpdater;
import org.eclipse.team.svn.core.utility.FileUtility;
import com.google.common.collect.Collections2;
@@ -44,7 +44,7 @@ import com.google.common.collect.Collections2; public class SVNCollabFactory implements ICollabFactory {
/** The Constant SVN_COLLAB_ID. */
- public static final String SVN_COLLAB_ID = "org.eclipse.papyrus.team.collaborative.connector.svn";
+ public static final String SVN_COLLAB_ID = "org.eclipse.papyrus.team.collaborative.core.connector.svn";
/**
* Resource set svn status cache
@@ -60,7 +60,7 @@ public class SVNCollabFactory implements ICollabFactory { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#provide(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+ * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#provide(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
*/
public boolean provide(Set<IExtendedURI> uris, ResourceSet resourceSet) {
/**
@@ -100,7 +100,7 @@ public class SVNCollabFactory implements ICollabFactory { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#createLocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+ * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#createLocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
*/
public ILocker createLocker(Set<IExtendedURI> uris, ResourceSet resourceSet) {
return new SVNLocker(uris, resourceSet);
@@ -109,7 +109,7 @@ public class SVNCollabFactory implements ICollabFactory { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#createUnlocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+ * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#createUnlocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
*/
public IUnlocker createUnlocker(Set<IExtendedURI> uris, ResourceSet resourceSet) {
return new SVNUnlocker(uris, resourceSet);
@@ -118,7 +118,7 @@ public class SVNCollabFactory implements ICollabFactory { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#createReverter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+ * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#createReverter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
*/
public IReverter createReverter(Set<IExtendedURI> uris, ResourceSet resourceSet) {
return new SVNReverter(uris, resourceSet);
@@ -127,7 +127,7 @@ public class SVNCollabFactory implements ICollabFactory { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#createCommitter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+ * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#createCommitter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
*/
public ICommitter createCommitter(Set<IExtendedURI> uris, ResourceSet resourceSet) {
return new SVNCommitter(uris, resourceSet);
@@ -136,7 +136,7 @@ public class SVNCollabFactory implements ICollabFactory { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#createUpdater(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+ * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#createUpdater(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
*/
public IUpdater createUpdater(Set<IExtendedURI> uris, ResourceSet resourceSet) {
return new SVNUpdater(uris, resourceSet);
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/AbstractSVNCollab.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/AbstractSVNCollab.java index 814465869b5..8d91180898f 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/AbstractSVNCollab.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/AbstractSVNCollab.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn.locker; +package org.eclipse.papyrus.team.collaborative.svn.locker; import java.util.Set; @@ -18,10 +18,10 @@ import org.eclipse.core.runtime.Status; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.workspace.util.WorkspaceSynchronizer; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.connector.svn.AbstractExtendedURIBuilderForFile; -import org.eclipse.papyrus.team.collaborative.participants.ICollabParticipant; -import org.eclipse.papyrus.team.collaborative.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.ICollabParticipant; +import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.svn.AbstractExtendedURIBuilderForFile; import org.eclipse.team.svn.core.resource.ILocalResource; import org.eclipse.team.svn.core.svnstorage.SVNRemoteStorage; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNLocker.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNLocker.java index e08d1a1011b..ece1576a48e 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNLocker.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNLocker.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn.locker; +package org.eclipse.papyrus.team.collaborative.svn.locker; import java.util.ArrayList; import java.util.List; @@ -17,12 +17,12 @@ import java.util.Set; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IStatus; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant; -import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer; -import org.eclipse.papyrus.team.collaborative.connector.svn.utils.SVNUtils; -import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker; -import org.eclipse.papyrus.team.collaborative.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker; +import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant; +import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer; +import org.eclipse.papyrus.team.collaborative.svn.utils.SVNUtils; import org.eclipse.team.svn.core.operation.CompositeOperation; import org.eclipse.team.svn.core.operation.IActionOperation; import org.eclipse.team.svn.core.operation.local.LockOperation; @@ -47,7 +47,7 @@ public class SVNLocker extends AbstractSVNCollab implements ILocker { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.participants.locker.ILocker#lock() + * @see org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker#lock() */ public IStatus lock() { IResource[] resourcesToProcess = getTargetFiles(getTargetResources()); diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNUnlocker.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNUnlocker.java index 5779b4a764a..60967fdc9e3 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNUnlocker.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNUnlocker.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn.locker; +package org.eclipse.papyrus.team.collaborative.svn.locker; import java.util.Set; @@ -16,11 +16,11 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant; -import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer; -import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker; -import org.eclipse.papyrus.team.collaborative.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker; +import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant; +import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer; import org.eclipse.team.svn.core.operation.CompositeOperation; import org.eclipse.team.svn.core.operation.IActionOperation; import org.eclipse.team.svn.core.operation.local.RefreshResourcesOperation; @@ -53,7 +53,7 @@ public class SVNUnlocker extends AbstractSVNCollab implements IUnlocker { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker#unlock() + * @see org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker#unlock() */ public IStatus unlock() { IResource[] resourcesToProcess = getTargetFiles(getTargetResources()); @@ -85,7 +85,7 @@ public class SVNUnlocker extends AbstractSVNCollab implements IUnlocker { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.participants.AbstractExtendedURIBuilder#doBuild() + * @see org.eclipse.papyrus.team.collaborative.core.participants.AbstractExtendedURIBuilder#doBuild() */ @Override protected Set<IExtendedURI> doBuild() { diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/ITracingConstant.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/ITracingConstant.java index 949fdb640dd..ddad199dea9 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/ITracingConstant.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/ITracingConstant.java @@ -8,10 +8,10 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn.tracing; +package org.eclipse.papyrus.team.collaborative.svn.tracing; import org.eclipse.core.runtime.Platform; -import org.eclipse.papyrus.team.collaborative.connector.svn.Activator; +import org.eclipse.papyrus.team.collaborative.svn.Activator; /** * Constant use to trace. @@ -21,19 +21,19 @@ import org.eclipse.papyrus.team.collaborative.connector.svn.Activator; public interface ITracingConstant { /** Trace everything related to commmit. */ - public static final boolean COMMIT_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.connector.svn/debug/commit")); + public static final boolean COMMIT_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/commit")); /** Trace everything related to lock. */ - public static final boolean LOCK_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.connector.svn/debug/lock")); + public static final boolean LOCK_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/lock")); /** Trace everything related to unlock. */ - public static final boolean UNLOCK_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.connector.svn/debug/unlock")); + public static final boolean UNLOCK_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/unlock")); /** Trace everything related to Update. */ - public static final boolean UPDATE_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.connector.svn/debug/update")); + public static final boolean UPDATE_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/update")); /** Trace everything related to Revert. */ - public static final boolean REVERT_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.connector.svn/debug/revert")); + public static final boolean REVERT_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/revert")); } diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/Tracer.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/Tracer.java index 7dcbaf256dd..5de51052f16 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/Tracer.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/Tracer.java @@ -8,11 +8,11 @@ * Contributors: * Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation ******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn.tracing; +package org.eclipse.papyrus.team.collaborative.svn.tracing; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.papyrus.team.collaborative.connector.svn.Activator; +import org.eclipse.papyrus.team.collaborative.svn.Activator; /** * Utils class used to trace element diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/CommitActionUtilityWithProperties.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/CommitActionUtilityWithProperties.java index d044eefb51c..cd260c3c28d 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/CommitActionUtilityWithProperties.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/CommitActionUtilityWithProperties.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation ******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn.utils; +package org.eclipse.papyrus.team.collaborative.svn.utils; import java.util.Arrays; import java.util.HashSet; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SVNUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SVNUtils.java index 4dff9488b13..92418146a64 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SVNUtils.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SVNUtils.java @@ -8,16 +8,16 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn.utils; +package org.eclipse.papyrus.team.collaborative.svn.utils; import java.util.Collection; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant; -import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer; -import org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller.SVNCommitter; +import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant; +import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer; +import org.eclipse.papyrus.team.collaborative.svn.versioncontroller.SVNCommitter; import org.eclipse.team.svn.core.connector.SVNChangeStatus; import org.eclipse.team.svn.core.extension.CoreExtensionsManager; import org.eclipse.team.svn.core.extension.factory.ISVNConnectorFactory; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SetPropertyActionNow.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SetPropertyActionNow.java index d61e959070e..addf30abd13 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SetPropertyActionNow.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SetPropertyActionNow.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn.utils; +package org.eclipse.papyrus.team.collaborative.svn.utils; import java.io.File; import java.io.FileInputStream; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/AbstractSVNVersionController.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/AbstractSVNVersionController.java index 6e41a8b4571..379514edaf1 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/AbstractSVNVersionController.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/AbstractSVNVersionController.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller; +package org.eclipse.papyrus.team.collaborative.svn.versioncontroller; import java.util.Set; @@ -18,11 +18,11 @@ import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.connector.svn.AbstractExtendedURIBuilderForFile; -import org.eclipse.papyrus.team.collaborative.connector.svn.utils.SVNUtils; -import org.eclipse.papyrus.team.collaborative.participants.version.IWorkOnModifiedElementParticipant; -import org.eclipse.papyrus.team.collaborative.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.version.IWorkOnModifiedElementParticipant; +import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.svn.AbstractExtendedURIBuilderForFile; +import org.eclipse.papyrus.team.collaborative.svn.utils.SVNUtils; import org.eclipse.team.svn.core.connector.SVNChangeStatus; import org.eclipse.team.svn.core.connector.SVNEntryStatus; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNCommitter.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNCommitter.java index fb09caebbba..6ae4fd01840 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNCommitter.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNCommitter.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller;
+package org.eclipse.papyrus.team.collaborative.svn.versioncontroller;
import java.util.Collection;
import java.util.List;
@@ -20,13 +20,13 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.CollabResourceSelector;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer;
-import org.eclipse.papyrus.team.collaborative.connector.svn.utils.CommitActionUtilityWithProperties;
-import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter;
-import org.eclipse.papyrus.team.collaborative.utils.ResourceUtils;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter;
+import org.eclipse.papyrus.team.collaborative.core.utils.ResourceUtils;
+import org.eclipse.papyrus.team.collaborative.svn.CollabResourceSelector;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer;
+import org.eclipse.papyrus.team.collaborative.svn.utils.CommitActionUtilityWithProperties;
import org.eclipse.swt.widgets.Display;
import org.eclipse.team.svn.core.operation.CompositeOperation;
import org.eclipse.team.svn.core.operation.IActionOperation;
@@ -60,7 +60,7 @@ public class SVNCommitter extends SVNWorkOnModifiedFile implements ICommitter { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.team.collaborative.participants.version.ICommitter#commit(java.lang.String, boolean)
+ * @see org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter#commit(java.lang.String, boolean)
*/
public IStatus commit(String message, boolean keepLock) {
IStatus status = doCommit(message, keepLock, getTargetResources());
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNReverter.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNReverter.java index 9f05fa6c6f0..5133c568569 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNReverter.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNReverter.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller;
+package org.eclipse.papyrus.team.collaborative.svn.versioncontroller;
/*******************************************************************************
* Copyright (c) 2013 Atos.
@@ -25,10 +25,10 @@ import java.util.Set; import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer;
-import org.eclipse.papyrus.team.collaborative.participants.version.IReverter;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer;
import org.eclipse.team.svn.core.operation.CompositeOperation;
import org.eclipse.team.svn.core.operation.IActionOperation;
import org.eclipse.team.svn.core.operation.file.RevertOperation;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNUpdater.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNUpdater.java index 27d620134aa..ed3795d1c49 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNUpdater.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNUpdater.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller;
+package org.eclipse.papyrus.team.collaborative.svn.versioncontroller;
import java.util.HashMap;
import java.util.HashSet;
@@ -23,10 +23,10 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer;
-import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer;
import org.eclipse.team.svn.core.connector.SVNEntryInfo;
import org.eclipse.team.svn.core.connector.SVNLogEntry;
import org.eclipse.team.svn.core.connector.SVNRevision;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNWorkOnModifiedFile.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNWorkOnModifiedFile.java index 70aded9b630..d4d0a81e9ee 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNWorkOnModifiedFile.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNWorkOnModifiedFile.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller; +package org.eclipse.papyrus.team.collaborative.svn.versioncontroller; @@ -24,9 +24,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.connector.svn.CollabResourceSelector; -import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet; +import org.eclipse.papyrus.team.collaborative.svn.CollabResourceSelector; import org.eclipse.swt.widgets.Display; import org.eclipse.team.svn.ui.utility.CommitActionUtility; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.project b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.project index 67cf0525732..bf35fc8c879 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.project +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.papyrus.team.collaborative.integration.papyrus.svn</name> + <name>org.eclipse.papyrus.team.collaborative.controlmode</name> <comment></comment> <projects> </projects> diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/META-INF/MANIFEST.MF index cf3cac8742f..5904b97c33c 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/META-INF/MANIFEST.MF +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/META-INF/MANIFEST.MF @@ -1,9 +1,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: SVN Control
-Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.integration.papyrus.svn;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.controlmode;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.Activator
+Bundle-Activator: org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.papyrus.infra.services.controlmode,
@@ -11,13 +10,13 @@ Require-Bundle: org.eclipse.ui, org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
org.eclipse.papyrus.editor,
org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.team.collaborative;bundle-version="1.0.0",
+ org.eclipse.papyrus.team.collaborative.core;bundle-version="1.0.0",
com.google.guava,
org.eclipse.papyrus.infra.gmfdiag.modelexplorer,
org.eclipse.ui.navigator;bundle-version="3.5.101",
org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.2",
- org.eclipse.papyrus.team.collaborative.integration.papyrus,
- org.eclipse.papyrus.team.collaborative.connector.svn,
+ org.eclipse.papyrus.team.collaborative.strategy;bundle-version="1.0.0",
+ org.eclipse.papyrus.team.collaborative.svn;bundle-version="1.0.0",
org.eclipse.papyrus.infra.gmfdiag.modelexplorer,
org.eclipse.papyrus.infra.widgets.toolbox,
org.eclipse.papyrus.infra.gmfdiag.commands,
@@ -28,3 +27,5 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.views.modelexplorer
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Bundle-Name: %pluginName
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/build.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/build.properties index 0f6e4783e6e..07463a9565d 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/build.properties +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/build.properties @@ -4,4 +4,5 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ icons/,\ - resources/ + resources/,\ + plugin.properties diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/plugin.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/plugin.properties new file mode 100644 index 00000000000..5661533277c --- /dev/null +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/plugin.properties @@ -0,0 +1,12 @@ +#/***************************************************************************** +# * Copyright (c) 2014 Atos Origin. +# * +# * +# * 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 +# * http://www.eclipse.org/legal/epl-v10.html +# * +# *****************************************************************************/ +pluginName = Collaborative Control Mode Integration +providerName = Eclipse Modeling Project diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/plugin.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/plugin.xml index 5403d02fa58..71413675741 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/plugin.xml +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/plugin.xml @@ -4,19 +4,19 @@ <extension point="org.eclipse.papyrus.infra.services.controlmode.participant"> <participant - class="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.control.SVNControlModeParticipant"> + class="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.control.SVNControlModeParticipant"> </participant> </extension> <extension point="org.eclipse.ui.commands"> <command - defaultHandler="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.handler.SVNCollabControlCommandHandler" - id="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.createcollaborative fragment" + defaultHandler="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.handler.SVNCollabControlCommandHandler" + id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.createcollaborative fragment" name="Create collaborative fragment"> </command> <command - defaultHandler="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.handler.ShowModelPartitionHandler" - id="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.showModelPartition" + defaultHandler="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.handler.ShowModelPartitionHandler" + id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.showModelPartition" name="Show model partition"> </command> </extension> @@ -24,9 +24,9 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.papyrus.team.collaborative.ui.collab.menu"> + locationURI="popup:org.eclipse.papyrus.team.collaborative.core.ui.collab.menu"> <command - commandId="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.createcollaborative fragment" + commandId="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.createcollaborative fragment" icon="icons/CreateCollabPartition_16x16.png" label="Create partition" style="push"> @@ -43,7 +43,7 @@ </visibleWhen> </command> <command - commandId="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.showModelPartition" + commandId="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.showModelPartition" icon="icons/ShowPartition_16x16.png" label="Show partition" style="push"> diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabCustomization.uiCustom b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabCustomization.uiCustom index 4ad80383c11..ce9138838d6 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabCustomization.uiCustom +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabCustomization.uiCustom @@ -3,7 +3,7 @@ <types metaclassName="CollabFacet.CollabElement"> <customizedFeatures customizedFeature="facetOverlayIcon"> <valueCases> - <value xsi:type="uicustom:StaticFeatureValue" value="/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/PartialLock_16x16.png:TopRight"/> + <value xsi:type="uicustom:StaticFeatureValue" value="/org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn/icons/PartialLock_16x16.png:TopRight"/> <condition xsi:type="query:JavaModelQuery" href="CollabQueries.querySet#IsPartialyLocked"/> </valueCases> </customizedFeatures> diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabQueries.querySet b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabQueries.querySet index fcb050c45d1..b6719c62b44 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabQueries.querySet +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabQueries.querySet @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="ASCII"?> <query:ModelQuerySet 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" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="CollabQueries"> <associatedMetamodels href="http://www.eclipse.org/emf/2002/Ecore#/"/> - <queries xsi:type="query:JavaModelQuery" name="IsCollabQuery" description="If the elemnt is a collab element" implementationClassName="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.queries.IsCollabQuery"> + <queries xsi:type="query:JavaModelQuery" name="IsCollabQuery" description="If the elemnt is a collab element" implementationClassName="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.queries.IsCollabQuery"> <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> <scope href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </queries> - <queries xsi:type="query:JavaModelQuery" name="IsPartialyLocked" description="Return true is at least one of the Nuplet of linked resource is locked" implementationClassName="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.queries.IsPartialyLocked"> + <queries xsi:type="query:JavaModelQuery" name="IsPartialyLocked" description="Return true is at least one of the Nuplet of linked resource is locked" implementationClassName="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.queries.IsPartialyLocked"> <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> <scope href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </queries> diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/Activator.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/Activator.java index 13fec009c49..40c6b79a351 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/Activator.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn; +package org.eclipse.papyrus.team.collaborative.controlmode; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; @@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext; public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.integration.papyrus.svn"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/AddFileToCollabSVN.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/AddFileToCollabSVN.java index b0fd1ee0aa5..df2223e2391 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/AddFileToCollabSVN.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/AddFileToCollabSVN.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.commands; +package org.eclipse.papyrus.team.collaborative.controlmode.commands; import java.util.Collection; import java.util.HashSet; @@ -25,12 +25,12 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand; import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.connector.svn.utils.SVNUtils; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.CommitHandler; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.LockAction; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils; -import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory; +import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.CommitHandler; +import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.LockAction; +import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils; +import org.eclipse.papyrus.team.collaborative.svn.utils.SVNUtils; import com.google.common.collect.Collections2; import com.google.common.collect.Sets; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/SaveCommand.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/SaveCommand.java index 9af1e6bfab5..21929f6c1c5 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/SaveCommand.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/SaveCommand.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.commands; +package org.eclipse.papyrus.team.collaborative.controlmode.commands; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/control/SVNControlModeParticipant.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/control/SVNControlModeParticipant.java index 1d6317ca202..2a7c4f67225 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/control/SVNControlModeParticipant.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/control/SVNControlModeParticipant.java @@ -8,16 +8,16 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.control;
+package org.eclipse.papyrus.team.collaborative.controlmode.control;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
import org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant;
import org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.commands.AddFileToCollabSVN;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.commands.SaveCommand;
-import org.eclipse.papyrus.team.collaborative.utils.CollabUtils;
+import org.eclipse.papyrus.team.collaborative.controlmode.commands.AddFileToCollabSVN;
+import org.eclipse.papyrus.team.collaborative.controlmode.commands.SaveCommand;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabUtils;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.ISaveablePart;
import org.eclipse.ui.PlatformUI;
@@ -42,7 +42,7 @@ public class SVNControlModeParticipant implements IControlCommandParticipant, IU * @see org.eclipse.papyrus.controlmode.interfaces.IControlModeParticipant#getID()
*/
public String getID() {
- return "org.eclipse.papyrus.team.collaborative.integration.papyrus.control.SVNControlModeParticipant";
+ return "org.eclipse.papyrus.team.collaborative.core.integration.papyrus.control.SVNControlModeParticipant";
}
/*
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/SVNCollabControlCommandHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/SVNCollabControlCommandHandler.java index a40d03add4e..3ef9481a52c 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/SVNCollabControlCommandHandler.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/SVNCollabControlCommandHandler.java @@ -10,7 +10,7 @@ * Philippe Roland (Atos) philippe.roland@atos.net - minor change to the * default naming algorithm to ensure it suggests a valid name *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.handler; +package org.eclipse.papyrus.team.collaborative.controlmode.handler; import java.util.Collections; import java.util.List; @@ -27,10 +27,10 @@ import org.eclipse.papyrus.infra.services.controlmode.ControlModeManager; import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest; import org.eclipse.papyrus.infra.services.controlmode.IControlModeManager; import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.ui.CreateCollabModelFragmentDialog; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils; +import org.eclipse.papyrus.team.collaborative.controlmode.ui.CreateCollabModelFragmentDialog; +import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog; +import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider; +import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils; import org.eclipse.papyrus.views.modelexplorer.handler.AbstractModelExplorerHandler; import org.eclipse.swt.widgets.Display; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/ShowModelPartitionHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/ShowModelPartitionHandler.java index 83f44d3c3dc..d8f28caab82 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/ShowModelPartitionHandler.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/ShowModelPartitionHandler.java @@ -8,16 +8,16 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.handler; +package org.eclipse.papyrus.team.collaborative.controlmode.handler; import java.util.List; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.emf.ecore.EObject; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils; +import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog; +import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider; +import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils; import org.eclipse.papyrus.views.modelexplorer.handler.AbstractModelExplorerHandler; import org.eclipse.swt.widgets.Display; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsCollabQuery.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsCollabQuery.java index eba91ba6fe6..7743f7da27b 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsCollabQuery.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsCollabQuery.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.queries;
+package org.eclipse.papyrus.team.collaborative.controlmode.queries;
import java.util.ArrayList;
import java.util.List;
@@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.resource.ResourceSet; 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.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.PapyrusResourceUtils;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.PapyrusResourceUtils;
import com.google.common.collect.Collections2;
import com.google.common.collect.Sets;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsPartialyLocked.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsPartialyLocked.java index 532d782b22e..071e4aadc98 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsPartialyLocked.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsPartialyLocked.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.queries;
+package org.eclipse.papyrus.team.collaborative.controlmode.queries;
import java.util.ArrayList;
import java.util.List;
@@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.resource.ResourceSet; 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.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.PapyrusResourceUtils;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.PapyrusResourceUtils;
import com.google.common.collect.Collections2;
import com.google.common.collect.Sets;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/CreateCollabModelFragmentDialog.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/CreateCollabModelFragmentDialog.java index 4a2d329a1c5..a5844e40445 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/CreateCollabModelFragmentDialog.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/CreateCollabModelFragmentDialog.java @@ -7,7 +7,7 @@ * Contributors: Jacques Lescot (Anyware Technologies) - initial API and * implementation ******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.ui; +package org.eclipse.papyrus.team.collaborative.controlmode.ui; import java.io.File; import java.util.ArrayList; @@ -26,10 +26,10 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.Activator; -import org.eclipse.papyrus.team.collaborative.reports.LogHelper; -import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory; -import org.eclipse.papyrus.team.collaborative.utils.URIUtils; +import org.eclipse.papyrus.team.collaborative.controlmode.Activator; +import org.eclipse.papyrus.team.collaborative.core.reports.LogHelper; +import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory; +import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/IconsPath.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/IconsPath.java index 80670869756..19bb9db32ec 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/IconsPath.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/IconsPath.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.ui; +package org.eclipse.papyrus.team.collaborative.controlmode.ui; /** @@ -17,6 +17,6 @@ package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.ui; public interface IconsPath { /** The Constant PARTIAL_LOCKED_OVERLAY. */ - public static final String PARTIAL_LOCKED_OVERLAY = "/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/PartialLock_16x16.png"; + public static final String PARTIAL_LOCKED_OVERLAY = "/org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn/icons/PartialLock_16x16.png"; } diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.project b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.project index 3567352c25d..5b272c03654 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.project +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.papyrus.team.collaborative.integration.papyrus</name> + <name>org.eclipse.papyrus.team.collaborative.strategy</name> <comment></comment> <projects> </projects> diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/META-INF/MANIFEST.MF index 1789e51f22d..ac2c7899b34 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/META-INF/MANIFEST.MF +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Team Ui
-Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.integration.papyrus;singleton:=true
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.strategy;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.team.collaborative.integration.papyrus.Activator
+Bundle-Activator: org.eclipse.papyrus.team.collaborative.core.integration.papyrus.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.team.collaborative;bundle-version="1.0.0",
+ org.eclipse.papyrus.team.collaborative.core;bundle-version="1.0.0",
com.google.guava,
org.eclipse.emf.ecore;bundle-version="2.7.0",
org.eclipse.papyrus.infra.core,
@@ -29,8 +29,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions,
- org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs,
- org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers,
- org.eclipse.papyrus.team.collaborative.integration.papyrus.utils
-Bundle-Vendor: Atos
+Export-Package: org.eclipse.papyrus.team.collaborative.strategy.ui.actions,
+ org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs,
+ org.eclipse.papyrus.team.collaborative.strategy.ui.providers,
+ org.eclipse.papyrus.team.collaborative.strategy.utils
+Bundle-Vendor: %providerName
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/build.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/build.properties index 6c480f39f1b..6b4afb7a5a7 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/build.properties +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/build.properties @@ -3,4 +3,5 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.xml,\ - icons/ + icons/,\ + plugin.properties diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/plugin.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/plugin.properties new file mode 100644 index 00000000000..13d9f9c5199 --- /dev/null +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/plugin.properties @@ -0,0 +1,12 @@ +#/***************************************************************************** +# * Copyright (c) 2014 Atos Origin. +# * +# * +# * 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 +# * http://www.eclipse.org/legal/epl-v10.html +# * +# *****************************************************************************/ +pluginName = Collaborative Locking Strategies +providerName = Eclipse Modeling Project diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/plugin.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/plugin.xml index 364eeb66a46..84c12743f5f 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/plugin.xml +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/plugin.xml @@ -8,14 +8,14 @@ locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
<menu
icon="icons/TeamIcon.png"
- id="org.eclipse.papyrus.team.collaborative.ui.collab.menu"
+ id="org.eclipse.papyrus.team.collaborative.core.ui.collab.menu"
label="Collaborative">
<visibleWhen
checkEnabled="false">
<with
variable="selection">
<test
- property="org.eclipse.papyrus.team.collaborative.integration.papyrus.isCollab"
+ property="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.isCollab"
value="true">
</test>
</with>
@@ -24,41 +24,41 @@ </menuContribution>
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.papyrus.team.collaborative.ui.collab.menu">
+ locationURI="popup:org.eclipse.papyrus.team.collaborative.core.ui.collab.menu">
<menu
icon="icons/lock.gif"
- id="org.eclipse.papyrus.team.collaborative.integration.papyrus.menu"
+ id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.menu"
label="Lock">
<dynamic
- class="org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.items.LockStrategyItemProvider"
- id="org.eclipse.papyrus.team.collaborative.integration.papyrus.lockItems">
+ class="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.items.LockStrategyItemProvider"
+ id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.lockItems">
</dynamic>
</menu>
<menu
icon="icons/unlock.gif"
- id="org.eclipse.papyrus.team.collaborative.integration.papyrus.unlock"
+ id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.unlock"
label="Unlock">
<dynamic
- class="org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.items.UnlockStrategyItemProvider"
- id="org.eclipse.papyrus.team.collaborative.integration.papyrus.UnlockItem">
+ class="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.items.UnlockStrategyItemProvider"
+ id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.UnlockItem">
</dynamic>
</menu>
<command
- commandId="org.eclipse.papyrus.team.collaborative.integration.papyrus.update"
+ commandId="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.update"
icon="icons/update.gif"
label="Update"
style="push"
tooltip="Update the all model from the repository">
</command>
<command
- commandId="org.eclipse.papyrus.team.collaborative.integration.papyrus.commit"
+ commandId="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.commit"
icon="icons/commit.gif"
label="Commit"
style="push"
tooltip="Commit all modification to the repository">
</command>
<command
- commandId="org.eclipse.papyrus.team.collaborative.integration.papyrus.revert"
+ commandId="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.revert"
icon="icons/revert.gif"
label="Revert"
style="push"
@@ -67,42 +67,42 @@ </menuContribution>
</extension>
<extension
- point="org.eclipse.papyrus.team.collaborative.contribution">
+ point="org.eclipse.papyrus.team.collaborative.core.contribution">
<LockingStrategy
- id="org.eclipse.papyrus.team.collaborative.integration.papyrus.elementsandcontents"
- impl="org.eclipse.papyrus.team.collaborative.integration.papyrus.stategies.PapyrusSelectionAllContent"
+ id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.elementsandcontents"
+ impl="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.stategies.PapyrusSelectionAllContent"
name="Selected element and content">
</LockingStrategy>
<LockingStrategy
- id="org.eclipse.papyrus.team.collaborative.integration.papyrus.papyrusResourceContent"
- impl="org.eclipse.papyrus.team.collaborative.integration.papyrus.stategies.PapyrusCurrentResource"
+ id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.papyrusResourceContent"
+ impl="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.stategies.PapyrusCurrentResource"
name="Selected element">
</LockingStrategy>
</extension>
<extension
point="org.eclipse.ui.commands">
<command
- defaultHandler="org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.UpdateHandler"
- id="org.eclipse.papyrus.team.collaborative.integration.papyrus.update"
+ defaultHandler="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.actions.UpdateHandler"
+ id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.update"
name="Update">
</command>
<command
- defaultHandler="org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.CommitHandler"
- id="org.eclipse.papyrus.team.collaborative.integration.papyrus.commit"
+ defaultHandler="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.actions.CommitHandler"
+ id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.commit"
name="Commit">
</command>
<command
- defaultHandler="org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.RevertHandler"
- id="org.eclipse.papyrus.team.collaborative.integration.papyrus.revert"
+ defaultHandler="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.actions.RevertHandler"
+ id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.revert"
name="Revert">
</command>
</extension>
<extension
point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
- class="org.eclipse.papyrus.team.collaborative.integration.papyrus.IsCollabPropertyTest"
- id="org.eclipse.papyrus.team.collaborative.integration.papyrus.iCollabID"
- namespace="org.eclipse.papyrus.team.collaborative.integration.papyrus"
+ class="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.IsCollabPropertyTest"
+ id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.iCollabID"
+ namespace="org.eclipse.papyrus.team.collaborative.core.integration.papyrus"
properties="isCollab"
type="org.eclipse.jface.viewers.ISelection">
</propertyTester>
@@ -110,15 +110,15 @@ <extension
point="org.eclipse.papyrus.infra.emf.readonly.readOnlyHandler">
<readOnlyHandler
- class="org.eclipse.papyrus.team.collaborative.integration.papyrus.security.CollabReadOnlyHandler"
- id="org.eclipse.papyrus.team.collaborative.integration.papyrus.CollabReadOnlyHandler"
+ class="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.security.CollabReadOnlyHandler"
+ id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.CollabReadOnlyHandler"
priority="700">
</readOnlyHandler>
</extension>
<extension
point="org.eclipse.papyrus.infra.core.model">
<modelSetSnippet
- classname="org.eclipse.papyrus.team.collaborative.integration.papyrus.security.PreCommitReadOnlyHandler">
+ classname="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.security.PreCommitReadOnlyHandler">
</modelSetSnippet>
</extension>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/Activator.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/Activator.java index cfdf6ae3afa..0cb8df7707f 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/Activator.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus; +package org.eclipse.papyrus.team.collaborative.strategy; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -20,7 +20,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID /** The Constant PLUGIN_ID. */ - public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.integration.papyrus"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.core.integration.papyrus"; //$NON-NLS-1$ // The shared instance /** The plugin. */ diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/IsCollabPropertyTest.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/IsCollabPropertyTest.java index 5f917da7e59..13874006ebd 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/IsCollabPropertyTest.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/IsCollabPropertyTest.java @@ -8,14 +8,14 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus;
+package org.eclipse.papyrus.team.collaborative.strategy;
import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.team.collaborative.utils.CollabUtils;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabUtils;
/**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/MatchingURIObject.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/MatchingURIObject.java index bd680ce4e8a..3a7270d47c1 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/MatchingURIObject.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/MatchingURIObject.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus;
+package org.eclipse.papyrus.team.collaborative.strategy;
import java.util.ArrayList;
import java.util.List;
@@ -17,8 +17,8 @@ import java.util.Set; import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.ExtendedURIUtil;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.ExtendedURIUtil;
import org.eclipse.uml2.uml.Element;
import com.google.common.base.Predicate;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/RefreshHelper.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/RefreshHelper.java index c7fac09c446..ded9888b3d7 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/RefreshHelper.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/RefreshHelper.java @@ -8,7 +8,7 @@ * Contributors:
* Olivier Melois <a href="mailto:olivier.melois@atos.net"> - initial API and implementation
******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus;
+package org.eclipse.papyrus.team.collaborative.strategy;
import java.util.Collection;
import java.util.HashSet;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/security/CollabReadOnlyHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/security/CollabReadOnlyHandler.java index 779eb4496c1..8af6a52911d 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/security/CollabReadOnlyHandler.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/security/CollabReadOnlyHandler.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.security;
+package org.eclipse.papyrus.team.collaborative.strategy.security;
import java.util.ArrayList;
import java.util.Collection;
@@ -21,11 +21,11 @@ import org.eclipse.emf.edit.domain.EditingDomain; //import org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler;
import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler;
import org.eclipse.papyrus.infra.emf.readonly.AbstractReadOnlyHandler;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.LockAction;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.LockAction;
import com.google.common.base.Optional;
import com.google.common.collect.Collections2;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/security/PreCommitReadOnlyHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/security/PreCommitReadOnlyHandler.java index 06402e1a31e..7ff8b5335be 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/security/PreCommitReadOnlyHandler.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/security/PreCommitReadOnlyHandler.java @@ -1,4 +1,4 @@ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.security;
+package org.eclipse.papyrus.team.collaborative.strategy.security;
import java.util.HashSet;
import java.util.Set;
@@ -18,12 +18,12 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.papyrus.infra.core.resource.IModelSetSnippet;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.LockAction;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.LockAction;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
import com.google.common.collect.Collections2;
import com.google.common.collect.Sets;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/AbstractResourceBaseStrategy.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/AbstractResourceBaseStrategy.java index f32c9f74244..37f18bb978c 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/AbstractResourceBaseStrategy.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/AbstractResourceBaseStrategy.java @@ -8,14 +8,14 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.stategies; +package org.eclipse.papyrus.team.collaborative.strategy.stategies; import java.util.Collection; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.PapyrusResourceUtils; -import org.eclipse.papyrus.team.collaborative.strategy.AbstractLockingStrategy; +import org.eclipse.papyrus.team.collaborative.core.strategy.AbstractLockingStrategy; +import org.eclipse.papyrus.team.collaborative.strategy.utils.PapyrusResourceUtils; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/PapyrusCurrentResource.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/PapyrusCurrentResource.java index 50035ce9f57..e155365316a 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/PapyrusCurrentResource.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/PapyrusCurrentResource.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.stategies;
+package org.eclipse.papyrus.team.collaborative.strategy.stategies;
import java.util.Collection;
import java.util.Collections;
@@ -18,9 +18,9 @@ import java.util.Set; import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-import org.eclipse.papyrus.team.collaborative.utils.ModelsUtil;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.core.utils.ModelsUtil;
import com.google.common.collect.Collections2;
import com.google.common.collect.Sets;
@@ -36,7 +36,7 @@ public class PapyrusCurrentResource extends AbstractResourceBaseStrategy { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy#getBusinessObject(java.util.Collection)
+ * @see org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy#getBusinessObject(java.util.Collection)
*/
public Set<IExtendedURI> getBusinessObject(Collection<EObject> eOjbects) {
if(!eOjbects.isEmpty()) {
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/PapyrusSelectionAllContent.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/PapyrusSelectionAllContent.java index 8047be70e14..0285e5d8b0a 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/PapyrusSelectionAllContent.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/PapyrusSelectionAllContent.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.stategies;
+package org.eclipse.papyrus.team.collaborative.strategy.stategies;
import java.util.Collection;
import java.util.Collections;
@@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-import org.eclipse.papyrus.team.collaborative.utils.ModelsUtil;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.core.utils.ModelsUtil;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
@@ -39,7 +39,7 @@ public class PapyrusSelectionAllContent extends AbstractResourceBaseStrategy { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy#getBusinessObject(java.util.Collection)
+ * @see org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy#getBusinessObject(java.util.Collection)
*/
public Set<IExtendedURI> getBusinessObject(Collection<EObject> eOjbects) {
if(!eOjbects.isEmpty()) {
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/ICollabColors.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/ICollabColors.java index 9342ee54d56..5689efbe888 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/ICollabColors.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/ICollabColors.java @@ -1,6 +1,6 @@ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui; +package org.eclipse.papyrus.team.collaborative.strategy.ui; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils; +import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/AbstractCollabHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/AbstractCollabHandler.java index b3528d0f938..7b2e3f7511c 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/AbstractCollabHandler.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/AbstractCollabHandler.java @@ -8,14 +8,14 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions; +package org.eclipse.papyrus.team.collaborative.strategy.ui.actions; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils; -import org.eclipse.papyrus.team.collaborative.utils.CollabUtils; +import org.eclipse.papyrus.team.collaborative.core.utils.CollabUtils; +import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PlatformUI; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/CommitHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/CommitHandler.java index fb76a3b7779..1b98f502369 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/CommitHandler.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/CommitHandler.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions;
+package org.eclipse.papyrus.team.collaborative.strategy.ui.actions;
import java.util.Collection;
import java.util.HashSet;
@@ -23,17 +23,17 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.MatchingURIObject;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.ICollabColors;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.CommitDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.strategy.MatchingURIObject;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.ICollabColors;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.CommitDialog;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
import org.eclipse.swt.widgets.Display;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/LockAction.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/LockAction.java index f43699a8959..4860df8317e 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/LockAction.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/LockAction.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions; +package org.eclipse.papyrus.team.collaborative.strategy.ui.actions; import java.util.Collection; import java.util.Set; @@ -19,18 +19,18 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.papyrus.team.collaborative.ICollaborativeManager; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.MatchingURIObject; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.ICollabColors; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils; -import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker; -import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater; -import org.eclipse.papyrus.team.collaborative.reports.CollabStatus; -import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy; -import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy.Descriptor; +import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker; +import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater; +import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy; +import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy.Descriptor; +import org.eclipse.papyrus.team.collaborative.strategy.MatchingURIObject; +import org.eclipse.papyrus.team.collaborative.strategy.ui.ICollabColors; +import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog; +import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider; +import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils; import org.eclipse.swt.widgets.Display; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/RevertHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/RevertHandler.java index eafbde220fa..65eafd52834 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/RevertHandler.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/RevertHandler.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions;
+package org.eclipse.papyrus.team.collaborative.strategy.ui.actions;
import java.util.Collection;
import java.util.HashSet;
@@ -23,16 +23,16 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.MatchingURIObject;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.ICollabColors;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.participants.version.IReverter;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.strategy.MatchingURIObject;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.ICollabColors;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
import org.eclipse.swt.widgets.Display;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/UnlockAction.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/UnlockAction.java index 3fddcafc200..44eaa08ea6d 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/UnlockAction.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/UnlockAction.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions; +package org.eclipse.papyrus.team.collaborative.strategy.ui.actions; import java.util.Collection; import java.util.Set; @@ -19,18 +19,18 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.papyrus.team.collaborative.ICollaborativeManager; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.MatchingURIObject; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.ICollabColors; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider; -import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils; -import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker; -import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter; -import org.eclipse.papyrus.team.collaborative.reports.CollabStatus; -import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy; -import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy.Descriptor; +import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker; +import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter; +import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy; +import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy.Descriptor; +import org.eclipse.papyrus.team.collaborative.strategy.MatchingURIObject; +import org.eclipse.papyrus.team.collaborative.strategy.ui.ICollabColors; +import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog; +import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider; +import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils; import org.eclipse.swt.widgets.Display; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/UpdateHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/UpdateHandler.java index c658e0cd18b..66d2a7ace19 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/UpdateHandler.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/UpdateHandler.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions;
+package org.eclipse.papyrus.team.collaborative.strategy.ui.actions;
import java.util.Collection;
import java.util.HashSet;
@@ -24,16 +24,16 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.MatchingURIObject;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.ICollabColors;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.strategy.MatchingURIObject;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.ICollabColors;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
import org.eclipse.swt.widgets.Display;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/dialogs/CommitDialog.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/dialogs/CommitDialog.java index 18d5bdf94ba..5c2233e9a94 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/dialogs/CommitDialog.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/dialogs/CommitDialog.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs;
+package org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.swt.SWT;
@@ -55,7 +55,7 @@ public class CommitDialog extends PreviewDialog { /*
* (non-Javadoc)
*
- * @see org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+ * @see org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.dialogs.PreviewDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
*/
@Override
protected Control createDialogArea(Composite parent) {
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/dialogs/PreviewDialog.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/dialogs/PreviewDialog.java index c376dc1fd5c..66c130333a6 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/dialogs/PreviewDialog.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/dialogs/PreviewDialog.java @@ -8,29 +8,22 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs;
+package org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
-import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForWorkbenchPage;
-import org.eclipse.papyrus.infra.emf.providers.MoDiscoContentProvider;
-import org.eclipse.papyrus.uml.tools.model.UmlModel;
-import org.eclipse.papyrus.uml.tools.model.UmlUtils;
import org.eclipse.papyrus.uml.tools.providers.SemanticUMLContentProvider;
import org.eclipse.papyrus.views.modelexplorer.CustomCommonViewer;
import org.eclipse.papyrus.views.modelexplorer.matching.IMatchingItem;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/items/LockStrategyItemProvider.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/items/LockStrategyItemProvider.java index 279ed242a72..5fbce1747e7 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/items/LockStrategyItemProvider.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/items/LockStrategyItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.items;
+package org.eclipse.papyrus.team.collaborative.strategy.ui.items;
import java.util.Collection;
@@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.LockAction;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy;
-import org.eclipse.papyrus.team.collaborative.utils.CollabUtils;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabUtils;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.LockAction;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/items/UnlockStrategyItemProvider.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/items/UnlockStrategyItemProvider.java index 71a072438d7..7facfd2584d 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/items/UnlockStrategyItemProvider.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/items/UnlockStrategyItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.items;
+package org.eclipse.papyrus.team.collaborative.strategy.ui.items;
import java.util.Collection;
@@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.UnlockAction;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy;
-import org.eclipse.papyrus.team.collaborative.utils.CollabUtils;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabUtils;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.UnlockAction;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/providers/ExtensivePartitionNameLabelProvider.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/providers/ExtensivePartitionNameLabelProvider.java index 125976817e2..4926945c839 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/providers/ExtensivePartitionNameLabelProvider.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/ui/providers/ExtensivePartitionNameLabelProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers;
+package org.eclipse.papyrus.team.collaborative.strategy.ui.providers;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/utils/PapyrusResourceUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/utils/PapyrusResourceUtils.java index 4da408d4a1a..47ca49beb10 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/utils/PapyrusResourceUtils.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/utils/PapyrusResourceUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.papyrus.team.collaborative.integration.papyrus.utils; +package org.eclipse.papyrus.team.collaborative.strategy.utils; import java.util.Collection; @@ -6,7 +6,7 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel; import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel; -import org.eclipse.papyrus.team.collaborative.utils.URIUtils; +import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils; import org.eclipse.papyrus.uml.tools.model.UmlModel; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/utils/UIUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/utils/UIUtils.java index 5bea48b52ec..0a0f6593907 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/utils/UIUtils.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/strategy/utils/UIUtils.java @@ -8,7 +8,7 @@ * Contributors:
* Arthur Daussy - initial implementation
*******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.utils;
+package org.eclipse.papyrus.team.collaborative.strategy.utils;
import java.util.ArrayList;
import java.util.Collection;
@@ -41,13 +41,13 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry; import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForWorkbenchPage;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.Activator;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.RefreshHelper;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
-import org.eclipse.papyrus.team.collaborative.reports.LogHelper;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-import org.eclipse.papyrus.team.collaborative.utils.ModelsUtil;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.reports.LogHelper;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.core.utils.ModelsUtil;
+import org.eclipse.papyrus.team.collaborative.strategy.Activator;
+import org.eclipse.papyrus.team.collaborative.strategy.RefreshHelper;
import org.eclipse.papyrus.uml.tools.model.UmlModel;
import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
import org.eclipse.swt.widgets.Display;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.project b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.project index c0e0c4480de..d8664a4a6ed 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.project +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.papyrus.team.collaborative</name> + <name>org.eclipse.papyrus.team.collaborative.core</name> <comment></comment> <projects> </projects> diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/META-INF/MANIFEST.MF index bef06bcdaa8..bbeb315da63 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/META-INF/MANIFEST.MF +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.core;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.team.collaborative.Activator
+Bundle-Activator: org.eclipse.papyrus.team.collaborative.core.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.emf.ecore,
@@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf.workspace
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.papyrus.team.collaborative,
- org.eclipse.papyrus.team.collaborative.participants,
- org.eclipse.papyrus.team.collaborative.participants.locker,
- org.eclipse.papyrus.team.collaborative.participants.version,
- org.eclipse.papyrus.team.collaborative.reports,
- org.eclipse.papyrus.team.collaborative.strategy,
- org.eclipse.papyrus.team.collaborative.utils,
- org.eclipse.papyrus.team.collaborative.utils.funtions;x-internal:=true
+Export-Package: org.eclipse.papyrus.team.collaborative.core,
+ org.eclipse.papyrus.team.collaborative.core.participants,
+ org.eclipse.papyrus.team.collaborative.core.participants.locker,
+ org.eclipse.papyrus.team.collaborative.core.participants.version,
+ org.eclipse.papyrus.team.collaborative.core.reports,
+ org.eclipse.papyrus.team.collaborative.core.strategy,
+ org.eclipse.papyrus.team.collaborative.core.utils,
+ org.eclipse.papyrus.team.collaborative.core.utils.funtions;x-internal:=true
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.properties index 006c98369ae..88550fa0002 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.properties +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.properties @@ -1,4 +1,12 @@ -# - -pluginName = CollabConfiguration Model -providerName = Atos +#/***************************************************************************** +# * Copyright (c) 2014 Atos Origin. +# * +# * +# * 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 +# * http://www.eclipse.org/legal/epl-v10.html +# * +# *****************************************************************************/ +pluginName = Collaborative Model +providerName = Eclipse Modeling Project diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.xml index f97353933d9..85196e35f30 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.xml +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
- <extension-point id="org.eclipse.papyrus.team.collaborative.contribution" name="contribution" schema="schema/contribution.exsd"/>
+ <extension-point id="org.eclipse.papyrus.team.collaborative.core.contribution" name="contribution" schema="schema/contribution.exsd"/>
</plugin>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/schema/contribution.exsd b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/schema/contribution.exsd index 37dde52a842..fa0a5ed6205 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/schema/contribution.exsd +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/schema/contribution.exsd @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.team.collaborative" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.papyrus.team.collaborative.core" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.eclipse.papyrus.team.collaborative" id="contribution" name="Collaborative Mode Contribution"/>
+ <meta.schema plugin="org.eclipse.papyrus.team.collaborative.core" id="contribution" name="Collaborative Mode Contribution"/>
</appinfo>
<documentation>
This extension point is used to register contributions to the collaborative framework, either as locking strategies (used to define which objects are to be affected) or as participants implementing one or more of 4 different actions
@@ -70,7 +70,7 @@ </documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.team.collaborative.ILockingStrategy"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.team.collaborative.core.ILockingStrategy"/>
</appinfo>
</annotation>
</attribute>
@@ -97,7 +97,7 @@ This is an implentation of a participant for the collaboration mode. Depending on the feature that this participant provide it as to inherite from ILocker, IUnlocker, IUpdater, ICommitter
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.team.collaborative.ICollabFactory"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.team.collaborative.core.ICollabFactory"/>
</appinfo>
</annotation>
</attribute>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/Activator.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/Activator.java index 3a6e9f6fef6..3c75679345b 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/Activator.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative; +package org.eclipse.papyrus.team.collaborative.core; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -20,7 +20,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID /** The Constant PLUGIN_ID. */ - public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.core"; //$NON-NLS-1$ // The shared instance /** The plugin. */ diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ExtendedURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ExtendedURI.java index 88366e65849..0d4280179ec 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ExtendedURI.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ExtendedURI.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative; +package org.eclipse.papyrus.team.collaborative.core; import java.util.HashMap; import java.util.Map; @@ -56,7 +56,7 @@ public class ExtendedURI implements IExtendedURI { } /* (non-Javadoc) - * @see org.eclipse.papyrus.team.collaborative.IExtendedURI#isContainment() + * @see org.eclipse.papyrus.team.collaborative.core.IExtendedURI#isContainment() */ @Override public boolean isContainment() { @@ -68,7 +68,7 @@ public class ExtendedURI implements IExtendedURI { } /* (non-Javadoc) - * @see org.eclipse.papyrus.team.collaborative.IExtendedURI#setParameter(java.lang.String, java.lang.Object) + * @see org.eclipse.papyrus.team.collaborative.core.IExtendedURI#setParameter(java.lang.String, java.lang.Object) */ @Override public ExtendedURI setParameter(String id, Object value) { @@ -93,7 +93,7 @@ public class ExtendedURI implements IExtendedURI { /* (non-Javadoc) - * @see org.eclipse.papyrus.team.collaborative.IExtendedURI#getParameter(java.lang.String) + * @see org.eclipse.papyrus.team.collaborative.core.IExtendedURI#getParameter(java.lang.String) */ @Override public Object getParameter(String id) { @@ -102,7 +102,7 @@ public class ExtendedURI implements IExtendedURI { /* (non-Javadoc) - * @see org.eclipse.papyrus.team.collaborative.IExtendedURI#getUri() + * @see org.eclipse.papyrus.team.collaborative.core.IExtendedURI#getUri() */ @Override public URI getUri() { diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ICollabFactory.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ICollabFactory.java index 54443ee20fd..661dec1857d 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ICollabFactory.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ICollabFactory.java @@ -1,13 +1,13 @@ -package org.eclipse.papyrus.team.collaborative; +package org.eclipse.papyrus.team.collaborative.core; import java.util.Set; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker; -import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker; -import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter; -import org.eclipse.papyrus.team.collaborative.participants.version.IReverter; -import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker; +import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter; +import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter; +import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ICollaborativeManager.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ICollaborativeManager.java index 3ef8f37fa11..a6f90555234 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ICollaborativeManager.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/ICollaborativeManager.java @@ -8,20 +8,20 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative; +package org.eclipse.papyrus.team.collaborative.core; import java.util.Map; import java.util.Set; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.impl.CollaborativeManager; -import org.eclipse.papyrus.team.collaborative.participants.ICollabParticipant; -import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker; -import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker; -import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter; -import org.eclipse.papyrus.team.collaborative.participants.version.IReverter; -import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater; -import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy; +import org.eclipse.papyrus.team.collaborative.core.impl.CollaborativeManager; +import org.eclipse.papyrus.team.collaborative.core.participants.ICollabParticipant; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker; +import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter; +import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter; +import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater; +import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy; /** * The Interface ICollaborativeManager. diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/IExtendedURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/IExtendedURI.java index 3b4905a2b4c..4cbe8371de2 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/IExtendedURI.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/IExtendedURI.java @@ -1,4 +1,4 @@ -package org.eclipse.papyrus.team.collaborative; +package org.eclipse.papyrus.team.collaborative.core; import org.eclipse.emf.common.util.URI; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/impl/CollaborativeManager.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/impl/CollaborativeManager.java index d82de14f478..109dc317cad 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/impl/CollaborativeManager.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/impl/CollaborativeManager.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.impl; +package org.eclipse.papyrus.team.collaborative.core.impl; import java.util.ArrayList; import java.util.Collections; @@ -22,16 +22,16 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.Activator; -import org.eclipse.papyrus.team.collaborative.ICollabFactory; -import org.eclipse.papyrus.team.collaborative.ICollaborativeManager; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker; -import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker; -import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter; -import org.eclipse.papyrus.team.collaborative.participants.version.IReverter; -import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater; -import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy; +import org.eclipse.papyrus.team.collaborative.core.Activator; +import org.eclipse.papyrus.team.collaborative.core.ICollabFactory; +import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker; +import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter; +import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter; +import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater; +import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy; /** @@ -78,7 +78,7 @@ public class CollaborativeManager implements ICollaborativeManager { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getStrategies() + * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getStrategies() */ @Override public Map<String, ILockingStrategy.Descriptor> getStrategies() { @@ -124,7 +124,7 @@ public class CollaborativeManager implements ICollaborativeManager { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getLockingStrategy(java.lang.String) + * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getLockingStrategy(java.lang.String) */ @Override public ILockingStrategy getLockingStrategy(String id) { @@ -152,7 +152,7 @@ public class CollaborativeManager implements ICollaborativeManager { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getLocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) + * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getLocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) */ @Override public ILocker getLocker(Set<IExtendedURI> objectToLock, ResourceSet resourceSet) { @@ -166,7 +166,7 @@ public class CollaborativeManager implements ICollaborativeManager { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getUnlocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) + * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getUnlocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) */ @Override public IUnlocker getUnlocker(Set<IExtendedURI> objectToLock, ResourceSet resourceSet) { @@ -180,7 +180,7 @@ public class CollaborativeManager implements ICollaborativeManager { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getUpdater(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) + * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getUpdater(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) */ @Override public IUpdater getUpdater(Set<IExtendedURI> objectToLock, ResourceSet resourceSet) { @@ -194,7 +194,7 @@ public class CollaborativeManager implements ICollaborativeManager { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getCommitter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) + * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getCommitter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) */ @Override public ICommitter getCommitter(Set<IExtendedURI> objectToLock, ResourceSet resourceSet) { @@ -208,7 +208,7 @@ public class CollaborativeManager implements ICollaborativeManager { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getReverter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) + * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getReverter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) */ @Override public IReverter getReverter(Set<IExtendedURI> objectToLock, ResourceSet resourceSet) { @@ -227,7 +227,7 @@ public class CollaborativeManager implements ICollaborativeManager { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#isCollab(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) + * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#isCollab(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet) */ @Override public boolean isCollab(Set<IExtendedURI> uris, ResourceSet resourceSet) { diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/AbstractExtendedURIBuilder.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/AbstractExtendedURIBuilder.java index 04bf8fae5a0..81e8c77b10e 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/AbstractExtendedURIBuilder.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/AbstractExtendedURIBuilder.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.participants; +package org.eclipse.papyrus.team.collaborative.core.participants; import java.util.HashSet; import java.util.Set; @@ -16,9 +16,9 @@ import java.util.Set; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.utils.URIUtils; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils; import com.google.common.base.Function; @@ -85,7 +85,7 @@ public abstract class AbstractExtendedURIBuilder implements IExtendedURISuperSet /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet#getResourceSet() + * @see org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet#getResourceSet() */ public ResourceSet getResourceSet() { return resourceSet; @@ -95,7 +95,7 @@ public abstract class AbstractExtendedURIBuilder implements IExtendedURISuperSet /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet#getExtendedSet() + * @see org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet#getExtendedSet() */ public Set<IExtendedURI> getExtendedSet() { if(uriToHandle == null) { diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/ICollabParticipant.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/ICollabParticipant.java index fe7cdddec45..ddffe32afde 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/ICollabParticipant.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/ICollabParticipant.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.participants; +package org.eclipse.papyrus.team.collaborative.core.participants; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/IExtendedURISuperSet.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/IExtendedURISuperSet.java index 26165693dfe..15239c6a0ed 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/IExtendedURISuperSet.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/IExtendedURISuperSet.java @@ -8,18 +8,18 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.participants; +package org.eclipse.papyrus.team.collaborative.core.participants; import java.util.Set; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker; -import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker; -import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter; -import org.eclipse.papyrus.team.collaborative.participants.version.IReverter; -import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker; +import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker; +import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter; +import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter; +import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/ILocker.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/ILocker.java index 5bf410a5634..163c4084475 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/ILocker.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/ILocker.java @@ -8,12 +8,12 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.participants.locker; +package org.eclipse.papyrus.team.collaborative.core.participants.locker; import org.eclipse.core.runtime.IStatus; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/IUnlocker.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/IUnlocker.java index 70a47af0866..967bc8e3011 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/IUnlocker.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/IUnlocker.java @@ -8,12 +8,12 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.participants.locker; +package org.eclipse.papyrus.team.collaborative.core.participants.locker; import org.eclipse.core.runtime.IStatus; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/ICommitter.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/ICommitter.java index 16aa25a608f..c38963b8901 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/ICommitter.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/ICommitter.java @@ -8,10 +8,10 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.participants.version; +package org.eclipse.papyrus.team.collaborative.core.participants.version; import org.eclipse.core.runtime.IStatus; -import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet; +import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IReverter.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IReverter.java index 18d5bd3c37f..479095ba1dc 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IReverter.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IReverter.java @@ -8,10 +8,10 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.participants.version; +package org.eclipse.papyrus.team.collaborative.core.participants.version; import org.eclipse.core.runtime.IStatus; -import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet; +import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IUpdater.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IUpdater.java index 22909a3932c..074c8ed58dc 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IUpdater.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IUpdater.java @@ -1,10 +1,10 @@ -package org.eclipse.papyrus.team.collaborative.participants.version; +package org.eclipse.papyrus.team.collaborative.core.participants.version; import org.eclipse.core.runtime.IStatus; -import org.eclipse.papyrus.team.collaborative.Activator; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet; -import org.eclipse.papyrus.team.collaborative.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.core.Activator; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet; +import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IWorkOnModifiedElementParticipant.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IWorkOnModifiedElementParticipant.java index a4f039124ad..4dcd9930c02 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IWorkOnModifiedElementParticipant.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IWorkOnModifiedElementParticipant.java @@ -8,12 +8,12 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.participants.version; +package org.eclipse.papyrus.team.collaborative.core.participants.version; import org.eclipse.core.runtime.IStatus; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.reports.CollabStatus; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/reports/CollabStatus.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/reports/CollabStatus.java index 928fcedfdfc..a92ad77131e 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/reports/CollabStatus.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/reports/CollabStatus.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.reports; +package org.eclipse.papyrus.team.collaborative.core.reports; import org.eclipse.core.runtime.Status; @@ -73,7 +73,7 @@ public class CollabStatus extends Status { * @return the collab status */ public static CollabStatus createErrorStatus(String message) { - return new CollabStatus(ERROR, org.eclipse.papyrus.team.collaborative.Activator.PLUGIN_ID, message); + return new CollabStatus(ERROR, org.eclipse.papyrus.team.collaborative.core.Activator.PLUGIN_ID, message); } /** @@ -86,7 +86,7 @@ public class CollabStatus extends Status { * @return the collab status */ public static CollabStatus createErrorStatus(String message, Throwable e) { - return new CollabStatus(ERROR, org.eclipse.papyrus.team.collaborative.Activator.PLUGIN_ID, message, e); + return new CollabStatus(ERROR, org.eclipse.papyrus.team.collaborative.core.Activator.PLUGIN_ID, message, e); } diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/reports/LogHelper.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/reports/LogHelper.java index 7e269c7a791..42c721a30be 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/reports/LogHelper.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/reports/LogHelper.java @@ -8,12 +8,12 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.reports; +package org.eclipse.papyrus.team.collaborative.core.reports; import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.papyrus.team.collaborative.Activator; +import org.eclipse.papyrus.team.collaborative.core.Activator; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/strategy/AbstractLockingStrategy.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/strategy/AbstractLockingStrategy.java index 5c10d6ab291..f99e8e3b9de 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/strategy/AbstractLockingStrategy.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/strategy/AbstractLockingStrategy.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.strategy; +package org.eclipse.papyrus.team.collaborative.core.strategy; import java.util.Collection; @@ -24,7 +24,7 @@ public abstract class AbstractLockingStrategy implements ILockingStrategy { /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy#applyOn(java.util.Collection) + * @see org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy#applyOn(java.util.Collection) */ @Override public boolean applyOn(Collection<EObject> target) { diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/strategy/ILockingStrategy.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/strategy/ILockingStrategy.java index 72c90c33dd2..25f4592a55c 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/strategy/ILockingStrategy.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/strategy/ILockingStrategy.java @@ -8,13 +8,13 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.strategy; +package org.eclipse.papyrus.team.collaborative.core.strategy; import java.util.Collection; import java.util.Set; import org.eclipse.emf.ecore.EObject; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/AbstractRunnableWithProgressWithResult.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/AbstractRunnableWithProgressWithResult.java index eed22c02ab3..782064172ce 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/AbstractRunnableWithProgressWithResult.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/AbstractRunnableWithProgressWithResult.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils; +package org.eclipse.papyrus.team.collaborative.core.utils; @@ -23,7 +23,7 @@ public abstract class AbstractRunnableWithProgressWithResult<T> implements IRunn /* * (non-Javadoc) * - * @see org.eclipse.papyrus.team.collaborative.utils.IRunnableWithProgressWithResult#getResult() + * @see org.eclipse.papyrus.team.collaborative.core.utils.IRunnableWithProgressWithResult#getResult() */ @Override public T getResult() { diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabFunctionsFactory.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabFunctionsFactory.java index a6162077a9a..27c8bde7788 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabFunctionsFactory.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabFunctionsFactory.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils; +package org.eclipse.papyrus.team.collaborative.core.utils; import java.util.Collection; @@ -18,15 +18,15 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.utils.funtions.EObjectToExtendedURI; -import org.eclipse.papyrus.team.collaborative.utils.funtions.ExtendedURIToEObjects; -import org.eclipse.papyrus.team.collaborative.utils.funtions.ExtendedURIToIResource; -import org.eclipse.papyrus.team.collaborative.utils.funtions.ResourceToIFile; -import org.eclipse.papyrus.team.collaborative.utils.funtions.ResourceToURI; -import org.eclipse.papyrus.team.collaborative.utils.funtions.URIToExtendedURI; -import org.eclipse.papyrus.team.collaborative.utils.funtions.URIToExtendedURIWithContainment; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.utils.funtions.EObjectToExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.utils.funtions.ExtendedURIToEObjects; +import org.eclipse.papyrus.team.collaborative.core.utils.funtions.ExtendedURIToIResource; +import org.eclipse.papyrus.team.collaborative.core.utils.funtions.ResourceToIFile; +import org.eclipse.papyrus.team.collaborative.core.utils.funtions.ResourceToURI; +import org.eclipse.papyrus.team.collaborative.core.utils.funtions.URIToExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.utils.funtions.URIToExtendedURIWithContainment; import com.google.common.base.Function; import com.google.common.base.Functions; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabUtils.java index 46ec4665af9..07bcd8ac607 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabUtils.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabUtils.java @@ -8,13 +8,13 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils; +package org.eclipse.papyrus.team.collaborative.core.utils; import java.util.Collections; import org.eclipse.emf.ecore.EObject; -import org.eclipse.papyrus.team.collaborative.ICollaborativeManager; -import org.eclipse.papyrus.team.collaborative.utils.funtions.EObjectToExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager; +import org.eclipse.papyrus.team.collaborative.core.utils.funtions.EObjectToExtendedURI; /** diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ExtendedURIUtil.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ExtendedURIUtil.java index 3d5de89bb0a..8e0635ebd98 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ExtendedURIUtil.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ExtendedURIUtil.java @@ -1,11 +1,11 @@ -package org.eclipse.papyrus.team.collaborative.utils; +package org.eclipse.papyrus.team.collaborative.core.utils; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; public class ExtendedURIUtil { diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/IRunnableWithProgressWithResult.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/IRunnableWithProgressWithResult.java index 0dba93fb7d3..5176ea21438 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/IRunnableWithProgressWithResult.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/IRunnableWithProgressWithResult.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils; +package org.eclipse.papyrus.team.collaborative.core.utils; import org.eclipse.jface.operation.IRunnableWithProgress; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ModelsUtil.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ModelsUtil.java index 97c765c5d17..87c6de37103 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ModelsUtil.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ModelsUtil.java @@ -9,7 +9,7 @@ * Thales Global Services S.A.S. - initial API and implementation * */ -package org.eclipse.papyrus.team.collaborative.utils; +package org.eclipse.papyrus.team.collaborative.core.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ResourceUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ResourceUtils.java index 2204ad8e26f..9c20bcc2021 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ResourceUtils.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/ResourceUtils.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils; +package org.eclipse.papyrus.team.collaborative.core.utils; import java.util.ArrayList; import java.util.Collection; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/URIUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/URIUtils.java index 2320a2653c4..135b6c96972 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/URIUtils.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/URIUtils.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils; +package org.eclipse.papyrus.team.collaborative.core.utils; import java.io.File; import java.net.MalformedURLException; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/EObjectToExtendedURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/EObjectToExtendedURI.java index b48c21afbd0..fd41926d88a 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/EObjectToExtendedURI.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/EObjectToExtendedURI.java @@ -8,12 +8,12 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils.funtions; +package org.eclipse.papyrus.team.collaborative.core.utils.funtions; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; import com.google.common.base.Function; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToEObjects.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToEObjects.java index 08fa2faff34..d6d0097bee7 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToEObjects.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToEObjects.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils.funtions; +package org.eclipse.papyrus.team.collaborative.core.utils.funtions; import java.util.Collection; import java.util.Collections; @@ -16,9 +16,9 @@ import java.util.Collections; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.utils.URIUtils; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils; import com.google.common.base.Function; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToIResource.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToIResource.java index 5573646c262..e2cf99dbbd7 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToIResource.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToIResource.java @@ -8,16 +8,16 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils.funtions; +package org.eclipse.papyrus.team.collaborative.core.utils.funtions; import org.eclipse.core.resources.IResource; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.workspace.util.WorkspaceSynchronizer; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; -import org.eclipse.papyrus.team.collaborative.utils.URIUtils; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils; import com.google.common.base.Function; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToURI.java index 683a8cf53e6..23038266e88 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToURI.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToURI.java @@ -8,10 +8,10 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils.funtions; +package org.eclipse.papyrus.team.collaborative.core.utils.funtions; import org.eclipse.emf.common.util.URI; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; import com.google.common.base.Function; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IFileToFile.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IFileToFile.java index 58b9388fa89..d3a4167ba0b 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IFileToFile.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IFileToFile.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils.funtions; +package org.eclipse.papyrus.team.collaborative.core.utils.funtions; import java.io.File; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IResourceToExtendedURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IResourceToExtendedURI.java index 550b495210c..4bece819da0 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IResourceToExtendedURI.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IResourceToExtendedURI.java @@ -8,11 +8,11 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils.funtions; +package org.eclipse.papyrus.team.collaborative.core.utils.funtions; import org.eclipse.core.resources.IResource; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.utils.URIUtils; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils; import com.google.common.base.Function; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToIFile.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToIFile.java index 97350f43cb4..74b5a0a789f 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToIFile.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToIFile.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils.funtions; +package org.eclipse.papyrus.team.collaborative.core.utils.funtions; import org.eclipse.core.resources.IFile; import org.eclipse.emf.ecore.resource.Resource; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToURI.java index 7f37343b484..5af1b813ab5 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToURI.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToURI.java @@ -8,7 +8,7 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils.funtions; +package org.eclipse.papyrus.team.collaborative.core.utils.funtions; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURI.java index 4a40212c39e..2d3b1c2a3f0 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURI.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURI.java @@ -8,11 +8,11 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils.funtions; +package org.eclipse.papyrus.team.collaborative.core.utils.funtions; import org.eclipse.emf.common.util.URI; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; import com.google.common.base.Function; diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURIWithContainment.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURIWithContainment.java index d0c3ca5d0d0..773b6a713cc 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURIWithContainment.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURIWithContainment.java @@ -8,11 +8,11 @@ * Contributors: * Arthur Daussy - initial implementation *******************************************************************************/ -package org.eclipse.papyrus.team.collaborative.utils.funtions; +package org.eclipse.papyrus.team.collaborative.core.utils.funtions; import org.eclipse.emf.common.util.URI; -import org.eclipse.papyrus.team.collaborative.ExtendedURI; -import org.eclipse.papyrus.team.collaborative.IExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.ExtendedURI; +import org.eclipse.papyrus.team.collaborative.core.IExtendedURI; import com.google.common.base.Function; |