diff options
15 files changed, 26 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..666141e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/org.eclipse.emf.refactor.comrel/ +/org.eclipse.emf.refactor.comrel.diagram/ diff --git a/org.eclipse.emf.refactor.comrel.diagram/bin/.gitignore b/org.eclipse.emf.refactor.comrel.diagram/bin/.gitignore index 508dbce..c6647ac 100644 --- a/org.eclipse.emf.refactor.comrel.diagram/bin/.gitignore +++ b/org.eclipse.emf.refactor.comrel.diagram/bin/.gitignore @@ -1 +1 @@ -/comrel +/comrel/ diff --git a/org.eclipse.emf.refactor.comrel.generator/.gitignore b/org.eclipse.emf.refactor.comrel.generator/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/org.eclipse.emf.refactor.comrel.generator/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/org.eclipse.emf.refactor.comrel.generator/bin/.gitignore b/org.eclipse.emf.refactor.comrel.generator/bin/.gitignore deleted file mode 100644 index 508dbce..0000000 --- a/org.eclipse.emf.refactor.comrel.generator/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/comrel diff --git a/org.eclipse.emf.refactor.refactoring.henshin/bin/.gitignore b/org.eclipse.emf.refactor.refactoring.henshin/bin/.gitignore new file mode 100644 index 0000000..cf1db2e --- /dev/null +++ b/org.eclipse.emf.refactor.refactoring.henshin/bin/.gitignore @@ -0,0 +1 @@ +/org/ diff --git a/org.eclipse.emf.refactor.refactoring.henshin/bin/org/eclipse/emf/refactor/refactoring/henshin/managers/HenshinRuntimeManager.class b/org.eclipse.emf.refactor.refactoring.henshin/bin/org/eclipse/emf/refactor/refactoring/henshin/managers/HenshinRuntimeManager.class Binary files differindex 8052725..52caec1 100644 --- a/org.eclipse.emf.refactor.refactoring.henshin/bin/org/eclipse/emf/refactor/refactoring/henshin/managers/HenshinRuntimeManager.class +++ b/org.eclipse.emf.refactor.refactoring.henshin/bin/org/eclipse/emf/refactor/refactoring/henshin/managers/HenshinRuntimeManager.class diff --git a/org.eclipse.emf.refactor.refactoring.ocl/.gitignore b/org.eclipse.emf.refactor.refactoring.ocl/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/org.eclipse.emf.refactor.refactoring.ocl/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/org.eclipse.emf.refactor.refactoring.ocl/bin/.gitignore b/org.eclipse.emf.refactor.refactoring.ocl/bin/.gitignore deleted file mode 100644 index 571ee51..0000000 --- a/org.eclipse.emf.refactor.refactoring.ocl/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/org diff --git a/org.eclipse.emf.refactor.refactoring.papyrus/.gitignore b/org.eclipse.emf.refactor.refactoring.papyrus/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/org.eclipse.emf.refactor.refactoring.papyrus/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/org.eclipse.emf.refactor.refactoring.papyrus/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.refactoring.papyrus/META-INF/MANIFEST.MF index ae6cf8b..1b1f561 100644 --- a/org.eclipse.emf.refactor.refactoring.papyrus/META-INF/MANIFEST.MF +++ b/org.eclipse.emf.refactor.refactoring.papyrus/META-INF/MANIFEST.MF @@ -10,10 +10,10 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf.refactor.refactoring;bundle-version="0.7.0", org.eclipse.emf.refactor.refactoring.generator;bundle-version="0.7.0", org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0", - org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.1", org.eclipse.emf.refactor.refactoring.configuration;bundle-version="0.7.0", org.eclipse.ltk.core.refactoring;bundle-version="3.6.0", - org.eclipse.ltk.ui.refactoring;bundle-version="3.7.0" + org.eclipse.ltk.ui.refactoring;bundle-version="3.7.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.0.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.eclipse.ui diff --git a/org.eclipse.emf.refactor.refactoring.papyrus/bin/org/eclipse/emf/refactor/refactoring/papyrus/managers/PapyrusSelectionManager.class b/org.eclipse.emf.refactor.refactoring.papyrus/bin/org/eclipse/emf/refactor/refactoring/papyrus/managers/PapyrusSelectionManager.class Binary files differindex 7121c12..9da76be 100644 --- a/org.eclipse.emf.refactor.refactoring.papyrus/bin/org/eclipse/emf/refactor/refactoring/papyrus/managers/PapyrusSelectionManager.class +++ b/org.eclipse.emf.refactor.refactoring.papyrus/bin/org/eclipse/emf/refactor/refactoring/papyrus/managers/PapyrusSelectionManager.class diff --git a/org.eclipse.emf.refactor.refactoring.papyrus/src/org/eclipse/emf/refactor/refactoring/papyrus/managers/PapyrusSelectionManager.java b/org.eclipse.emf.refactor.refactoring.papyrus/src/org/eclipse/emf/refactor/refactoring/papyrus/managers/PapyrusSelectionManager.java index cd97759..814d385 100644 --- a/org.eclipse.emf.refactor.refactoring.papyrus/src/org/eclipse/emf/refactor/refactoring/papyrus/managers/PapyrusSelectionManager.java +++ b/org.eclipse.emf.refactor.refactoring.papyrus/src/org/eclipse/emf/refactor/refactoring/papyrus/managers/PapyrusSelectionManager.java @@ -4,16 +4,16 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem; import org.eclipse.emf.refactor.refactoring.managers.SelectionManager; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.papyrus.infra.emf.utils.EMFHelper; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; -@SuppressWarnings("restriction") +//@SuppressWarnings("restriction") public class PapyrusSelectionManager extends SelectionManager { public static List<EObject> getENotationSelection() { @@ -52,21 +52,24 @@ public class PapyrusSelectionManager extends SelectionManager { return null; List<EObject> r = SelectionManager.getESelection(selection); for (Object o : getSelection(selection)) { - if (o instanceof ModelElementItem) { - System.out.println("instanceof ModelElementItem"); - ModelElementItem mei = (ModelElementItem) o; - System.out.println("element: " + mei.getEObject()); - r.add(mei.getEObject()); - } else { +// if (o instanceof ModelElementItem) { +// System.out.println("instanceof ModelElementItem"); +// ModelElementItem mei = (ModelElementItem) o; +// System.out.println("element: " + mei.getEObject()); +// r.add(mei.getEObject()); +// } else { if (o instanceof IGraphicalEditPart) { System.out.println("instanceof IGraphicalEditPart"); IGraphicalEditPart gep = (IGraphicalEditPart) o; System.out.println("element: " + gep.resolveSemanticElement()); r.add(gep.resolveSemanticElement()); } else { - return null; + EObject eObject = EMFHelper.getEObject(o); + if (eObject != null) { + r.add(eObject); + } } - } +// } } return r; } diff --git a/org.eclipse.emf.refactor.refactoring.runtime/.gitignore b/org.eclipse.emf.refactor.refactoring.runtime/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/org.eclipse.emf.refactor.refactoring.runtime/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/ui/RefactoringPreviewViewer.class b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/ui/RefactoringPreviewViewer.class Binary files differindex 2fe030a..d5b9b2d 100644 --- a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/ui/RefactoringPreviewViewer.class +++ b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/ui/RefactoringPreviewViewer.class diff --git a/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/ui/RefactoringPreviewViewer.java b/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/ui/RefactoringPreviewViewer.java index a5e8b90..0b6e49a 100644 --- a/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/ui/RefactoringPreviewViewer.java +++ b/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/ui/RefactoringPreviewViewer.java @@ -10,6 +10,7 @@ import org.eclipse.emf.compare.Comparison; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.domain.ICompareEditingDomain;
import org.eclipse.emf.compare.domain.impl.EMFCompareEditingDomain;
+import org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration;
import org.eclipse.emf.compare.ide.ui.internal.editor.ComparisonEditorInput;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -37,6 +38,7 @@ public class RefactoringPreviewViewer implements IChangePreviewViewer { // return parent;
}
+ @SuppressWarnings("deprecation")
@Override
public void setInput(ChangePreviewViewerInput input) {
System.out.println("===>> change: " + input.getChange());
@@ -54,7 +56,7 @@ public class RefactoringPreviewViewer implements IChangePreviewViewer { ICompareEditingDomain editingDomain = EMFCompareEditingDomain.create(model2, model1, null);
AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
CompareEditorInput compareEditorInput =
- new ComparisonEditorInput(new CompareConfiguration(),
+ new ComparisonEditorInput((EMFCompareConfiguration) new CompareConfiguration(),
comparison, editingDomain, adapterFactory);
try {
compareEditorInput.run(new NullProgressMonitor());
|