diff options
author | Martin Fluegge | 2013-03-19 05:41:40 +0000 |
---|---|---|
committer | Eike Stepper | 2013-03-19 05:43:13 +0000 |
commit | ceb5601ca4cbad51edd03f4e04a31bbab453921b (patch) | |
tree | 460ede5e49465c2d5bfa6cf79878dcd190fa617e /plugins | |
parent | 0262bfafb86ebbcd4eb4cbd65bebea1d15cbba8a (diff) | |
download | cdo-ceb5601ca4cbad51edd03f4e04a31bbab453921b.tar.gz cdo-ceb5601ca4cbad51edd03f4e04a31bbab453921b.tar.xz cdo-ceb5601ca4cbad51edd03f4e04a31bbab453921b.zip |
[403710] [Dawn] Adjust to breaking changes in Graphiti 0.10.0
https://bugs.eclipse.org/bugs/show_bug.cgi?id=403710
Diffstat (limited to 'plugins')
6 files changed, 139 insertions, 22 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/.settings/.api_filters index 2882b26cb7..1cd11bfd10 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/.settings/.api_filters @@ -1160,4 +1160,87 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnCodeGenEditPlugin.java" type="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.provider.DawnCodeGenEditPlugin"> + <filter id="1143996420"> + <message_arguments> + <message_argument value="getPluginResourceLocator()"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnFragmentGeneratorItemProvider.java" type="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.provider.DawnFragmentGeneratorItemProvider"> + <filter id="1143996420"> + <message_arguments> + <message_argument value="DawnFragmentGeneratorItemProvider(AdapterFactory)"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="getResourceLocator()"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="notifyChanged(Notification)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnGeneratorItemProvider.java" type="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.provider.DawnGeneratorItemProvider"> + <filter id="1143996420"> + <message_arguments> + <message_argument value="DawnGeneratorItemProvider(AdapterFactory)"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="getResourceLocator()"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="notifyChanged(Notification)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawngenmodelItemProviderAdapterFactory.java" type="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.provider.DawngenmodelItemProviderAdapterFactory"> + <filter id="1143996420"> + <message_arguments> + <message_argument value="adapt(Notifier, Object)"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="addListener(INotifyChangedListener)"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="createDawnFragmentGeneratorAdapter()"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="createDawnGeneratorAdapter()"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="fireNotifyChanged(Notification)"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="getRootAdapterFactory()"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="removeListener(INotifyChangedListener)"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="setParentAdapterFactory(ComposedAdapterFactory)"/> + </message_arguments> + </filter> + </resource> </component> diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/.settings/.api_filters new file mode 100644 index 0000000000..5e422d6b17 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/.settings/.api_filters @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel" version="2"> + <resource path="src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnFragmentGeneratorImpl.java" type="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.impl.DawnFragmentGeneratorImpl"> + <filter id="1143996420"> + <message_arguments> + <message_argument value="eStaticClass()"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF index ad982ad2ba..de6c617013 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.100.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Vendor: %providerName @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;version="1.0.0", - org.eclipse.emf.cdo.dawn.examples.acore.graphiti.diagram;version="1.0.0", - org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;version="1.0.0", - org.eclipse.emf.cdo.dawn.examples.acore.graphiti.util;version="1.0.0" +Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;version="1.0.100", + org.eclipse.emf.cdo.dawn.examples.acore.graphiti.diagram;version="1.0.100", + org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;version="1.0.100", + org.eclipse.emf.cdo.dawn.examples.acore.graphiti.util;version="1.0.100" diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java index 39619d7aa9..5c59a06afd 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java @@ -4,10 +4,10 @@ * 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 - * + * * Contributors: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.diagram; @@ -51,7 +51,7 @@ public class AcoreDiagramTypeProvider extends AbstractDiagramTypeProvider public void init(Diagram diagram, IDiagramEditor diagramEditor) { super.init(diagram, diagramEditor); - DawnGraphitiAcoreResourceUtil.wireDomainModel(diagram, diagram.eResource().getResourceSet(), getDiagramEditor() + DawnGraphitiAcoreResourceUtil.wireDomainModel(diagram, diagram.eResource().getResourceSet(), getDiagramBehavior() .getEditingDomain()); } } diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF index c25bab3f50..dec0bf8d56 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.graphiti;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Activator: org.eclipse.emf.cdo.dawn.graphiti.DawnGraphitiUIPlugin Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", @@ -21,9 +21,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName -Export-Package: org.eclipse.emf.cdo.dawn.graphiti;version="2.0.0", - org.eclipse.emf.cdo.dawn.graphiti.editors;version="2.0.0", - org.eclipse.emf.cdo.dawn.graphiti.notifications;version="2.0.0", - org.eclipse.emf.cdo.dawn.graphiti.util;version="2.0.0", - org.eclipse.emf.cdo.dawn.graphiti.wizards;version="2.0.0" +Export-Package: org.eclipse.emf.cdo.dawn.graphiti;version="2.1.0", + org.eclipse.emf.cdo.dawn.graphiti.editors;version="2.1.0", + org.eclipse.emf.cdo.dawn.graphiti.notifications;version="2.1.0", + org.eclipse.emf.cdo.dawn.graphiti.util;version="2.1.0", + org.eclipse.emf.cdo.dawn.graphiti.wizards;version="2.1.0" Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditor.java index f1bdbd8ab2..ed71d4d438 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditor.java @@ -4,7 +4,7 @@ * 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 - * + * * Contributors: * Martin Fluegge - initial API and implementation */ @@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.graphiti.mm.pictograms.Diagram; import org.eclipse.graphiti.ui.editor.DefaultPersistencyBehavior; +import org.eclipse.graphiti.ui.editor.DiagramBehavior; import org.eclipse.graphiti.ui.editor.DiagramEditor; import org.eclipse.graphiti.ui.editor.IDiagramEditorInput; import org.eclipse.graphiti.ui.internal.services.GraphitiUiInternal; @@ -94,8 +95,11 @@ public class DawnGraphitiDiagramEditor extends DiagramEditor implements IDawnEdi } } + /** + * @since 2.1 + */ @Override - protected void initializeGraphicalViewer() + public void initializeGraphicalViewer() { super.initializeGraphicalViewer(); dawnEditorSupport.registerListeners(); @@ -129,19 +133,39 @@ public class DawnGraphitiDiagramEditor extends DiagramEditor implements IDawnEdi } @Override - protected DefaultPersistencyBehavior createPersistencyBehavior() + protected DiagramBehavior createDiagramBehavior() { - persistencyBehavior = new DefaultPersistencyBehavior(this) + DiagramBehavior diagramBehavior = new DiagramBehavior(this) { + { + setParentPart(DawnGraphitiDiagramEditor.this); + initDefaultBehaviors(); + } + @Override - public void saveDiagram(IProgressMonitor monitor) + protected DefaultPersistencyBehavior createPersistencyBehavior() { - dawnEditorSupport.setDirty(false); - super.saveDiagram(monitor); + persistencyBehavior = new DefaultPersistencyBehavior(getDiagramBehavior()) + { + @Override + public void saveDiagram(IProgressMonitor monitor) + { + dawnEditorSupport.setDirty(false); + super.saveDiagram(monitor); + } + }; + + return persistencyBehavior; } }; - return persistencyBehavior; + return diagramBehavior; + } + + @Deprecated + protected DefaultPersistencyBehavior createPersistencyBehavior() + { + throw new UnsupportedOperationException(); } @Override |