Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortarendt2014-04-15 14:56:22 +0000
committertarendt2014-04-15 14:56:22 +0000
commit9f8b0972119dd5ddc8c7913329a225656fdc64a0 (patch)
tree2f733f3ded575624d9668930261a401a68fab8ab /org.eclipse.emf.refactor.refactoring.runtime
parentbb5ec4e020a5ce0c1efaa44fd1f45140240772f1 (diff)
downloadorg.eclipse.emf.refactor.refactoring-9f8b0972119dd5ddc8c7913329a225656fdc64a0.tar.gz
org.eclipse.emf.refactor.refactoring-9f8b0972119dd5ddc8c7913329a225656fdc64a0.tar.xz
org.eclipse.emf.refactor.refactoring-9f8b0972119dd5ddc8c7913329a225656fdc64a0.zip
copying for preview improved
Diffstat (limited to 'org.eclipse.emf.refactor.refactoring.runtime')
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/config/RuntimeConfig.classbin3076 -> 3079 bytes
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/change/RefactoringChange.classbin3399 -> 3995 bytes
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/PreviewCommand.classbin1736 -> 1511 bytes
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/RefactoringCommand.classbin2356 -> 2362 bytes
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/test/EmfTestRefactoringCommand.classbin2092 -> 2091 bytes
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/test/JUnitTestCaseAdapter.classbin10623 -> 10641 bytes
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu$1.classbin3005 -> 3005 bytes
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu.classbin6782 -> 6856 bytes
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/InputPageButtonLoader.classbin2734 -> 2733 bytes
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/change/RefactoringChange.java28
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/PreviewCommand.java11
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/ui/RefactoringPreviewViewer.java6
-rw-r--r--org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu.java3
13 files changed, 41 insertions, 7 deletions
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/config/RuntimeConfig.class b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/config/RuntimeConfig.class
index b86f570..7fb5e4e 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/config/RuntimeConfig.class
+++ b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/config/RuntimeConfig.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/change/RefactoringChange.class b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/change/RefactoringChange.class
index 78bdc57..44fde36 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/change/RefactoringChange.class
+++ b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/change/RefactoringChange.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/PreviewCommand.class b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/PreviewCommand.class
index d250614..c52b73e 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/PreviewCommand.class
+++ b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/PreviewCommand.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/RefactoringCommand.class b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/RefactoringCommand.class
index ec85c23..575cff6 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/RefactoringCommand.class
+++ b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/RefactoringCommand.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/test/EmfTestRefactoringCommand.class b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/test/EmfTestRefactoringCommand.class
index 2e75191..7d25cf1 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/test/EmfTestRefactoringCommand.class
+++ b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/test/EmfTestRefactoringCommand.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/test/JUnitTestCaseAdapter.class b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/test/JUnitTestCaseAdapter.class
index 78d692b..ceafda0 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/test/JUnitTestCaseAdapter.class
+++ b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/test/JUnitTestCaseAdapter.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu$1.class b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu$1.class
index 5e84229..fadc5c3 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu$1.class
+++ b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu$1.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu.class b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu.class
index 9dfa824..25bd651 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu.class
+++ b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/InputPageButtonLoader.class b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/InputPageButtonLoader.class
index 3a78f49..9c3a9a8 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/InputPageButtonLoader.class
+++ b/org.eclipse.emf.refactor.refactoring.runtime/bin/org/eclipse/emf/refactor/refactoring/runtime/ui/InputPageButtonLoader.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/change/RefactoringChange.java b/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/change/RefactoringChange.java
index 1035215..0bd18af 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/change/RefactoringChange.java
+++ b/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/change/RefactoringChange.java
@@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.change.ChangeDescription;
+import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.refactor.refactoring.runtime.ltk.command.RefactoringCommand;
import org.eclipse.ltk.core.refactoring.Change;
@@ -39,6 +40,11 @@ public class RefactoringChange extends Change {
private final EObject root;
/**
+ * Copy of the root element of the model (temporary model).
+ */
+ private EObject rootCopy;
+
+ /**
* EditingDomain object of the EMF model.
*/
private final EditingDomain editingDomain;
@@ -70,6 +76,7 @@ public class RefactoringChange extends Change {
super();
this.name = name;
this.root = root;
+ this.rootCopy = this.generateRootCopy();
this.editingDomain=editingDomain;
if(null != changeDescription){
refactoringCommand = new RefactoringCommand(name,changeDescription);
@@ -153,6 +160,27 @@ public class RefactoringChange extends Change {
// }
// throw new RuntimeException("Could not generate DiffModel");
// }
+
+ /**
+ * Generates a copy of the EMF model presented by the root
+ * element.
+ * @return Copy of the EMF model presented by the root
+ * element.
+ */
+ private EObject generateRootCopy() {
+ Copier copier = new Copier();
+ EObject rootCopy = copier.copy(this.root);
+ copier.copyReferences();
+ return rootCopy;
+ }
+
+ /**
+ * Gets a copy of the root element of the model (temporary model).
+ * @return Copy of the root element of the model (temporary model).
+ */
+ public EObject getRootCopy() {
+ return rootCopy;
+ }
public RefactoringCommand getRefactoringCommand() {
return refactoringCommand;
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/PreviewCommand.java b/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/PreviewCommand.java
index 38965f3..c792b55 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/PreviewCommand.java
+++ b/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ltk/command/PreviewCommand.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.refactor.refactoring.runtime.ltk.command;
import org.eclipse.emf.common.command.AbstractCommand;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
+import org.eclipse.emf.ecore.util.EcoreUtil;
/**
* Class used for providing a command that provides
@@ -66,10 +66,11 @@ public class PreviewCommand extends AbstractCommand {
* element.
*/
private EObject generateRootCopy() {
- Copier copier = new Copier();
- EObject rootCopy = copier.copy(this.root);
- copier.copyReferences();
- return rootCopy;
+// Copier copier = new Copier();
+ return EcoreUtil.copy(this.root);
+// EObject rootCopy = copier.copy(this.root);
+// copier.copyReferences();
+// return rootCopy;
}
/**
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 6f6d2d9..a5e8b90 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
@@ -34,6 +34,7 @@ public class RefactoringPreviewViewer implements IChangePreviewViewer {
@Override
public Control getControl() {
return previewControl;
+// return parent;
}
@Override
@@ -50,7 +51,7 @@ public class RefactoringPreviewViewer implements IChangePreviewViewer {
System.out.println("===>> model2: " + model2);
EMFCompare compare = EMFCompare.builder().build();
Comparison comparison = compare.compare(EMFCompare.createDefaultScope(model2, model1));
- ICompareEditingDomain editingDomain = EMFCompareEditingDomain.create(model1, model2, null);
+ ICompareEditingDomain editingDomain = EMFCompareEditingDomain.create(model2, model1, null);
AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
CompareEditorInput compareEditorInput =
new ComparisonEditorInput(new CompareConfiguration(),
@@ -65,5 +66,8 @@ public class RefactoringPreviewViewer implements IChangePreviewViewer {
}
}
+
+// @Override
+// public void setInput(ChangePreviewViewerInput input) { }
}
diff --git a/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu.java b/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu.java
index b22a146..b20d7b8 100644
--- a/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu.java
+++ b/org.eclipse.emf.refactor.refactoring.runtime/src/org/eclipse/emf/refactor/refactoring/runtime/ui/ApplicationMenu.java
@@ -187,8 +187,9 @@ public class ApplicationMenu extends ContributionItem {
ConfigurationManager.getSelectedRefactorings(project);
for(final Refactoring r : refactorings){
if(r.getGui().showInMenu(this.selection)){
- MenuItem menuItem = new MenuItem(menu, SWT.CHECK, index);
+ MenuItem menuItem = new MenuItem(menu, SWT.CHECK, menu.getItemCount());
menuItem.setText(r.getName());
+ menuItem.setEnabled(true);
menuItem.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
try {

Back to the top