diff options
17 files changed, 33 insertions, 33 deletions
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.project index 75637808ba4..ebfa82252ba 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.project +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.readonly</name>
+ <name>org.eclipse.papyrus.infra.emf.readonly</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF index b38bd3bda9a..db07c0d8d5d 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF @@ -7,14 +7,14 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0", org.eclipse.emf.transaction;bundle-version="1.4.0",
org.eclipse.emf.workspace;bundle-version="1.4.0",
org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1"
-Export-Package: org.eclipse.papyrus.readonly,
- org.eclipse.papyrus.readonly.handlers
+Export-Package: org.eclipse.papyrus.infra.emf.readonly,
+ org.eclipse.papyrus.infra.emf.readonly.handlers
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.readonly.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.readonly;singleton:=true
+Bundle-Activator: org.eclipse.papyrus.infra.emf.readonly.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.xml index 70ed10030ef..90dcf6ab16b 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.xml @@ -5,14 +5,14 @@ <extension
point="org.eclipse.papyrus.readonly.readOnlyHandler">
<readOnlyHandler
- class="org.eclipse.papyrus.readonly.FSReadOnlyHandler"
+ class="org.eclipse.papyrus.infra.emf.readonly.FSReadOnlyHandler"
priority="10">
</readOnlyHandler>
</extension>
<extension
point="org.eclipse.ui.handlers">
<handler
- class="org.eclipse.papyrus.readonly.handlers.EnableWriteHandler"
+ class="org.eclipse.papyrus.infra.emf.readonly.handlers.EnableWriteHandler"
commandId="org.eclipse.papyrus.readonly.EnableWriteCommand">
<enabledWhen>
<and>
@@ -90,14 +90,14 @@ <extension
point="org.eclipse.papyrus.infra.core.transactionalEditingDomainProvider">
<transactionalEditingDomainProvider
- class="org.eclipse.papyrus.readonly.ReadOnlyTransactionalEditingDomainProvider"
+ class="org.eclipse.papyrus.infra.emf.readonly.ReadOnlyTransactionalEditingDomainProvider"
priority="10">
</transactionalEditingDomainProvider>
</extension>
<extension
point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
- class="org.eclipse.papyrus.readonly.ReadOnlyTester"
+ class="org.eclipse.papyrus.infra.emf.readonly.ReadOnlyTester"
id="org.eclipse.papyrus.readonly.tester"
namespace="org.eclipse.papyrus.readonly.tester"
properties="isReadOnly"
@@ -107,7 +107,7 @@ <extension
point="org.eclipse.papyrus.infra.gmfdiag.commands.operationApprover">
<operationApprover
- class="org.eclipse.papyrus.readonly.FSReadOnlyOneFileApprover"
+ class="org.eclipse.papyrus.infra.emf.readonly.FSReadOnlyOneFileApprover"
priority="10">
</operationApprover>
</extension>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/schema/readOnlyHandler.exsd b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/schema/readOnlyHandler.exsd index 9159e918c8f..22cd65076d8 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/schema/readOnlyHandler.exsd +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/schema/readOnlyHandler.exsd @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.readonly" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.papyrus.infra.emf.readonly" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.eclipse.papyrus.readonly" id="readOnly" name="readOnly"/>
+ <meta.schema plugin="org.eclipse.papyrus.infra.emf.readonly" id="readOnly" name="readOnly"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
@@ -55,7 +55,7 @@ </documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.readonly.IReadOnlyHandler"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler"/>
</appinfo>
</annotation>
</attribute>
diff --git a/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/svn/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/Activator.java index 74536d136fa..c7d6ffadf06 100644 --- a/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/svn/Activator.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/Activator.java @@ -11,7 +11,7 @@ * Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.svn;
+package org.eclipse.papyrus.infra.emf.readonly;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/FSReadOnlyHandler.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/FSReadOnlyHandler.java index bea8d1a09fa..cb9fe8a781d 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/FSReadOnlyHandler.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/FSReadOnlyHandler.java @@ -11,7 +11,7 @@ * Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.readonly;
+package org.eclipse.papyrus.infra.emf.readonly;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/FSReadOnlyOneFileApprover.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/FSReadOnlyOneFileApprover.java index c5648268350..3880c2dc5e6 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/FSReadOnlyOneFileApprover.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/FSReadOnlyOneFileApprover.java @@ -11,7 +11,7 @@ * Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.readonly;
+package org.eclipse.papyrus.infra.emf.readonly;
import java.io.File;
import java.util.Arrays;
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/IReadOnlyHandler.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/IReadOnlyHandler.java index 19e8818d348..4f55dc2a1ed 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/IReadOnlyHandler.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/IReadOnlyHandler.java @@ -11,7 +11,7 @@ * Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.readonly;
+package org.eclipse.papyrus.infra.emf.readonly;
import org.eclipse.core.resources.IFile;
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/ReadOnlyManager.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyManager.java index f7bd10f2b80..f92aa13791c 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/ReadOnlyManager.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyManager.java @@ -11,7 +11,7 @@ * Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.readonly;
+package org.eclipse.papyrus.infra.emf.readonly;
import java.util.Collections;
import java.util.LinkedList;
@@ -46,7 +46,7 @@ public class ReadOnlyManager { }
static {
- IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.readonly", "readOnlyHandler");
+ IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.infra.emf.readonly", "readOnlyHandler");
List<HandlerPriorityPair> handlerPriorityPairs = new LinkedList<HandlerPriorityPair>();
for(IConfigurationElement elem : configElements) {
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/ReadOnlyTester.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyTester.java index 056d8ac06b7..da4f6fae691 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/ReadOnlyTester.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyTester.java @@ -11,7 +11,7 @@ * Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.readonly;
+package org.eclipse.papyrus.infra.emf.readonly;
import java.util.Iterator;
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/ReadOnlyTransactionalEditingDomainProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyTransactionalEditingDomainProvider.java index 493a5fbf4af..dd3916a3965 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/ReadOnlyTransactionalEditingDomainProvider.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyTransactionalEditingDomainProvider.java @@ -11,7 +11,7 @@ * Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.readonly;
+package org.eclipse.papyrus.infra.emf.readonly;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/handlers/EnableWriteHandler.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/handlers/EnableWriteHandler.java index 6825c85ef1e..af2e51b7040 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/handlers/EnableWriteHandler.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/handlers/EnableWriteHandler.java @@ -1,4 +1,4 @@ -package org.eclipse.papyrus.readonly.handlers;
+package org.eclipse.papyrus.infra.emf.readonly.handlers;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
@@ -13,10 +13,10 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.infra.core.utils.BusinessModelResolver;
+import org.eclipse.papyrus.infra.emf.readonly.ReadOnlyManager;
import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;
import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;
-import org.eclipse.papyrus.readonly.ReadOnlyManager;
import org.eclipse.ui.PlatformUI;
public class EnableWriteHandler extends AbstractHandler {
diff --git a/plugins/team/org.eclipse.papyrus.team.svn/.project b/plugins/team/org.eclipse.papyrus.team.svn/.project index a775c36cc65..0a484e513bf 100644 --- a/plugins/team/org.eclipse.papyrus.team.svn/.project +++ b/plugins/team/org.eclipse.papyrus.team.svn/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.svn</name>
+ <name>org.eclipse.papyrus.team.svn</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF index 89da92f1556..28647dd1937 100644 --- a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF +++ b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF @@ -4,15 +4,15 @@ Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="0.9.0", org.eclipse.gmf.runtime.common.core,
org.eclipse.emf.ecore,
org.eclipse.team.svn.core,
- org.eclipse.papyrus.readonly;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="0.9.0",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.9.0"
-Export-Package: org.eclipse.papyrus.svn
+Export-Package: org.eclipse.papyrus.team.svn
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.svn.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.svn;singleton:=true
+Bundle-Activator: org.eclipse.papyrus.team.svn.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.team.svn;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/team/org.eclipse.papyrus.team.svn/plugin.xml b/plugins/team/org.eclipse.papyrus.team.svn/plugin.xml index 5babc722a69..7e70529c9ea 100644 --- a/plugins/team/org.eclipse.papyrus.team.svn/plugin.xml +++ b/plugins/team/org.eclipse.papyrus.team.svn/plugin.xml @@ -2,9 +2,9 @@ <?eclipse version="3.4"?>
<plugin>
<extension
- point="org.eclipse.papyrus.readonly.readOnlyHandler">
+ point="org.eclipse.papyrus.infra.emf.readonly.readOnlyHandler">
<readOnlyHandler
- class="org.eclipse.papyrus.svn.SVNLockHandler"
+ class="org.eclipse.papyrus.team.svn.SVNLockHandler"
priority="20">
</readOnlyHandler>
</extension>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/Activator.java b/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/team/svn/Activator.java index 513245a6bd4..2acd0a04c70 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/readonly/Activator.java +++ b/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/team/svn/Activator.java @@ -11,7 +11,7 @@ * Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.readonly;
+package org.eclipse.papyrus.team.svn;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/svn/SVNLockHandler.java b/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/team/svn/SVNLockHandler.java index d909cae3f15..12e5b9db7e9 100644 --- a/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/svn/SVNLockHandler.java +++ b/plugins/team/org.eclipse.papyrus.team.svn/src/org/eclipse/papyrus/team/svn/SVNLockHandler.java @@ -11,13 +11,13 @@ * Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.svn;
+package org.eclipse.papyrus.team.svn;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.team.FileModificationValidationContext;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.papyrus.readonly.IReadOnlyHandler;
+import org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler;
import org.eclipse.team.svn.core.IStateFilter;
import org.eclipse.team.svn.core.svnstorage.SVNRemoteStorage;
import org.eclipse.team.svn.core.utility.FileUtility;
|