diff options
4 files changed, 17 insertions, 3 deletions
diff --git a/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu$1$1.class b/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu$1$1.class Binary files differindex 7241b4d..6d16047 100644 --- a/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu$1$1.class +++ b/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu$1$1.class diff --git a/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu$1.class b/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu$1.class Binary files differindex 259edc6..5e5ccf9 100644 --- a/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu$1.class +++ b/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu$1.class diff --git a/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu.class b/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu.class Binary files differindex 0816e91..793f58b 100644 --- a/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu.class +++ b/org.eclipse.emf.refactor.refactoring.xtext/bin/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu.class diff --git a/org.eclipse.emf.refactor.refactoring.xtext/src/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu.java b/org.eclipse.emf.refactor.refactoring.xtext/src/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu.java index 1669366..9470e26 100644 --- a/org.eclipse.emf.refactor.refactoring.xtext/src/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu.java +++ b/org.eclipse.emf.refactor.refactoring.xtext/src/org/eclipse/emf/refactor/refactoring/xtext/ui/XtextApplicationMenu.java @@ -23,7 +23,9 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.ui.editor.XtextEditor;
import org.eclipse.xtext.ui.editor.model.XtextDocument;
+import org.eclipse.xtext.ui.editor.utils.EditorUtils;
import org.eclipse.xtext.util.concurrent.IUnitOfWork;
public class XtextApplicationMenu extends ContributionItem {
@@ -54,9 +56,15 @@ public class XtextApplicationMenu extends ContributionItem { menuItem.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
try {
- IXtextDataManagement dm = (IXtextDataManagement) r.getController()
- .getDataManagementObject();
- XtextDocument doc = dm.getXtextDocument();
+ XtextDocument doc = null;
+ if (r.getController().getDataManagementObject()
+ instanceof IXtextDataManagement) {
+ IXtextDataManagement dm = (IXtextDataManagement) r.getController()
+ .getDataManagementObject();
+ doc = dm.getXtextDocument();
+ } else {
+ doc = getXtextDocument();
+ }
doc.modify(new IUnitOfWork.Void<XtextResource>() {
@Override
@@ -97,6 +105,12 @@ public class XtextApplicationMenu extends ContributionItem { .openError(null, "Error", e2.getMessage());
}
}
+
+ private XtextDocument getXtextDocument() {
+ XtextEditor editor = EditorUtils.getActiveXtextEditor();
+ System.out.println("XtextEditor: " + editor);
+ return (XtextDocument) editor.getDocument();
+ }
});
}
}
|