diff options
62 files changed, 814 insertions, 377 deletions
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml index 35f78905f3..0a3c233586 100644 --- a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the accompanying materials @@ -8,33 +8,66 @@ Contributors: Martin Fluegge - initial API and implementation ---> -<feature - id="org.eclipse.emf.cdo.dawn" - label="%featureName" - version="1.0.0.qualifier" - provider-name="%providerName" - image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" license-feature-version="4.0.0.qualifier"> - - <description> - %description - </description> - - <copyright url="%copyrightURL"> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/> - <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/> - </url> - - <plugin id="org.eclipse.emf.cdo.dawn" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - <plugin id="org.eclipse.emf.cdo.dawn.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - <plugin id="org.eclipse.emf.cdo.dawn.util" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - -</feature> +-->
+<feature
+ id="org.eclipse.emf.cdo.dawn"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg"
+ license-feature="org.eclipse.emf.cdo.license"
+ license-feature-version="4.0.0.qualifier">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ </url>
+
+ <plugin
+ id="org.eclipse.emf.cdo.dawn"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.dawn.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.dawn.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.dawn.emf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.dawn.gmf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/templates/EMFFragmentTemplate.xpt b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/templates/EMFFragmentTemplate.xpt index b13dc94cd6..0389aa0a7e 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/templates/EMFFragmentTemplate.xpt +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/templates/EMFFragmentTemplate.xpt @@ -39,7 +39,7 @@ import «this.emfGenModel.modelPluginID».presentation.«this.emfGenModel.modelName import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; import org.eclipse.emf.cdo.dawn.editors.IDawnEditorSupport; -import org.eclipse.emf.cdo.dawn.editors.impl.DawnEMFEditorSupport; +import org.eclipse.emf.cdo.dawn.emf.editors.impl.DawnEMFEditorSupport; import org.eclipse.emf.cdo.dawn.ui.DawnEditorInput; import org.eclipse.emf.cdo.dawn.ui.DawnLabelProvider; import org.eclipse.emf.cdo.dawn.ui.DawnSelectionViewerAdapterFactoryContentProvider; @@ -366,10 +366,11 @@ Bundle-SymbolicName: «this.fragmentName»;singleton:=true Bundle-Version: 1.0.0.qualifier Fragment-Host: «this.emfGenModel.editorPluginID» Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[1.0.0,2.0.0)", - org.eclipse.emf.cdo.dawn.ui;bundle-version="[1.0.0,2.0.0)", +Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.cdo.dawn.util;bundle-version="[1.0.0,2.0.0)", - org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)" + org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", + org.eclipse.emf.cdo.dawn.emf;bundle-version="[2.0.0,3.0.0)" «ENDFILE» «ENDDEFINE» diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/templates/GMFFragmentTemplate.xpt b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/templates/GMFFragmentTemplate.xpt index a884056e37..e4fc650ea5 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/templates/GMFFragmentTemplate.xpt +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/templates/GMFFragmentTemplate.xpt @@ -47,7 +47,7 @@ package «this.GMFGenEditorGenerator.editor.packageName»; import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; import org.eclipse.emf.cdo.dawn.editors.IDawnEditorSupport; -import org.eclipse.emf.cdo.dawn.editors.impl.DawnGMFEditorSupport; +import org.eclipse.emf.cdo.dawn.gmf.editors.impl.DawnGMFEditorSupport; import org.eclipse.emf.cdo.dawn.ui.DawnEditorInput; import org.eclipse.emf.cdo.ui.CDOEditorInput; import org.eclipse.emf.cdo.view.CDOView; @@ -208,7 +208,7 @@ public class «this.dawnEditorClassName» extends «GMFGenEditorGenerator.editor.cl «FILE "src/"+getDiagramPackagePath()+"/edit/parts/"+this.dawnDiagramEditPartClassName+".java"» package «this.GMFGenEditorGenerator.diagram.editPartsPackageName»; -import org.eclipse.emf.cdo.dawn.synchronize.DawnConflictHelper; +import org.eclipse.emf.cdo.dawn.gmf.synchronize.DawnConflictHelper; import org.eclipse.emf.ecore.EObject; @@ -1008,11 +1008,11 @@ Bundle-SymbolicName: «this.fragmentName»;singleton:=true Bundle-Version: 1.0.0.qualifier Fragment-Host: «this.GMFGenEditorGenerator.plugin.iD»;bundle-version="0.2.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="0.2.0", - org.eclipse.emf.cdo.dawn.util;bundle-version="0.0", - org.eclipse.emf.cdo.ui;bundle-version="3.0.0", - org.eclipse.emf.cdo.dawn.ui;bundle-version="0.2.0" - +Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.cdo.dawn.util;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.cdo.ui;bundle-version="[3.0.0,5.0.0)", + org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.0.0,3.0.0)" «ENDFILE» «ENDDEFINE» diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF index 2c56219e64..980227bcad 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF @@ -5,10 +5,11 @@ Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.ecore.editor.dawn;singleton:=true Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.emf.ecore.editor Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[1.0.0,2.0.0)", - org.eclipse.emf.cdo.dawn.ui;bundle-version="[1.0.0,2.0.0)", +Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.cdo.dawn.util;bundle-version="[1.0.0,2.0.0)", - org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)" + org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", + org.eclipse.emf.cdo.dawn.emf;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-Localization: fragment Export-Package: org.eclipse.emf.cdo.dawn.ecore.presentation;version="1.0.0";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java index 7fe3380f41..62f5599bc7 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java @@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.dawn.ecore.presentation; import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; import org.eclipse.emf.cdo.dawn.editors.IDawnEditorSupport; -import org.eclipse.emf.cdo.dawn.editors.impl.DawnEMFEditorSupport; +import org.eclipse.emf.cdo.dawn.emf.editors.impl.DawnEMFEditorSupport; import org.eclipse.emf.cdo.dawn.ui.DawnEditorInput; import org.eclipse.emf.cdo.dawn.ui.DawnLabelProvider; import org.eclipse.emf.cdo.dawn.ui.DawnSelectionViewerAdapterFactoryContentProvider; diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF index 1699f9a62e..6114e5cdd3 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF @@ -5,10 +5,11 @@ Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn;singleton: Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.emf.ecoretools.diagram;bundle-version="[0.9.0,2.0.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[1.0.0,2.0.0)", +Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.cdo.dawn.util;bundle-version="[1.0.0,2.0.0)", org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", - org.eclipse.emf.cdo.dawn.ui;bundle-version="[1.0.0,2.0.0)" + org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.0.0,3.0.0)" Bundle-Localization: fragment Export-Package: org.eclipse.emf.cdo.dawn.ecoretools.diagram.edit.parts;version="1.0.0", org.eclipse.emf.cdo.dawn.ecoretools.diagram.edit.policies;version="1.0.0", diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnECoreRootEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnECoreRootEditPart.java index aa10675f5b..21cb480609 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnECoreRootEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnECoreRootEditPart.java @@ -10,7 +10,7 @@ ******************************************************************************/ package org.eclipse.emf.cdo.dawn.ecoretools.diagram.edit.parts; -import org.eclipse.emf.cdo.dawn.synchronize.DawnConflictHelper; +import org.eclipse.emf.cdo.dawn.gmf.synchronize.DawnConflictHelper; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecoretools.diagram.edit.parts.EPackageEditPart; diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditor.java index 4525b3e08d..6ff231d03b 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditor.java @@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.dawn.ecoretools.diagram.part; import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; import org.eclipse.emf.cdo.dawn.editors.IDawnEditorSupport; -import org.eclipse.emf.cdo.dawn.editors.impl.DawnGMFEditorSupport; +import org.eclipse.emf.cdo.dawn.gmf.editors.impl.DawnGMFEditorSupport; import org.eclipse.emf.cdo.dawn.ui.DawnEditorInput; import org.eclipse.emf.cdo.ui.CDOEditorInput; import org.eclipse.emf.cdo.view.CDOView; diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs index 0bde483c31..68ca3bb681 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Sun Jul 31 19:11:46 CEST 2011
+#Fri Aug 05 08:40:50 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.emf/META-INF/MANIFEST.MF index 4fd9102357..ac70245f3f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.emf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.emf/META-INF/MANIFEST.MF @@ -5,9 +5,13 @@ Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.emf Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.eclipse.emf.cdo.dawn.emf.Activator 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)" + org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.common.ui;bundle-version="[2.6.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName -Export-Package: org.eclipse.emf.cdo.dawn.emf;version="2.0.0" +Export-Package: org.eclipse.emf.cdo.dawn.emf;version="2.0.0", + org.eclipse.emf.cdo.dawn.emf.editors.impl;version="2.0.0", + org.eclipse.emf.cdo.dawn.emf.notifications.impl;version="2.0.0" Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/Activator.java b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/Activator.java index 6293075f67..1ecdbbe0fd 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/Activator.java +++ b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/Activator.java @@ -5,28 +5,18 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext;
/**
- * The activator class controls the plug-in life cycle
+ * @author Martin Fluegge
*/
public class Activator extends AbstractUIPlugin
{
-
- // The plug-in ID
public static final String PLUGIN_ID = "org.eclipse.emf.cdo.dawn.emf"; //$NON-NLS-1$
- // The shared instance
private static Activator plugin;
- /**
- * The constructor
- */
public Activator()
{
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
@Override
public void start(BundleContext context) throws Exception
{
@@ -34,10 +24,6 @@ public class Activator extends AbstractUIPlugin plugin = this;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
@Override
public void stop(BundleContext context) throws Exception
{
@@ -45,14 +31,8 @@ public class Activator extends AbstractUIPlugin super.stop(context);
}
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
public static Activator getDefault()
{
return plugin;
}
-
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnEMFEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/editors/impl/DawnEMFEditorSupport.java index 8d5dbbbefc..1a6aca2fc4 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnEMFEditorSupport.java +++ b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/editors/impl/DawnEMFEditorSupport.java @@ -8,11 +8,12 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.editors.impl; +package org.eclipse.emf.cdo.dawn.emf.editors.impl; import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; +import org.eclipse.emf.cdo.dawn.editors.impl.DawnAbstractEditorSupport; +import org.eclipse.emf.cdo.dawn.emf.notifications.impl.DawnEMFHandler; import org.eclipse.emf.cdo.dawn.notifications.BasicDawnListener; -import org.eclipse.emf.cdo.dawn.notifications.impl.DawnEMFHandler; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; import org.eclipse.emf.cdo.view.CDOView; diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/impl/DawnEMFHandler.java b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/notifications/impl/DawnEMFHandler.java index 3943e8b45b..94b5d25b29 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/impl/DawnEMFHandler.java +++ b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/notifications/impl/DawnEMFHandler.java @@ -8,7 +8,7 @@ * Contributors: * Martin Fluegge - initial API and implementation ******************************************************************************/ -package org.eclipse.emf.cdo.dawn.notifications.impl; +package org.eclipse.emf.cdo.dawn.emf.notifications.impl; import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; import org.eclipse.emf.cdo.dawn.notifications.BasicDawnListener; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF index b07bcf89cb..ddcdabb335 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF @@ -2,14 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.100.qualifier Fragment-Host: org.eclipse.emf.cdo.dawn.examples.acore.diagram;bundle-version="1.0.0.qualifier" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Localization: fragment -Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[1.0.0,2.0.0)", +Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.cdo.dawn.util;bundle-version="[1.0.0,2.0.0)", org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", - org.eclipse.emf.cdo.dawn.ui;bundle-version="[1.0.0,2.0.0)" + org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.0.0,3.0.0)" Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="1.0.0", org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="1.0.0", org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="1.0.0", diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/fragment.xml b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/fragment.xml index 67828e1493..800ac7855f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/fragment.xml +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/fragment.xml @@ -67,7 +67,7 @@ point="org.eclipse.emf.cdo.dawn.editpartstylizers"> <DawnEditPartStylizers editpart="org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AClassEditPart" - stylizer="org.eclipse.emf.cdo.dawn.appearance.impl.DawnBasicNodeEditPartStylizerImpl"> + stylizer="org.eclipse.emf.cdo.dawn.gmf.appearance.impl.DawnBasicNodeEditPartStylizerImpl"> </DawnEditPartStylizers> </extension> <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider"> diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java index d149c2f3f8..37701233e6 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java @@ -11,7 +11,7 @@ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; import org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorPlugin; -import org.eclipse.emf.cdo.dawn.synchronize.DawnConflictHelper; +import org.eclipse.emf.cdo.dawn.gmf.synchronize.DawnConflictHelper; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java index bfebc22501..4491e220bb 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java @@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; import org.eclipse.emf.cdo.dawn.editors.IDawnEditorSupport; -import org.eclipse.emf.cdo.dawn.editors.impl.DawnGMFEditorSupport; +import org.eclipse.emf.cdo.dawn.gmf.editors.impl.DawnGMFEditorSupport; import org.eclipse.emf.cdo.dawn.ui.DawnEditorInput; import org.eclipse.emf.cdo.ui.CDOEditorInput; import org.eclipse.emf.cdo.view.CDOView; @@ -36,7 +36,6 @@ import org.eclipse.ui.IFileEditorInput; */ public class DawnAcoreDiagramEditor extends AcoreDiagramEditor implements IDawnEditor { - public static String ID = "org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.DawnAcoreDiagramEditor"; private IDawnEditorSupport dawnEditorSupport; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF index 83afe360cc..6e6988b544 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF @@ -2,13 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.100.qualifier Fragment-Host: org.eclipse.emf.cdo.dawn.examples.acore.editor Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[1.0.0,2.0.0)", - org.eclipse.emf.cdo.dawn.ui;bundle-version="[1.0.0,2.0.0)", +Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.cdo.dawn.util;bundle-version="[1.0.0,2.0.0)", - org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)" + org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", + org.eclipse.emf.cdo.dawn.emf;bundle-version="[2.0.0,3.0.0)" Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.presentation;version="1.0.0" Bundle-Localization: fragment Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java index c9a15dc07d..dcc8763759 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java @@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.dawn.examples.acore.presentation; import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; import org.eclipse.emf.cdo.dawn.editors.IDawnEditorSupport; -import org.eclipse.emf.cdo.dawn.editors.impl.DawnEMFEditorSupport; +import org.eclipse.emf.cdo.dawn.emf.editors.impl.DawnEMFEditorSupport; import org.eclipse.emf.cdo.dawn.ui.DawnEditorInput; import org.eclipse.emf.cdo.dawn.ui.DawnLabelProvider; import org.eclipse.emf.cdo.dawn.ui.DawnSelectionViewerAdapterFactoryContentProvider; diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs index 917216688d..cd3c9a952b 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Sun Jul 31 19:11:46 CEST 2011
+#Fri Aug 05 08:31:00 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF index 521ebca139..b80aed16bc 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF @@ -5,9 +5,30 @@ Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.gmf Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.eclipse.emf.cdo.dawn.gmf.Activator 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)" + org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.common.core;bundle-version="[1.4.0,2.0.0)", + org.eclipse.gmf.runtime.common.ui;bundle-version="[1.4.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.3.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.4.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.4.0,2.0.0)", + org.eclipse.gmf.runtime.emf.core;bundle-version="[1.4.0,2.0.0)", + org.eclipse.gmf.runtime.notation;bundle-version="[1.4.0,2.0.0)", + org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.4.0,2.0.0)", + org.eclipse.gmf.runtime.notation.providers;bundle-version="[1.3.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.3.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.cdo.dawn.util;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName -Export-Package: org.eclipse.emf.cdo.dawn.gmf;version="2.0.0" +Export-Package: org.eclipse.emf.cdo.dawn.gmf;version="2.0.0", + org.eclipse.emf.cdo.dawn.gmf.appearance;version="2.0.0", + org.eclipse.emf.cdo.dawn.gmf.appearance.impl;version="2.0.0", + org.eclipse.emf.cdo.dawn.gmf.editors.impl;version="2.0.0", + org.eclipse.emf.cdo.dawn.gmf.elementtypes;version="2.0.0", + org.eclipse.emf.cdo.dawn.gmf.notifications.impl;version="2.0.0", + org.eclipse.emf.cdo.dawn.gmf.resources;version="2.0.0", + org.eclipse.emf.cdo.dawn.gmf.synchronize;version="2.0.0", + org.eclipse.emf.cdo.dawn.transaction;version="2.0.0" Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/Activator.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/Activator.java index 07b8aac7a8..b59a1e713f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/Activator.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/Activator.java @@ -5,28 +5,18 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext;
/**
- * The activator class controls the plug-in life cycle
+ * @author Martin Fluegge
*/
public class Activator extends AbstractUIPlugin
{
-
- // The plug-in ID
public static final String PLUGIN_ID = "org.eclipse.emf.cdo.dawn.gmf"; //$NON-NLS-1$
- // The shared instance
private static Activator plugin;
- /**
- * The constructor
- */
public Activator()
{
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
@Override
public void start(BundleContext context) throws Exception
{
@@ -34,10 +24,6 @@ public class Activator extends AbstractUIPlugin plugin = this;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
@Override
public void stop(BundleContext context) throws Exception
{
@@ -45,14 +31,8 @@ public class Activator extends AbstractUIPlugin super.stop(context);
}
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
public static Activator getDefault()
{
return plugin;
}
-
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnAppearancer.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnAppearancer.java index 444bb3cc9a..1a99837cfd 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnAppearancer.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnAppearancer.java @@ -8,7 +8,7 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.appearance; +package org.eclipse.emf.cdo.dawn.gmf.appearance; import org.eclipse.draw2d.ColorConstants; import org.eclipse.gef.EditPart; @@ -18,6 +18,7 @@ import org.eclipse.swt.graphics.Color; /** * @author Martin Fluegge + * @since 2.0 */ public class DawnAppearancer { @@ -49,7 +50,10 @@ public class DawnAppearancer public static final int TYPE_LOCKED_GLOBALLY = 4; - public static void setEdiPartConflicted(EditPart editPart, int type) + /** + * @since 2.0 + */ + public static void setEditPartConflicted(EditPart editPart, int type) { DawnEditPartStylizer stylizer = DawnEditPartStylizerRegistry.instance.getStylizer(editPart); if (stylizer != null) @@ -58,6 +62,9 @@ public class DawnAppearancer } } + /** + * @since 2.0 + */ public static void setEditPartDefaultAllChildren(EditPart editPart) { setEditPartDefault(editPart); @@ -68,6 +75,9 @@ public class DawnAppearancer } } + /** + * @since 2.0 + */ public static void setEditPartDefault(EditPart editPart) { DawnEditPartStylizer stylizer = DawnEditPartStylizerRegistry.instance.getStylizer(editPart); @@ -77,6 +87,9 @@ public class DawnAppearancer } } + /** + * @since 2.0 + */ protected static void setEditPartLocked(EditPart editPart, int type) { DawnEditPartStylizer stylizer = DawnEditPartStylizerRegistry.instance.getStylizer(editPart); diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnEditPartStylizer.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizer.java index 141d8e30e4..45df406b72 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnEditPartStylizer.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizer.java @@ -8,7 +8,9 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.appearance; +package org.eclipse.emf.cdo.dawn.gmf.appearance; + +import org.eclipse.emf.cdo.dawn.appearance.DawnElementStylizer; import org.eclipse.gef.EditPart; @@ -19,12 +21,22 @@ import org.eclipse.gef.EditPart; * <b>org.eclipse.emf.cdo.dawn.editpartstylizers</b> extension point. * * @author Martin Fluegge + * @since 2.0 */ -public interface DawnEditPartStylizer +public interface DawnEditPartStylizer extends DawnElementStylizer<EditPart> { + /** + * @since 2.0 + */ public void setDefault(EditPart editPart); + /** + * @since 2.0 + */ public void setConflicted(EditPart editPart, int type); + /** + * @since 2.0 + */ public void setLocked(EditPart editPart, int type); } diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnEditPartStylizerRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizerRegistry.java index 7e97469df9..6bf57906cf 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnEditPartStylizerRegistry.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizerRegistry.java @@ -8,12 +8,12 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.appearance; +package org.eclipse.emf.cdo.dawn.gmf.appearance; -import org.eclipse.emf.cdo.dawn.appearance.impl.DawnBasicConnectionEditPartStylizerImpl; -import org.eclipse.emf.cdo.dawn.appearance.impl.DawnBasicGraphicalEditPartStylizerImpl; -import org.eclipse.emf.cdo.dawn.appearance.impl.DawnBasicNodeEditPartStylizerImpl; -import org.eclipse.emf.cdo.dawn.appearance.impl.DawnBasicTextAwareEditPartStylizerImpl; +import org.eclipse.emf.cdo.dawn.gmf.appearance.impl.DawnBasicConnectionEditPartStylizerImpl; +import org.eclipse.emf.cdo.dawn.gmf.appearance.impl.DawnBasicGraphicalEditPartStylizerImpl; +import org.eclipse.emf.cdo.dawn.gmf.appearance.impl.DawnBasicNodeEditPartStylizerImpl; +import org.eclipse.emf.cdo.dawn.gmf.appearance.impl.DawnBasicTextAwareEditPartStylizerImpl; import org.eclipse.emf.cdo.internal.dawn.bundle.OM; import org.eclipse.net4j.util.om.trace.ContextTracer; @@ -31,6 +31,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart; import java.util.HashMap; import java.util.Map; +/** + * @author Martin Fluegge + * @since 2.0 + */ public class DawnEditPartStylizerRegistry { private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, DawnEditPartStylizerRegistry.class); @@ -41,6 +45,9 @@ public class DawnEditPartStylizerRegistry private Map<String, DawnEditPartStylizer> registeredStylizers = new HashMap<String, DawnEditPartStylizer>(); + /** + * @since 2.0 + */ public DawnEditPartStylizer getStylizer(EditPart editPart) { DawnEditPartStylizer stylizer = registeredStylizers.get(editPart.getClass().getCanonicalName()); diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBasicConnectionEditPartStylizerImpl.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicConnectionEditPartStylizerImpl.java index 3bd1244265..8ed018a44f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBasicConnectionEditPartStylizerImpl.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicConnectionEditPartStylizerImpl.java @@ -8,10 +8,10 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.appearance.impl; +package org.eclipse.emf.cdo.dawn.gmf.appearance.impl; -import org.eclipse.emf.cdo.dawn.appearance.DawnAppearancer; -import org.eclipse.emf.cdo.dawn.appearance.DawnEditPartStylizer; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnAppearancer; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnEditPartStylizer; import org.eclipse.emf.workspace.AbstractEMFOperation; @@ -33,21 +33,31 @@ import org.eclipse.swt.graphics.Color; /** * @author Martin Fluegge + * @since 2.0 */ public class DawnBasicConnectionEditPartStylizerImpl implements DawnEditPartStylizer { + /** + * @since 2.0 + */ public void setDefault(EditPart editPart) { setEdge(editPart, DawnAppearancer.COLOR_NO_CONFLICT); } + /** + * @since 2.0 + */ public void setConflicted(EditPart editPart, int type) { Color color = DawnAppearancer.COLOR_DELETE_CONFLICT; setEdge(editPart, color); } + /** + * @since 2.0 + */ private void setEdge(EditPart editPart, Color color) { ChangePropertyValueRequest request = new ChangePropertyValueRequest(StringStatics.BLANK, @@ -77,6 +87,9 @@ public class DawnBasicConnectionEditPartStylizerImpl implements DawnEditPartStyl editPart.getRoot().refresh(); } + /** + * @since 2.0 + */ public void setLocked(EditPart editPart, int type) { Color color = null; diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBasicDiagramStylizerImpl.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicDiagramStylizerImpl.java index 96c255807d..481eb28570 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBasicDiagramStylizerImpl.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicDiagramStylizerImpl.java @@ -8,25 +8,35 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.appearance.impl; +package org.eclipse.emf.cdo.dawn.gmf.appearance.impl; -import org.eclipse.emf.cdo.dawn.appearance.DawnEditPartStylizer; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnEditPartStylizer; import org.eclipse.gef.EditPart; /** * @author Martin Fluegge + * @since 2.0 */ public class DawnBasicDiagramStylizerImpl implements DawnEditPartStylizer { + /** + * @since 2.0 + */ public void setDefault(EditPart editpart) { } + /** + * @since 2.0 + */ public void setConflicted(EditPart editpart, int type) { } + /** + * @since 2.0 + */ public void setLocked(EditPart editpart, int type) { } diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBasicGraphicalEditPartStylizerImpl.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicGraphicalEditPartStylizerImpl.java index d4bebac44f..f397dee78a 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBasicGraphicalEditPartStylizerImpl.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicGraphicalEditPartStylizerImpl.java @@ -8,10 +8,10 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.appearance.impl; +package org.eclipse.emf.cdo.dawn.gmf.appearance.impl; -import org.eclipse.emf.cdo.dawn.appearance.DawnAppearancer; -import org.eclipse.emf.cdo.dawn.appearance.DawnEditPartStylizer; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnAppearancer; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnEditPartStylizer; import org.eclipse.draw2d.Border; import org.eclipse.draw2d.IFigure; @@ -22,30 +22,47 @@ import org.eclipse.swt.graphics.Color; /** * @author Martin Fluegge + * @since 2.0 */ + public class DawnBasicGraphicalEditPartStylizerImpl implements DawnEditPartStylizer { + /** + * @since 2.0 + */ public void setDefault(EditPart editPart) { setBorder(editPart, null); } + /** + * @since 2.0 + */ public void setConflicted(EditPart editPart, int type) { setBorder(editPart, DawnAppearancer.COLOR_DELETE_CONFLICT, DawnAppearancer.DEFAULT_BORDER_THICKNESS); } + /** + * @since 2.0 + */ public void setLocked(EditPart editPart, int type) { setBorder(editPart, DawnAppearancer.COLOR_LOCKED_REMOTELY, DawnAppearancer.DEFAULT_BORDER_THICKNESS); } + /** + * @since 2.0 + */ protected void setBorder(EditPart editPart, Color color, int thickness) { Border thickBorder = new LineBorder(color, thickness); setBorder(editPart, thickBorder); } + /** + * @since 2.0 + */ protected void setBorder(EditPart editPart, Border border) { GraphicalEditPart e = (GraphicalEditPart)editPart; diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBasicNodeEditPartStylizerImpl.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicNodeEditPartStylizerImpl.java index 3b371d7908..dc9b87979e 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBasicNodeEditPartStylizerImpl.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicNodeEditPartStylizerImpl.java @@ -8,9 +8,9 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.appearance.impl; +package org.eclipse.emf.cdo.dawn.gmf.appearance.impl; -import org.eclipse.emf.cdo.dawn.appearance.DawnAppearancer; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnAppearancer; import org.eclipse.gef.EditPart; diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBasicTextAwareEditPartStylizerImpl.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicTextAwareEditPartStylizerImpl.java index ee0883042a..59319fe19f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBasicTextAwareEditPartStylizerImpl.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicTextAwareEditPartStylizerImpl.java @@ -8,9 +8,9 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.appearance.impl; +package org.eclipse.emf.cdo.dawn.gmf.appearance.impl; -import org.eclipse.emf.cdo.dawn.appearance.DawnAppearancer; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnAppearancer; import org.eclipse.draw2d.Border; import org.eclipse.gef.EditPart; diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBlinkingNodeEditPartStylizerImpl.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBlinkingNodeEditPartStylizerImpl.java index 7975f7d2e3..0a5ea724b3 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/impl/DawnBlinkingNodeEditPartStylizerImpl.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBlinkingNodeEditPartStylizerImpl.java @@ -8,9 +8,9 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.appearance.impl; +package org.eclipse.emf.cdo.dawn.gmf.appearance.impl; -import org.eclipse.emf.cdo.dawn.appearance.DawnAppearancer; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnAppearancer; import org.eclipse.gef.EditPart; @@ -19,10 +19,10 @@ import java.util.Map; /** * @author Martin Fluegge + * @since 2.0 */ public class DawnBlinkingNodeEditPartStylizerImpl extends DawnBasicGraphicalEditPartStylizerImpl { - BlinkingThread blinkingThread; public DawnBlinkingNodeEditPartStylizerImpl() @@ -50,6 +50,10 @@ public class DawnBlinkingNodeEditPartStylizerImpl extends DawnBasicGraphicalEdit setBorder(editPart, DawnAppearancer.COLOR_LOCKED_REMOTELY, DawnAppearancer.DEFAULT_BORDER_THICKNESS); } + /** + * @author Martin Fluegge + * @since 2.0 + */ protected class BlinkingThread extends Thread { @@ -84,6 +88,9 @@ public class DawnBlinkingNodeEditPartStylizerImpl extends DawnBasicGraphicalEdit } } + /** + * @since 2.0 + */ public void start(EditPart editPart) { editParts.put(editPart, true); diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnGMFEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java index e2b624010b..15530b01b1 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnGMFEditorSupport.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java @@ -8,12 +8,13 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.editors.impl; +package org.eclipse.emf.cdo.dawn.gmf.editors.impl; -import org.eclipse.emf.cdo.dawn.appearance.DawnAppearancer; import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; +import org.eclipse.emf.cdo.dawn.editors.impl.DawnAbstractEditorSupport; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnAppearancer; +import org.eclipse.emf.cdo.dawn.gmf.notifications.impl.DawnGMFHandler; import org.eclipse.emf.cdo.dawn.notifications.BasicDawnListener; -import org.eclipse.emf.cdo.dawn.notifications.impl.DawnGMFHandler; import org.eclipse.emf.cdo.dawn.util.DawnDiagramUpdater; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/elementtypes/DawnElementTypeHelper.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelper.java index efc7035ee6..dea5b89a11 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/elementtypes/DawnElementTypeHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelper.java @@ -8,16 +8,23 @@ * Contributors: * Martin Fluegge - initial API and implementation ******************************************************************************/ -package org.eclipse.emf.cdo.dawn.elementtypes; +package org.eclipse.emf.cdo.dawn.gmf.elementtypes; /** * * @author Martin Fluegge + * @since 2.0 */ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.notation.View; +/** + * @since 2.0 + */ public interface DawnElementTypeHelper { + /** + * @since 2.0 + */ IElementType getElementType(View view); } diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/elementtypes/DawnElementTypeHelperFactory.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelperFactory.java index 2c35e7a478..04849145c8 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/elementtypes/DawnElementTypeHelperFactory.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelperFactory.java @@ -8,7 +8,7 @@ * Contributors: * Martin Fluegge - initial API and implementation ******************************************************************************/ -package org.eclipse.emf.cdo.dawn.elementtypes; +package org.eclipse.emf.cdo.dawn.gmf.elementtypes; /** * @author Martin Fluegge diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/impl/DawnGMFHandler.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFHandler.java index 8371f27bf5..e6a32118a3 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/impl/DawnGMFHandler.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFHandler.java @@ -8,13 +8,13 @@ * Contributors: * Martin Fluegge - initial API and implementation ******************************************************************************/ -package org.eclipse.emf.cdo.dawn.notifications.impl; +package org.eclipse.emf.cdo.dawn.gmf.notifications.impl; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; +import org.eclipse.emf.cdo.dawn.gmf.synchronize.DawnConflictHelper; import org.eclipse.emf.cdo.dawn.notifications.BasicDawnListener; -import org.eclipse.emf.cdo.dawn.synchronize.DawnConflictHelper; import org.eclipse.emf.cdo.dawn.util.DawnDiagramUpdater; import org.eclipse.emf.cdo.internal.dawn.bundle.OM; import org.eclipse.emf.cdo.transaction.CDOTransaction; diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnPathmapManager.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/resources/DawnPathmapManager.java index 1b16c5474f..4792d27929 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnPathmapManager.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/resources/DawnPathmapManager.java @@ -8,7 +8,7 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.resources; +package org.eclipse.emf.cdo.dawn.gmf.resources; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/synchronize/DawnChangeHelper.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java index 30581a79eb..541f20df87 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/synchronize/DawnChangeHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java @@ -8,7 +8,7 @@ * Contributors: * Martin Fluegge - initial API and implementation ******************************************************************************/ -package org.eclipse.emf.cdo.dawn.synchronize; +package org.eclipse.emf.cdo.dawn.gmf.synchronize; import org.eclipse.emf.cdo.dawn.util.DawnDiagramUpdater; import org.eclipse.emf.cdo.dawn.util.DawnResourceHelper; diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/synchronize/DawnConflictHelper.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnConflictHelper.java index 9c272f7237..26279daa3d 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/synchronize/DawnConflictHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnConflictHelper.java @@ -8,12 +8,12 @@ * Contributors: * Martin Fluegge - initial API and implementation */ -package org.eclipse.emf.cdo.dawn.synchronize; +package org.eclipse.emf.cdo.dawn.gmf.synchronize; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOState; -import org.eclipse.emf.cdo.dawn.appearance.DawnAppearancer; import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnAppearancer; import org.eclipse.emf.cdo.dawn.util.DawnDiagramUpdater; import org.eclipse.emf.cdo.internal.dawn.bundle.OM; import org.eclipse.emf.cdo.transaction.CDOTransaction; @@ -47,7 +47,7 @@ public class DawnConflictHelper } EditPart editPart = DawnDiagramUpdater.createOrFindEditPartIfViewExists(view, editor); int typeConflictLocallyDeleted = evaluateConflictType(cdoObject); - DawnAppearancer.setEdiPartConflicted(editPart, typeConflictLocallyDeleted); + DawnAppearancer.setEditPartConflicted(editPart, typeConflictLocallyDeleted); } return cdoConflict; } diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java index 799b4e079d..251b8cf4b9 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java @@ -10,7 +10,7 @@ */ package org.eclipse.emf.cdo.dawn.transaction; -import org.eclipse.emf.cdo.dawn.resources.DawnPathmapManager; +import org.eclipse.emf.cdo.dawn.gmf.resources.DawnPathmapManager; import org.eclipse.emf.cdo.internal.dawn.bundle.OM; import org.eclipse.net4j.util.om.trace.ContextTracer; diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java index 187bb648c9..43d89b4451 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java @@ -10,7 +10,7 @@ */ package org.eclipse.emf.cdo.dawn.transaction; -import org.eclipse.emf.cdo.dawn.resources.DawnPathmapManager; +import org.eclipse.emf.cdo.dawn.gmf.resources.DawnPathmapManager; import org.eclipse.emf.cdo.internal.dawn.bundle.OM; import org.eclipse.net4j.util.om.trace.ContextTracer; diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF index b09563ab73..366f315815 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF @@ -9,11 +9,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.gmf;bundle-version="[1.2.0,2.0.0)", org.eclipse.gmf.runtime.notation;bundle-version="[1.4.0,2.0.0)", org.eclipse.emf.cdo.dawn.examples.acore;bundle-version="[0.2.0,1.0.1)", - org.eclipse.emf.cdo.dawn;bundle-version="[0.2.0,1.0.1)", + org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)", org.eclipse.emf.workspace;bundle-version="[1.4.0,2.0.0)", org.eclipse.gmf.runtime.emf.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.emf.cdo.dawn.ui;bundle-version="[1.0.0,2.0.0)", + org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.cdo.ui;bundle-version="4.0.0", org.eclipse.emf.cdo.dawn.util;bundle-version="[1.0.0,2.0.0)", @@ -34,7 +34,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.cdo.dawn.examples.acore.editor;bundle-version="[1.0.0,2.0.0)", org.eclipse.emf.cdo.dawn.examples.acore.diagram;bundle-version="[1.0.0,2.0.0)", org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui;bundle-version="1.0.0", - org.eclipse.emf.ecoretools.diagram;bundle-version="[0.10.0,2.0.0)" + org.eclipse.emf.ecoretools.diagram;bundle-version="[0.10.0,2.0.0)", + org.eclipse.emf.cdo.dawn.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName @@ -46,6 +48,5 @@ Export-Package: org.eclipse.emf.cdo.dawn.tests;version="1.0.0";x-internal:=true, org.eclipse.emf.cdo.dawn.tests.ui.emf;version="1.0.0";x-internal:=true, org.eclipse.emf.cdo.dawn.tests.ui.gmf;version="1.0.0";x-internal:=true, org.eclipse.emf.cdo.dawn.tests.ui.util;version="1.0.0";x-internal:=true -Import-Package: org.antlr.runtime;version="3.0.0", - org.eclipse.emf.cdo.dawn.examples.acore.provider;version="[0.2.0,1.0.1)" +Import-Package: org.antlr.runtime;version="3.0.0" Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java index 9c53603072..ec91c4e080 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java @@ -54,6 +54,9 @@ public class AllTestsDawnUISWTBot extends ConfigTestSuite @Override protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario) { + /******************** General **********************/ + // testClasses.add(DawnCodeGenerationTest.class); + /******************** GMF **********************/ testClasses.add(DawnPreferencesTest.class); testClasses.add(DawnCreationWizardSWTBotTest.class); diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java index 9116bf5edd..6704ed47b9 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java @@ -31,14 +31,14 @@ public class TCPConfigStarter extends AllConfigs } @Override - protected void initConfigSuites(TestSuite parent) + protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario) { - addScenario(parent, COMBINED, MEM_BRANCHES, TCP, NATIVE); + testClasses.add(InitialTest.class); } @Override - protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario) + protected void initConfigSuites(TestSuite parent) { - testClasses.add(InitialTest.class); + addScenario(parent, COMBINED, MEM_BRANCHES, TCP, NATIVE); } } diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java index 1899df4058..0732c172db 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java @@ -52,7 +52,7 @@ public class DawnCodeGenGMFFragmentTest extends AbstractDawnTest String outputFolder = DawnTestPlatform.instance.getTestFolder(); String diagramFolder = ouputFolder + "/" + "src/org/eclipse/emf/cdo/dawn/examples/acore/diagram"; - assertEquals(true, new File(outputFolder + "/META-INF/Manifest.MF").exists()); + assertEquals(true, new File(outputFolder + "/META-INF/MANIFEST.MF").exists()); assertEquals(true, new File(outputFolder + "/fragment.xml").exists()); assertEquals(true, new File(outputFolder + "/build.properties").exists()); diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnWrapperResourceTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnWrapperResourceTest.java index d427a2209c..e23e785b16 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnWrapperResourceTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnWrapperResourceTest.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.dawn.tests.common; import org.eclipse.emf.cdo.dawn.resources.DawnWrapperResource; import org.eclipse.emf.cdo.dawn.tests.AbstractDawnTest; import org.eclipse.emf.cdo.session.CDOSession; +import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; @@ -24,6 +25,7 @@ import java.util.Collections; /** * @author Martin Fluegge */ +@CleanRepositoriesBefore public class DawnWrapperResourceTest extends AbstractDawnTest { public void testPostEventTransactionHandler() throws Exception diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java index 834e8811c8..ddcadfffdf 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java @@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; +import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore; import org.eclipse.emf.cdo.tests.mango.MangoValue; import org.eclipse.emf.cdo.transaction.CDOTransaction; @@ -41,6 +42,7 @@ import java.util.List; /** * @author Martin Fluegge */ +@CleanRepositoriesBefore public class GMFTest extends AbstractCDOTest { public void testDiagram() throws Exception diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java index f0f7b831ba..adf7f7118b 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java @@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.dawn.resources.DawnWrapperResource; import org.eclipse.emf.cdo.dawn.tests.AbstractDawnTest; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; +import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CommitException; @@ -29,6 +30,7 @@ import org.eclipse.gmf.runtime.notation.Diagram; * * @author Martin Fluegge */ +@CleanRepositoriesBefore public class TestFrameworkTest extends AbstractDawnTest { public void testResourceCreation() throws CommitException diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java new file mode 100644 index 0000000000..bb12daf724 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java @@ -0,0 +1,205 @@ +/** + * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + * 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 + * + * Contributors: + * Martin Fluegge - initial API and implementation + */ +package org.eclipse.emf.cdo.dawn.tests.ui; + +import org.eclipse.emf.cdo.dawn.tests.AbstractDawnUITest; +import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnCodeGenerationTestUtil; +import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnSWTBotUtil; +import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; +import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * @author Martin Fluegge + */ +@CleanRepositoriesBefore +@RunWith(SWTBotJunit4ClassRunner.class) +public class DawnCodeGenerationTest extends AbstractDawnUITest<SWTWorkbenchBot> +{ + private SWTBotView packageExplorer; + + @Override + @Before + public void setUp() throws Exception + { + super.setUp(); + prepare(); + } + + @Override + @After + public void tearDown() throws Exception + { + cleanup(); + super.tearDown(); + } + + private void cleanup() + { + deleteProject("org.eclipse.emf.cdo.dawn.examples.acore"); + } + + @Test + public void testCodeGenerationGMF() throws Exception + { + SWTBotView packageExplorer = DawnSWTBotUtil.openView(getBot(), "Java", "Package Explorer"); + packageExplorer.setFocus(); + + SWTBotTreeItem modelFolder = getBot().tree().expandNode("org.eclipse.emf.cdo.dawn.examples.acore", "model"); + + SWTBotTreeItem gmfgen = modelFolder.expandNode("acore.gmfgen"); + gmfgen.contextMenu("Generate Dawn GenModel").click(); + + sleep(5000); + + assertNotNull(modelFolder.getNode("acore.dawngenmodel")); + SWTBotTreeItem dawngenmodel_gmf = modelFolder.getNode("acore.dawngenmodel_gmf"); + assertNotNull(dawngenmodel_gmf); + + dawngenmodel_gmf.contextMenu("Generate Dawn GMF Fragment").click(); + + sleep(10000); + + IProject fragment = ResourcesPlugin.getWorkspace().getRoot() + .getProject("org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn"); + + assertNotNull(fragment); + String diagramFolder = "src/org/eclipse/emf/cdo/dawn/examples/acore/diagram"; + assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, "META-INF/MANIFEST.MF")); + assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, "/fragment.xml")); + assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, "/build.properties")); + + assertEquals(true, + DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/edit/parts/DawnAcoreEditPartFactory.java")); + assertEquals(true, + DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/edit/parts/DawnACoreRootEditPart.java")); + assertEquals( + true, + DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + + "/edit/policies/DawnACoreRootCanonicalEditPolicy.java")); + + assertEquals(true, + DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreCreationWizard.java")); + assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditor.java")); + assertEquals(true, + DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditorUtil.java")); + assertEquals(true, + DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDocumentProvider.java")); + + assertEquals(true, + DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/providers/DawnAcoreEditPartProvider.java")); + assertEquals(true, + DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/providers/DawnAcoreEditPolicyProvider.java")); + deleteProject("org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn"); + sleep(2000); + } + + @Test + public void testCodeGenerationEMF() throws Exception + { + packageExplorer = DawnSWTBotUtil.openView(getBot(), "Java", "Package Explorer"); + packageExplorer.setFocus(); + + SWTBotTreeItem modelFolder = getBot().tree().expandNode("org.eclipse.emf.cdo.dawn.examples.acore", "model"); + + SWTBotTreeItem gmfgen = modelFolder.expandNode("acore.genmodel"); + gmfgen.contextMenu("Generate Dawn GenModel").click(); + + IProject rootProject = ResourcesPlugin.getWorkspace().getRoot() + .getProject("org.eclipse.emf.cdo.dawn.examples.acore"); + + waitUntilExists(rootProject, "model/acore.dawngenmodel", 10000); + + assertEquals(true, DawnCodeGenerationTestUtil.exists(rootProject, "model/acore.dawngenmodel_emf")); + + modelFolder.setFocus(); + SWTBotTreeItem dawngenmodel_emf = modelFolder.getNode("acore.dawngenmodel_emf"); + + assertNotNull(dawngenmodel_emf); + + dawngenmodel_emf.contextMenu("Generate Dawn EMF Fragment").click(); + + sleep(10000); + + assertNotNull(modelFolder.getNode("acore.dawngenmodel")); + assertNotNull(modelFolder.getNode("acore.dawngenmodel_emf")); + + IProject fragment = ResourcesPlugin.getWorkspace().getRoot() + .getProject("org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn"); + + assertNotNull(fragment); + + assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, "META-INF/MANIFEST.MF")); + assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, "/fragment.xml")); + assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, "/build.properties")); + + String folder = "src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/"; + + assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, folder + "DawnAcoreEditor.java")); + assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, folder + "DawnAcoreModelWizard.java")); + deleteProject("org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn"); + sleep(2000); + } + + private void waitUntilExists(IProject project, String path, int timeout) + { + while (timeout > 0) + { + if (DawnCodeGenerationTestUtil.exists(project, "model/acore.dawngenmodel")) + { + return; + } + sleep(1000); + timeout -= 1000; + } + throw new RuntimeException("Could not find " + path + " within " + timeout + " ms."); + } + + private SWTWorkbenchBot prepare() + { + SWTWorkbenchBot bot = getBot(); + + SWTBotView pluginsView = DawnSWTBotUtil.openView(bot, "Plug-in Development", "Plug-ins"); + + pluginsView.setFocus(); + + final SWTBotTree tree = bot.tree(); + final SWTBotTree plugin = tree.select("org.eclipse.emf.cdo.dawn.examples.acore (1.0.0.qualifier)"); + + DawnSWTBotUtil.findContextMenu(plugin, "Import As", "Source Project").click(); + + // wait here until the import has finished + sleep(10000); + return bot; + } + + private void deleteProject(String projectName) + { + SWTWorkbenchBot bot = getBot(); + SWTBotTreeItem project = bot.tree().expandNode(projectName); + project.contextMenu("Delete").click(); + bot.shell("Delete Resources").activate(); + bot.checkBox().select(); + bot.button("OK").click(); + sleep(2000); + } +} diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java index 8ff353e986..c2c34b8027 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java @@ -10,7 +10,6 @@ */ package org.eclipse.emf.cdo.dawn.tests.ui.util; -import org.eclipse.emf.cdo.dawn.appearance.DawnAppearancer; import org.eclipse.emf.cdo.dawn.examples.acore.AClass; import org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AClassAggregationsEditPart; import org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AClassAssociationsEditPart; @@ -22,6 +21,7 @@ import org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AInterfaceEdit import org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreVisualIDRegistry; import org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers.AcoreElementTypes; import org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers.AcoreViewProvider; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnAppearancer; import org.eclipse.emf.cdo.dawn.ui.DawnEditorInput; import org.eclipse.emf.cdo.dawn.ui.helper.EditorDescriptionHelper; diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnCodeGenerationTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnCodeGenerationTestUtil.java new file mode 100644 index 0000000000..d655544478 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnCodeGenerationTestUtil.java @@ -0,0 +1,24 @@ +/**
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * 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
+ *
+ * Contributors:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.tests.ui.util;
+
+import org.eclipse.core.resources.IProject;
+
+/**
+ * @author Martin Fluegge
+ */
+public class DawnCodeGenerationTestUtil
+{
+ public static boolean exists(IProject project, String path)
+ {
+ return project.getFile(path).exists();
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java index b0da13495b..088044a0cf 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java @@ -10,9 +10,9 @@ */ package org.eclipse.emf.cdo.dawn.tests.ui.util; -import org.eclipse.emf.cdo.dawn.appearance.DawnAppearancer; import org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AClassEditPart; import org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AInterfaceEditPart; +import org.eclipse.emf.cdo.dawn.gmf.appearance.DawnAppearancer; import org.eclipse.emf.cdo.dawn.ui.DawnEditorInput; import org.eclipse.emf.cdo.dawn.ui.helper.EditorDescriptionHelper; diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java index d5b70e0480..baa8b4f225 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java @@ -10,9 +10,13 @@ */ package org.eclipse.emf.cdo.dawn.tests.ui.util; +import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withMnemonic; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.instanceOf; + import org.eclipse.emf.cdo.dawn.examples.acore.AClass; import org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AClassEditPart; -import org.eclipse.emf.cdo.dawn.synchronize.DawnConflictHelper; +import org.eclipse.emf.cdo.dawn.gmf.synchronize.DawnConflictHelper; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -33,18 +37,30 @@ import org.eclipse.gmf.runtime.notation.Edge; import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.RelativeBendpoints; import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefConnectionEditPart; import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart; import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.matchers.AbstractMatcher; +import org.eclipse.swtbot.swt.finder.results.WidgetResult; +import org.eclipse.swtbot.swt.finder.widgets.AbstractSWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; import org.hamcrest.Description; +import org.hamcrest.Matcher; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -52,6 +68,14 @@ import java.util.List; */ public class DawnSWTBotUtil { + private static final String LABEL_OK = "OK"; + + private static final String LABEL_OTHERS = "Other..."; + + private static final String LABEL_WINDOW = "Window"; + + private static final String LABEL_SHOW_VIEW = "Show View"; + public static void initTest(SWTWorkbenchBot bot) { closeWelcomePage(bot); @@ -73,7 +97,7 @@ public class DawnSWTBotUtil public static void setConnectorType(SWTWorkbenchBot bot, String serverName, String serverPort, String repository, String protocol) { - bot.menu("Window").menu("Preferences").click(); + bot.menu(LABEL_WINDOW).menu("Preferences").click(); SWTBotShell shell = bot.shell("Preferences"); shell.activate(); @@ -88,7 +112,7 @@ public class DawnSWTBotUtil serverPortLabel.setText(serverPort); repositoryLabel.setText(repository); fileNameLabel.setText(protocol); - bot.button("OK").click(); + bot.button(LABEL_OK).click(); } public static List<SWTBotGefEditPart> getAllEditParts(SWTBotGefEditor editor) @@ -277,6 +301,81 @@ public class DawnSWTBotUtil return ret; } + public static SWTBotView openView(SWTWorkbenchBot bot, String categoryName, String viewName) + { + bot.menu(LABEL_WINDOW).menu(LABEL_SHOW_VIEW).menu(LABEL_OTHERS).click(); + + SWTBotShell shell = bot.shell(LABEL_SHOW_VIEW); + shell.activate(); + bot.tree().expandNode(categoryName).select(viewName); + bot.button(LABEL_OK).click(); + + return bot.activeView(); + } + + @SuppressWarnings("unchecked") + public static SWTBotMenu findContextMenu(final AbstractSWTBot<?> bot, final String... texts) + { + final Matcher<?>[] matchers = new Matcher<?>[texts.length]; + for (int i = 0; i < texts.length; i++) + { + matchers[i] = allOf(instanceOf(MenuItem.class), withMnemonic(texts[i])); + } + + final MenuItem menuItem = UIThreadRunnable.syncExec(new WidgetResult<MenuItem>() + { + public MenuItem run() + { + MenuItem menuItem = null; + Control control = (Control)bot.widget; + Menu menu = control.getMenu(); + for (int i = 0; i < matchers.length; i++) + { + menuItem = show(menu, matchers[i]); + if (menuItem != null) + { + menu = menuItem.getMenu(); + } + } + + return menuItem; + } + }); + if (menuItem == null) + { + throw new WidgetNotFoundException("Could not find menu: " + Arrays.asList(texts)); + } + + return new SWTBotMenu(menuItem); + } + + private static MenuItem show(final Menu menu, final Matcher<?> matcher) + { + if (menu != null) + { + menu.notifyListeners(SWT.Show, new Event()); + MenuItem[] items = menu.getItems(); + for (final MenuItem menuItem : items) + { + if (matcher.matches(menuItem)) + { + return menuItem; + } + } + menu.notifyListeners(SWT.Hide, new Event()); + } + return null; + } + + public static void setAutomaticBuild(SWTWorkbenchBot bot, boolean enabled) + { + SWTBotMenu menu = bot.menu("Project").menu("Build Automatically"); + // if(menu.isEnabled()&&enabled) + { + menu.click(); + } + } + // public static Edge createEdgeRemote(Node source, Node target, String type) // { // Edge newEdge = ViewService.createEdge(source, target, type, PreferencesHint.USE_DEFAULTS); diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF index 887fe88be3..c7c75a3170 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF @@ -2,46 +2,22 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.eclipse.emf.cdo.dawn.internal.ui.bundle.OM$Activator Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.dawn.util;bundle-version="[1.0.0,2.0.0)", - org.eclipse.emf.cdo.dawn;bundle-version="[1.0.0,2.0.0)" + org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.eclipse.emf.cdo.dawn.internal.ui.bundle;version="1.0.0"; - uses:="org.eclipse.net4j.util.om.log, - org.eclipse.net4j.util.om, - org.eclipse.net4j.util.om.trace, - org.eclipse.net4j.util.om.pref", - org.eclipse.emf.cdo.dawn.ui;version="1.0.0"; - uses:="org.eclipse.emf.cdo.view, - org.eclipse.emf.common.util, - org.eclipse.emf.cdo.eresource, - org.eclipse.ui.plugin, - org.osgi.framework, - org.eclipse.emf.common.ui, - org.eclipse.emf.cdo.ui", - org.eclipse.emf.cdo.dawn.ui.composites;version="1.0.0", - org.eclipse.emf.cdo.dawn.ui.helper;version="1.0.0";uses:="org.eclipse.emf.ecore.resource,org.eclipse.ui,org.eclipse.swt.graphics", - org.eclipse.emf.cdo.dawn.ui.messages;version="1.0.0";x-friends:="org.eclipse.emf.cdo.dawn.tests", - org.eclipse.emf.cdo.dawn.ui.views;version="1.0.0"; - uses:="org.eclipse.emf.cdo.internal.ui.views, - org.eclipse.emf.cdo.view, - org.eclipse.ui, - org.eclipse.swt.graphics, - org.eclipse.net4j.util.ui.views, - org.eclipse.emf.cdo.ui", - org.eclipse.emf.cdo.dawn.ui.wizards;version="1.0.0"; - uses:="org.eclipse.jface.wizard, - org.eclipse.net4j.util.container, - org.eclipse.emf.common.util, - org.eclipse.emf.cdo.view, - org.eclipse.jface.viewers, - org.eclipse.net4j.util.ui.views, - org.eclipse.swt.widgets", - org.eclipse.emf.cdo.dawn.ui.wizards.dialogs;version="1.0.0" +Export-Package: org.eclipse.emf.cdo.dawn.internal.ui.bundle;version="2.0.0", + org.eclipse.emf.cdo.dawn.ui;version="2.0.0", + org.eclipse.emf.cdo.dawn.ui.composites;version="2.0.0", + org.eclipse.emf.cdo.dawn.ui.helper;version="2.0.0", + org.eclipse.emf.cdo.dawn.ui.messages;version="2.0.0", + org.eclipse.emf.cdo.dawn.ui.views;version="2.0.0", + org.eclipse.emf.cdo.dawn.ui.wizards;version="2.0.0", + org.eclipse.emf.cdo.dawn.ui.wizards.dialogs;version="2.0.0" diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/messages/Messages.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/messages/Messages.java index 7ae71eed90..9e4fd1b293 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/messages/Messages.java +++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/messages/Messages.java @@ -14,6 +14,7 @@ import org.eclipse.osgi.util.NLS; /** * @author Martin Fluegge + * @since 2.0 */ public class Messages extends NLS { diff --git a/plugins/org.eclipse.emf.cdo.dawn/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.dawn/.settings/.api_filters index 56f7b38bba..4e3a23a4e3 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo.dawn/.settings/.api_filters @@ -1,13 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.dawn" version="2">
- <resource path="src/org/eclipse/emf/cdo/dawn/resources/DawnPathmapManager.java" type="org.eclipse.emf.cdo.dawn.resources.DawnPathmapManager">
- <filter comment="To be fixed later" id="576720909">
- <message_arguments>
- <message_argument value="PathmapManager"/>
- <message_argument value="DawnPathmapManager"/>
- </message_arguments>
- </filter>
- </resource>
<resource path="src/org/eclipse/emf/cdo/dawn/resources/DawnResourceFactory.java" type="org.eclipse.emf.cdo.dawn.resources.DawnResourceFactory">
<filter id="571473929">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF index e8ff091d1a..d8280ea589 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF @@ -2,45 +2,31 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.eclipse.emf.cdo.dawn.DawnRuntimePlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", - org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)", + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.dawn.util;bundle-version="[1.0.0,2.0.0)", - org.eclipse.gmf.runtime.common.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.gmf.runtime.common.ui;bundle-version="[1.4.0,2.0.0)", - org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.3.0,2.0.0)", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.4.0,2.0.0)", - org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.4.0,2.0.0)", - org.eclipse.gmf.runtime.emf.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.gmf.runtime.notation;bundle-version="[1.4.0,2.0.0)", - org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.4.0,2.0.0)", - org.eclipse.gmf.runtime.notation.providers;bundle-version="[1.3.0,2.0.0)", - org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.3.0,2.0.0)", - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.2.0,2.0.0)", - org.eclipse.emf.common.ui;bundle-version="[2.6.0,3.0.0)" + org.eclipse.emf.common.ui;bundle-version="[2.6.0,3.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;version="1.0.0", - org.eclipse.emf.cdo.dawn.actions;version="1.0.0";x-internal:=true, - org.eclipse.emf.cdo.dawn.appearance;version="1.0.0", - org.eclipse.emf.cdo.dawn.appearance.impl;version="1.0.0", - org.eclipse.emf.cdo.dawn.commands;version="1.0.0", - org.eclipse.emf.cdo.dawn.conflicts;version="1.0.0", - org.eclipse.emf.cdo.dawn.editors;version="1.0.0", - org.eclipse.emf.cdo.dawn.editors.impl;version="1.0.0", - org.eclipse.emf.cdo.dawn.elementtypes;version="1.0.0", - org.eclipse.emf.cdo.dawn.handlers;version="1.0.0";x-internal:=true, - org.eclipse.emf.cdo.dawn.helper;version="1.0.0", - org.eclipse.emf.cdo.dawn.notifications;version="1.0.0", - org.eclipse.emf.cdo.dawn.notifications.impl;version="1.0.0";x-internal:=true, - org.eclipse.emf.cdo.dawn.preferences;version="1.0.0", - org.eclipse.emf.cdo.dawn.resources;version="1.0.0", - org.eclipse.emf.cdo.dawn.resources.impl;version="1.0.0", - org.eclipse.emf.cdo.dawn.synchronize;version="1.0.0", - org.eclipse.emf.cdo.dawn.transaction;version="1.0.0", - org.eclipse.emf.cdo.internal.dawn.bundle;version="1.0.0" +Export-Package: org.eclipse.emf.cdo.dawn;version="2.0.0", + org.eclipse.emf.cdo.dawn.actions;version="2.0.0";x-internal:=true, + org.eclipse.emf.cdo.dawn.appearance;version="2.0.0", + org.eclipse.emf.cdo.dawn.commands;version="2.0.0", + org.eclipse.emf.cdo.dawn.conflicts;version="2.0.0", + org.eclipse.emf.cdo.dawn.editors;version="2.0.0", + org.eclipse.emf.cdo.dawn.editors.impl;version="2.0.0", + org.eclipse.emf.cdo.dawn.handlers;version="2.0.0";x-internal:=true, + org.eclipse.emf.cdo.dawn.helper;version="2.0.0", + org.eclipse.emf.cdo.dawn.notifications;version="2.0.0", + org.eclipse.emf.cdo.dawn.preferences;version="2.0.0", + org.eclipse.emf.cdo.dawn.resources;version="2.0.0", + org.eclipse.emf.cdo.dawn.resources.impl;version="2.0.0", + org.eclipse.emf.cdo.dawn.transaction;version="2.0.0", + org.eclipse.emf.cdo.internal.dawn.bundle;version="2.0.0" Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.cdo.dawn/schema/org.eclipse.emf.cdo.dawn.listeners.exsd b/plugins/org.eclipse.emf.cdo.dawn/schema/org.eclipse.emf.cdo.dawn.listeners.exsd index ccc087df42..515266a297 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/schema/org.eclipse.emf.cdo.dawn.listeners.exsd +++ b/plugins/org.eclipse.emf.cdo.dawn/schema/org.eclipse.emf.cdo.dawn.listeners.exsd @@ -1,125 +1,125 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.emf.cdo.dawn" xmlns="http://www.w3.org/2001/XMLSchema"> -<annotation> - <appinfo> - <meta.schema plugin="org.eclipse.emf.cdo.dawn" id="org.eclipse.emf.cdo.dawn.listeners" name="DawnListeners"/> - </appinfo> - <documentation> - This extension point allows to add a tranaction listener to the editor's related transaction. This Listener must extend org.eclipse.emf.cdo.dawn.notifications.BasicDawnListener. This allows to change the editors behavior an transaction changes. - </documentation> - </annotation> - - <element name="extension"> - <annotation> - <appinfo> - <meta.element /> - </appinfo> - </annotation> - <complexType> - <sequence> - <element ref="DawnTransactionListener"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appinfo> - <meta.attribute translatable="true"/> - </appinfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="DawnResourceListener"> - <complexType> - <attribute name="class" type="string"> - <annotation> - <documentation> - - </documentation> - <appinfo> - <meta.attribute kind="java" basedOn="org.eclipse.emf.cdo.dawn.notifications.AbstractDawnResoureChangeListener:"/> - </appinfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="DawnTransactionListener"> - <complexType> - <attribute name="class" type="string"> - <annotation> - <documentation> - - </documentation> - <appinfo> - <meta.attribute kind="java" basedOn="org.eclipse.emf.cdo.dawn.notifications.AbstractDawnListener:"/> - </appinfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appinfo> - <meta.section type="since"/> - </appinfo> - <documentation> - 0.2.0 - </documentation> - </annotation> - - <annotation> - <appinfo> - <meta.section type="examples"/> - </appinfo> - <documentation> - This examples shows how to set an own implementation to the extension point. -<pre> - <extension point="org.eclipse.emf.cdo.dawn.listeners"> - <DawnTransactionListener - class="org.eclipse.emf.cdo.dawn.notifications.DawnGMFTransactionListener"> - </DawnTransactionListener> - </extension> -</pre> - </documentation> - </annotation> - - <annotation> - <appinfo> - <meta.section type="apiinfo"/> - </appinfo> - <documentation> - Extend org.eclipse.emf.cdo.dawn.notifications.BasicDawnListener and override the method notifyEvent(IEvent event) to change the behavior. Set your implementation to the <b>class</b> attribute of the extension point. - </documentation> - </annotation> - - - <annotation> - <appinfo> - <meta.section type="copyright"/> - </appinfo> - <documentation> - Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.<br> -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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> - </documentation> - </annotation> - -</schema> +<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.emf.cdo.dawn" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="org.eclipse.emf.cdo.dawn" id="org.eclipse.emf.cdo.dawn.listeners" name="DawnListeners"/>
+ </appinfo>
+ <documentation>
+ This extension point allows to add a tranaction listener to the editor's related transaction. This Listener must extend org.eclipse.emf.cdo.dawn.notifications.BasicDawnListener. This allows to change the editors behavior if a transaction changes.
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="DawnTransactionListener"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="DawnResourceListener">
+ <complexType>
+ <attribute name="class" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute kind="java" basedOn="org.eclipse.emf.cdo.dawn.notifications.AbstractDawnResoureChangeListener:"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="DawnTransactionListener">
+ <complexType>
+ <attribute name="class" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute kind="java" basedOn="org.eclipse.emf.cdo.dawn.notifications.AbstractDawnListener:"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="since"/>
+ </appinfo>
+ <documentation>
+ 0.2.0
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="examples"/>
+ </appinfo>
+ <documentation>
+ This examples shows how to set an own implementation to the extension point.
+<pre>
+ <extension point="org.eclipse.emf.cdo.dawn.listeners">
+ <DawnTransactionListener
+ class="org.eclipse.emf.cdo.dawn.notifications.DawnGMFTransactionListener">
+ </DawnTransactionListener>
+ </extension>
+</pre>
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="apiinfo"/>
+ </appinfo>
+ <documentation>
+ Extend org.eclipse.emf.cdo.dawn.notifications.BasicDawnListener and override the method notifyEvent(IEvent event) to change the behavior. Set your implementation to the <b>class</b> attribute of the extension point.
+ </documentation>
+ </annotation>
+
+
+ <annotation>
+ <appinfo>
+ <meta.section type="copyright"/>
+ </appinfo>
+ <documentation>
+ Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.<br>
+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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+ </documentation>
+ </annotation>
+
+</schema>
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java index 4220adbf3d..3eb4495b52 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java +++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java @@ -16,7 +16,6 @@ import org.eclipse.emf.cdo.internal.dawn.bundle.OM; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.gef.EditPart; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; @@ -26,6 +25,9 @@ import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; /** + * Since Dawn 0.2 this class is deprecated and replaced with "org.eclipse.emf.cdo.dawn.handlers.SolveConflictHandler". + * It will be removed soon. + * * @author Martin Fluegge */ @Deprecated @@ -76,7 +78,7 @@ public class HandleConflictsAction implements IObjectActionDelegate if (selection instanceof IStructuredSelection) { IStructuredSelection structuredSelection = (IStructuredSelection)selection; - if (structuredSelection.getFirstElement() instanceof EditPart) + // if (structuredSelection.getFirstElement() instanceof EditPart) { selectedElement = structuredSelection.getFirstElement(); } diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java new file mode 100644 index 0000000000..5a7be31d79 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java @@ -0,0 +1,27 @@ +/**
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * 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
+ *
+ * Contributors:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.appearance;
+
+/**
+ * This interface is used do influence the appearance of an UI element by a certain state. Implementations allow to
+ * change the appearance for the adapted types of editors.
+ *
+ * @author Martin Fluegge
+ * @since 2.0
+ */
+public interface DawnElementStylizer<T>
+{
+ public void setDefault(T element);
+
+ public void setConflicted(T element, int type);
+
+ public void setLocked(T element, int type);
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java index 00ab21c3b8..2b49aa9d4d 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java +++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java @@ -13,15 +13,17 @@ package org.eclipse.emf.cdo.dawn.conflicts; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.gmf.runtime.notation.View; - import java.util.Map; import java.util.Observer; import java.util.Set; /** + * Since Dawn 2.0 this interface is deprecated and will be removed soon. Because it was never really used, there will be + * no surragote. + * * @author Martin Fluegge */ +@Deprecated public interface ResourceSynchronizer { public static final int NO_CONFLICT = -1; @@ -60,11 +62,11 @@ public interface ResourceSynchronizer void resolveDeletedRemotellyConflict(String xmiId); - void updateViewWithRemoteView(View obj); - - void lastResourceDeleteView(View newView); - - void lastResourceChangeView(View newView); + // void updateViewWithRemoteView(View obj); + // + // void lastResourceDeleteView(View newView); + // + // void lastResourceChangeView(View newView); boolean isConflicted(); diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java index 49fab2d62b..cff31f5547 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java +++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java @@ -28,8 +28,8 @@ import java.io.Writer; import java.util.Map; /** - * This class wrapper CDOResource and combines it with a XMLResource to avoid problems with GMF which casts internally - * to XML resource + * This class wrapper CDOResource and combines it with a XMLResource to avoid problems with all frameworks which are + * internally using an XMLResource * * @author Martin Fluegge */ diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java index 63a2acd5c8..bfb63b6a16 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java +++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java @@ -22,6 +22,9 @@ import org.eclipse.emf.transaction.impl.TransactionChangeRecorder; */ public class DawnTransactionChangeRecorder extends TransactionChangeRecorder { + /** + * @since 2.0 + */ public DawnTransactionChangeRecorder(InternalTransactionalEditingDomain domain, ResourceSet rset) { super(domain, rset); |