Author: slauriere
Date: 2007-11-07 19:14:12 +0100 (Wed, 07 Nov 2007)
New Revision: 5707
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/OpenPageHandler.java
Log:
XECLIPSE-58 - Take a reference to the activePage before the dialogue opens,
otherwise an issue is raised on certain platforms.
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/OpenPageHandler.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/OpenPageHandler.java
2007-11-07 18:11:39 UTC (rev 5706)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/OpenPageHandler.java
2007-11-07 18:14:12 UTC (rev 5707)
@@ -24,6 +24,7 @@
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.handlers.HandlerUtil;
import org.xwiki.xeclipse.dialogs.OpenPageDialog;
@@ -37,22 +38,24 @@
public Object execute(ExecutionEvent event) throws ExecutionException
{
OpenPageDialog dialog = new
OpenPageDialog(HandlerUtil.getActiveShell(event));
+ IWorkbenchPage activePage =
HandlerUtil.getActiveWorkbenchWindow(event).getActivePage();
+
int result = dialog.open();
if (result == OpenPageDialog.OK) {
- IWorkbenchPage page =
HandlerUtil.getActiveWorkbenchWindow(event).getActivePage();
Object selectedObject = dialog.getResult()[0];
if (selectedObject instanceof IXWikiPage) {
IXWikiPage xwikiPage = (IXWikiPage) selectedObject;
XWikiPageEditorInput editorInput = new
XWikiPageEditorInput(xwikiPage);
try {
- page.openEditor(editorInput, XWikiPageEditor.ID);
+ activePage.openEditor(editorInput, XWikiPageEditor.ID);
} catch (PartInitException e) {
e.printStackTrace();
}
}
+
}
return null;
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
