Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2012-05-15 12:40:35 +0000
committermgolubev2012-05-15 12:40:35 +0000
commit60398929970657f97a12a823a7bcbec8ef729e09 (patch)
treec60311ff422c5f82a45fe199aca80f521ff807a8
parentdcf75b44092b5f6dad20cd7030fe116519e234b9 (diff)
downloadorg.eclipse.gmf-tooling-60398929970657f97a12a823a7bcbec8ef729e09.tar.gz
org.eclipse.gmf-tooling-60398929970657f97a12a823a7bcbec8ef729e09.tar.xz
org.eclipse.gmf-tooling-60398929970657f97a12a823a7bcbec8ef729e09.zip
Subsetting / layering diagram support for GMFT separated from Taipan(samples)-layers-support-taipan
sample to be reusable.
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/.classpath7
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/.project28
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/META-INF/MANIFEST.MF37
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/build.properties4
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/DefaultSaveOptions.java29
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/SubDiagramManager.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/SubDiagramManager.java)2
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/SubDiagramManagerImpl.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/SubDiagramManagerImpl.java)2
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/AssignToLayerAction.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/AssignToLayerAction.java)2
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/AssignToLayerItemProvider.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/AssignToLayerItemProvider.java)6
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/AssignToLayerItemProviderPolicy.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/AssignToLayerItemProviderPolicy.java)2
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/CreateNewLayerAction.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/CreateNewLayerAction.java)2
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/CreateSubDiagramAction.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/CreateSubDiagramAction.java)2
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/DomainOnlyEditRequest.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/DomainOnlyEditRequest.java)2
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/OpenSubDiagramAction.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/OpenSubDiagramAction.java)2
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SubDiagramActionBase.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SubDiagramActionBase.java)6
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SubDiagramsItemProvider.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SubDiagramsItemProvider.java)6
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SwitchLayerVisibilityAction.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SwitchLayerVisibilityAction.java)2
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SwitchLayerVisibilityItemProvider.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SwitchLayerVisibilityItemProvider.java)6
-rw-r--r--examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/UniqueNameValidator.java (renamed from examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/UniqueNameValidator.java)2
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/.classpath1
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/META-INF/MANIFEST.MF2
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/build.properties3
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml8
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorUtil.java2
25 files changed, 141 insertions, 31 deletions
diff --git a/examples/org.eclipse.gmf.examples.layers.subdiagrams/.classpath b/examples/org.eclipse.gmf.examples.layers.subdiagrams/.classpath
new file mode 100644
index 000000000..8a8f1668c
--- /dev/null
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/examples/org.eclipse.gmf.examples.layers.subdiagrams/.project b/examples/org.eclipse.gmf.examples.layers.subdiagrams/.project
new file mode 100644
index 000000000..47a634d9e
--- /dev/null
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.gmf.examples.layers.subdiagrams</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/examples/org.eclipse.gmf.examples.layers.subdiagrams/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.gmf.examples.layers.subdiagrams/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..f287d53cf
--- /dev/null
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/examples/org.eclipse.gmf.examples.layers.subdiagrams/META-INF/MANIFEST.MF b/examples/org.eclipse.gmf.examples.layers.subdiagrams/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..3c0daff5c
--- /dev/null
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/META-INF/MANIFEST.MF
@@ -0,0 +1,37 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Sample : Subsetting / Layerig support for arbitrary GMFT diagram
+Bundle-SymbolicName: org.eclipse.gmf.examples.layers.subdiagrams
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Eclipse.org
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.core.expressions,
+ org.eclipse.jface,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.draw2d;visibility:=reexport,
+ org.eclipse.gef;visibility:=reexport,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.emf.edit.ui,
+ org.eclipse.gmf.runtime.emf.core,
+ org.eclipse.gmf.runtime.emf.commands.core,
+ org.eclipse.gmf.runtime.emf.ui.properties,
+ org.eclipse.gmf.runtime.diagram.ui,
+ org.eclipse.gmf.runtime.diagram.ui.properties,
+ org.eclipse.gmf.runtime.diagram.ui.providers,
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide,
+ org.eclipse.gmf.runtime.diagram.ui.render,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
+ org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,
+ org.eclipse.gmf.runtime.notation;visibility:=reexport,
+ org.eclipse.gmf.examples.taipan.ui,
+ org.eclipse.gmf.tooling.runtime,
+ org.eclipse.gmf.examples.layers;bundle-version="1.0.0";visibility:=reexport
+Export-Package: org.eclipse.gmf.examples.layers.subdiagrams,
+ org.eclipse.gmf.examples.layers.subdiagrams.popup
+
+
diff --git a/examples/org.eclipse.gmf.examples.layers.subdiagrams/build.properties b/examples/org.eclipse.gmf.examples.layers.subdiagrams/build.properties
new file mode 100644
index 000000000..41eb6ade2
--- /dev/null
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/DefaultSaveOptions.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/DefaultSaveOptions.java
new file mode 100644
index 000000000..8099bf148
--- /dev/null
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/DefaultSaveOptions.java
@@ -0,0 +1,29 @@
+package org.eclipse.gmf.examples.layers.subdiagrams;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+/**
+ * @deprecated find a way to plug the real per-diagram save options (XXXDiagramEditorUtil.getSaveOptions) here.
+ */
+@Deprecated
+public class DefaultSaveOptions {
+
+ /**
+ * XXX: We don't have a way to plug the actual diagram save options (XXXDiagramEditorUtil.getSaveOptions) here.
+ * For now we will use the default ones, but it may lead to a problem if actual diagram has this method generated NOT.
+ *
+ * @deprecated find a way to plug the real per-diagram save options (XXXDiagramEditorUtil.getSaveOptions) here.
+ */
+ @Deprecated
+ public static Map<?, ?> getSaveOptions() {
+ HashMap<String, Object> saveOptions = new HashMap<String, Object>();
+ saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
+ saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+ return saveOptions;
+ }
+
+}
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/SubDiagramManager.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/SubDiagramManager.java
index 873392efe..53eea5cc5 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/SubDiagramManager.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/SubDiagramManager.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams;
+package org.eclipse.gmf.examples.layers.subdiagrams;
import org.eclipse.gmf.examples.layers.SubDiagramSupport;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/SubDiagramManagerImpl.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/SubDiagramManagerImpl.java
index e20a06dc1..fb16f70a6 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/SubDiagramManagerImpl.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/SubDiagramManagerImpl.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams;
+package org.eclipse.gmf.examples.layers.subdiagrams;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/AssignToLayerAction.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/AssignToLayerAction.java
index 6557a7aa8..9c73bc9cf 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/AssignToLayerAction.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/AssignToLayerAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import java.util.List;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/AssignToLayerItemProvider.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/AssignToLayerItemProvider.java
index c984245c6..7651bd7d8 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/AssignToLayerItemProvider.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/AssignToLayerItemProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import java.util.ArrayList;
import java.util.Collections;
@@ -9,8 +9,8 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.examples.layers.Layer;
import org.eclipse.gmf.examples.layers.SubDiagramSpec;
import org.eclipse.gmf.examples.layers.SubDiagramSupport;
-import org.eclipse.gmf.examples.subdiagrams.SubDiagramManager;
-import org.eclipse.gmf.examples.subdiagrams.SubDiagramManagerImpl;
+import org.eclipse.gmf.examples.layers.subdiagrams.SubDiagramManager;
+import org.eclipse.gmf.examples.layers.subdiagrams.SubDiagramManagerImpl;
import org.eclipse.gmf.runtime.common.core.service.IProvider;
import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/AssignToLayerItemProviderPolicy.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/AssignToLayerItemProviderPolicy.java
index 4875b9b6d..f0397c695 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/AssignToLayerItemProviderPolicy.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/AssignToLayerItemProviderPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import java.util.List;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/CreateNewLayerAction.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/CreateNewLayerAction.java
index c08a04484..9e020c9ad 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/CreateNewLayerAction.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/CreateNewLayerAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import java.util.List;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/CreateSubDiagramAction.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/CreateSubDiagramAction.java
index e9b82d9d9..9004c22ee 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/CreateSubDiagramAction.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/CreateSubDiagramAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/DomainOnlyEditRequest.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/DomainOnlyEditRequest.java
index 22ec737ee..818d5b8df 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/DomainOnlyEditRequest.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/DomainOnlyEditRequest.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/OpenSubDiagramAction.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/OpenSubDiagramAction.java
index d69a90498..6f174ac11 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/OpenSubDiagramAction.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/OpenSubDiagramAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SubDiagramActionBase.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SubDiagramActionBase.java
index b75ddb99a..46e231c10 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SubDiagramActionBase.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SubDiagramActionBase.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -19,7 +19,7 @@ import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
import org.eclipse.gef.Request;
import org.eclipse.gmf.examples.layers.SubDiagramSpec;
import org.eclipse.gmf.examples.layers.SubDiagramSupport;
-import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanDiagramEditorUtil;
+import org.eclipse.gmf.examples.layers.subdiagrams.DefaultSaveOptions;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
@@ -131,7 +131,7 @@ public abstract class SubDiagramActionBase extends DiagramAction {
try {
for (Resource nextResource : diagramSpec.eResource().getResourceSet().getResources()) {
if (nextResource.isLoaded() && !getEditingDomain().isReadOnly(nextResource)) {
- nextResource.save(TaiPanDiagramEditorUtil.getSaveOptions());
+ nextResource.save(DefaultSaveOptions.getSaveOptions());
}
}
} catch (IOException ex) {
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SubDiagramsItemProvider.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SubDiagramsItemProvider.java
index ba9376019..052131c60 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SubDiagramsItemProvider.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SubDiagramsItemProvider.java
@@ -1,9 +1,9 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import org.eclipse.gmf.examples.layers.SubDiagramSpec;
import org.eclipse.gmf.examples.layers.SubDiagramSupport;
-import org.eclipse.gmf.examples.subdiagrams.SubDiagramManager;
-import org.eclipse.gmf.examples.subdiagrams.SubDiagramManagerImpl;
+import org.eclipse.gmf.examples.layers.subdiagrams.SubDiagramManager;
+import org.eclipse.gmf.examples.layers.subdiagrams.SubDiagramManagerImpl;
import org.eclipse.gmf.runtime.common.core.service.IProvider;
import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SwitchLayerVisibilityAction.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SwitchLayerVisibilityAction.java
index 462c73a52..c56d74249 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SwitchLayerVisibilityAction.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SwitchLayerVisibilityAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SwitchLayerVisibilityItemProvider.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SwitchLayerVisibilityItemProvider.java
index 3c58ba041..206de8774 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/SwitchLayerVisibilityItemProvider.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/SwitchLayerVisibilityItemProvider.java
@@ -1,10 +1,10 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import org.eclipse.gmf.examples.layers.Layer;
import org.eclipse.gmf.examples.layers.SubDiagramSpec;
import org.eclipse.gmf.examples.layers.SubDiagramSupport;
-import org.eclipse.gmf.examples.subdiagrams.SubDiagramManager;
-import org.eclipse.gmf.examples.subdiagrams.SubDiagramManagerImpl;
+import org.eclipse.gmf.examples.layers.subdiagrams.SubDiagramManager;
+import org.eclipse.gmf.examples.layers.subdiagrams.SubDiagramManagerImpl;
import org.eclipse.gmf.runtime.common.core.service.IProvider;
import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/UniqueNameValidator.java b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/UniqueNameValidator.java
index 03e853c0b..5fdaafd22 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/custom-src/org/eclipse/gmf/examples/subdiagrams/popup/UniqueNameValidator.java
+++ b/examples/org.eclipse.gmf.examples.layers.subdiagrams/src/org/eclipse/gmf/examples/layers/subdiagrams/popup/UniqueNameValidator.java
@@ -1,4 +1,4 @@
-package org.eclipse.gmf.examples.subdiagrams.popup;
+package org.eclipse.gmf.examples.layers.subdiagrams.popup;
import java.util.HashSet;
import java.util.List;
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/.classpath b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/.classpath
index c50b57478..021596729 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/.classpath
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/.classpath
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="custom-src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/META-INF/MANIFEST.MF
index 18d94a28f..0d52baaca 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/META-INF/MANIFEST.MF
@@ -41,7 +41,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gmf.examples.taipan.ui,
org.eclipse.emf.validation.ocl;visibility:=reexport,
org.eclipse.gmf.tooling.runtime,
- org.eclipse.gmf.examples.layers;bundle-version="1.0.0"
+ org.eclipse.gmf.examples.layers.subdiagrams;bundle-version="1.0.0"
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/build.properties b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/build.properties
index aa8661e5b..45032b6db 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/build.properties
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/build.properties
@@ -7,6 +7,5 @@ bin.includes = .,\
messages.properties,\
.options
jars.compile.order = .
-source.. = src/,\
- custom-src/
+source.. = src/
output.. = bin/
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml
index f8d080ed8..8cd7acf88 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml
@@ -636,7 +636,7 @@ Contributors:
<?gmfgen generated="false"?>
<contributionItemProvider
checkPluginLoaded="true"
- class="org.eclipse.gmf.examples.subdiagrams.popup.AssignToLayerItemProvider">
+ class="org.eclipse.gmf.examples.layers.subdiagrams.popup.AssignToLayerItemProvider">
<Priority name="Medium"/>
<popupContribution
class="org.eclipse.gmf.examples.taipan.gmf.editor.part.DiagramEditorContextMenuProvider">
@@ -649,14 +649,14 @@ Contributors:
id="menu_assign_to_layer">
</popupMenu>
<popupStructuredContributionCriteria
- policyClass="org.eclipse.gmf.examples.subdiagrams.popup.AssignToLayerItemProviderPolicy">
+ policyClass="org.eclipse.gmf.examples.layers.subdiagrams.popup.AssignToLayerItemProviderPolicy">
</popupStructuredContributionCriteria>
</popupContribution>
</contributionItemProvider>
<contributionItemProvider
checkPluginLoaded="true"
- class="org.eclipse.gmf.examples.subdiagrams.popup.SwitchLayerVisibilityItemProvider">
+ class="org.eclipse.gmf.examples.layers.subdiagrams.popup.SwitchLayerVisibilityItemProvider">
<Priority name="Medium"/>
<popupContribution
class="org.eclipse.gmf.examples.taipan.gmf.editor.part.DiagramEditorContextMenuProvider">
@@ -677,7 +677,7 @@ Contributors:
<contributionItemProvider
checkPluginLoaded="true"
- class="org.eclipse.gmf.examples.subdiagrams.popup.SubDiagramsItemProvider">
+ class="org.eclipse.gmf.examples.layers.subdiagrams.popup.SubDiagramsItemProvider">
<Priority name="Medium"/>
<popupContribution
class="org.eclipse.gmf.examples.taipan.gmf.editor.part.DiagramEditorContextMenuProvider">
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorUtil.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorUtil.java
index ccc10f572..5c67b416f 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorUtil.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorUtil.java
@@ -39,7 +39,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.examples.subdiagrams.SubDiagramManagerImpl;
+import org.eclipse.gmf.examples.layers.subdiagrams.SubDiagramManagerImpl;
import org.eclipse.gmf.examples.taipan.Aquatory;
import org.eclipse.gmf.examples.taipan.TaiPanFactory;
import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.AquatoryEditPart;

Back to the top