commit | 328b50da70cd67435ada60f479dba61803f55aaa | [log] [tgz] |
---|---|---|
author | tarendt <tarendt> | Tue Apr 15 14:07:52 2014 +0200 |
committer | tarendt <tarendt> | Tue Apr 15 14:07:52 2014 +0200 |
tree | ee18c4267b72321ed35d263d9bbd757f7081eee3 | |
parent | 796362027558686263b41076ed74c26d714bf90d [diff] |
bug missing xtextdocument fixed
diff --git a/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction$1.class b/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction$1.class index 9316391..7e751ad 100644 --- a/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction$1.class +++ b/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction$1.class Binary files differ
diff --git a/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction$2.class b/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction$2.class index 1394642..5445c1a 100644 --- a/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction$2.class +++ b/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction$2.class Binary files differ
diff --git a/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction.class b/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction.class index 7eb5a17..f67c1e4 100644 --- a/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction.class +++ b/org.eclipse.emf.refactor.smells.xtext/bin/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction.class Binary files differ
diff --git a/org.eclipse.emf.refactor.smells.xtext/src/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction.java b/org.eclipse.emf.refactor.smells.xtext/src/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction.java index 2f8654b..b1385e1 100644 --- a/org.eclipse.emf.refactor.smells.xtext/src/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction.java +++ b/org.eclipse.emf.refactor.smells.xtext/src/org/eclipse/emf/refactor/smells/xtext/handler/SuggestRefactoringAction.java
@@ -58,9 +58,14 @@ if(dialogResult == Dialog.OK) { selectedRefactoring = dialog.getSelectedRefactoring(); contextObject = dialog.getSelectedContextObject(); - IXtextDataManagement dm = - (IXtextDataManagement) selectedRefactoring.getController().getDataManagementObject(); - XtextDocument doc = dm.getXtextDocument(); + XtextDocument doc = null; + if (selectedRefactoring.getController().getDataManagementObject() + instanceof IXtextDataManagement) { + IXtextDataManagement dm = (IXtextDataManagement) selectedRefactoring.getController().getDataManagementObject(); + doc = dm.getXtextDocument(); + } else { + doc = getXtextDocument(); + } XtextEditor editor = EditorUtils.getActiveXtextEditor(); System.out.println("Active XtextEditor: " + editor); doc.modify(new IUnitOfWork.Void<XtextResource>() { @@ -95,6 +100,12 @@ // // } + private XtextDocument getXtextDocument() { + XtextEditor editor = EditorUtils.getActiveXtextEditor(); + System.out.println("XtextEditor: " + editor); + return (XtextDocument) editor.getDocument(); + } + @Override public void selectionChanged(IAction action, ISelection selection) { this.selection = selection;