Author: fmancinelli
Date: 2008-02-13 22:15:58 +0100 (Wed, 13 Feb 2008)
New Revision: 7709
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/views/XWikiExplorerView.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/views/XWikiPagePreviewView.java
Log:
XECLIPSE-23
Handle double clicks on explorer nodes.
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/views/XWikiExplorerView.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/views/XWikiExplorerView.java
2008-02-13 21:15:38 UTC (rev 7708)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/views/XWikiExplorerView.java
2008-02-13 21:15:58 UTC (rev 7709)
@@ -25,6 +25,9 @@
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.NotEnabledException;
+import org.eclipse.core.commands.NotHandledException;
+import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.core.expressions.EvaluationResult;
import org.eclipse.core.expressions.Expression;
import org.eclipse.core.expressions.ExpressionInfo;
@@ -183,12 +186,17 @@
{
public void doubleClick(DoubleClickEvent event)
- {
+ {
IWorkbenchPage page =
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
Object selectedObject =
XWikiEclipseUtil.getSingleSelectedObjectInStructuredSelection(treeViewer
.getSelection());
+
+ if(selectedObject != null) {
+ treeViewer.expandToLevel(selectedObject, 1);
+ }
+
if (selectedObject instanceof IXWikiPage) {
IXWikiPage xwikiPage = (IXWikiPage) selectedObject;
XWikiPageEditorInput editorInput = new
XWikiPageEditorInput(xwikiPage);
@@ -204,6 +212,26 @@
e.printStackTrace();
}
}
+
+ if(selectedObject instanceof IXWikiConnection) {
+ IXWikiConnection xwikiConnection = (IXWikiConnection)
selectedObject;
+
+ if(xwikiConnection.isConnected()) {
+ return;
+ }
+
+ IHandlerService handlerService = (IHandlerService)
getSite()
+ .getService(IHandlerService.class);
+
+ try
+ {
+
handlerService.executeCommand(XWikiEclipseConstants.CONNECT_COMMAND, null);
+ } catch (Exception e)
+ {
+ // TODO Auto-generated catch
block
+ e.printStackTrace();
+ }
+ }
}
});
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/views/XWikiPagePreviewView.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/views/XWikiPagePreviewView.java
2008-02-13 21:15:38 UTC (rev 7708)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/views/XWikiPagePreviewView.java
2008-02-13 21:15:58 UTC (rev 7709)
@@ -20,29 +20,21 @@
*/
package org.xwiki.eclipse.views;
-import java.net.MalformedURLException;
import java.net.URL;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.ISelectionListener;
import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWebBrowser;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
@@ -54,7 +46,6 @@
import org.xwiki.eclipse.model.IXWikiPage;
import org.xwiki.eclipse.utils.XWikiEclipseUtil;
import org.xwiki.eclipse.viewers.XWikiPagePreviewViewer;
-import org.xwiki.plugins.eclipse.views.navigator.XWikiNavigator;
public class XWikiPagePreviewView extends ViewPart implements
ISelectionListener, IXWikiEclipseEventListener
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
