Author: fmancinelli
Date: 2007-11-19 10:56:06 +0100 (Mon, 19 Nov 2007)
New Revision: 6003
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/plugin.xml
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/XWikiEclipseConstants.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/handlers/ConnectHandler.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/handlers/DisconnectHandler.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/views/XWikiExplorerView.java
Log:
XECLIPSE-63
* Added refresh functionality
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/plugin.xml
===================================================================
--- xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/plugin.xml
2007-11-18 22:15:48 UTC (rev 6002)
+++ xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/plugin.xml
2007-11-19 09:56:06 UTC (rev 6003)
@@ -127,6 +127,10 @@
id="org.xwiki.eclipse.command.GrabSpace"
name="Grab space...">
</command>
+ <command
+ id="org.xwiki.eclipse.command.Refresh"
+ name="Refresh">
+ </command>
</extension>
<extension
name="NEW ADAPTERS"
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/XWikiEclipseConstants.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/XWikiEclipseConstants.java
2007-11-18 22:15:48 UTC (rev 6002)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/XWikiEclipseConstants.java
2007-11-19 09:56:06 UTC (rev 6003)
@@ -46,6 +46,8 @@
public static final String REMOVE_PAGE_COMMAND =
"org.xwiki.eclipse.command.RemovePage";
public static final String GRAB_SPACE_COMMAND =
"org.xwiki.eclipse.command.GrabSpace";
+
+ public static final String REFRESH_COMMAND =
"org.xwiki.eclipse.command.Refresh";
public static final String CONNECTION_SETTINGS_BANNER =
"icons/connection-settings-banner.png";
@@ -67,4 +69,5 @@
public static final String WORKING_SET_ICON = "icons/working-set.png";
public static final String SHOW_EDITOR_PREVIEW_ICON =
"icons/show-editor-preview.gif";
+
}
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/handlers/ConnectHandler.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/handlers/ConnectHandler.java
2007-11-18 22:15:48 UTC (rev 6002)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/handlers/ConnectHandler.java
2007-11-19 09:56:06 UTC (rev 6003)
@@ -83,9 +83,6 @@
}, HandlerUtil.getActiveShell(event));
- //
XWikiEclipseUtil.closeReopenEditorsForConnection(HandlerUtil.getActiveWorkbenchWindow(event).getActivePage(),
- // xwikiConnection);
-
XWikiEclipseUtil.updateEditors(HandlerUtil.getActiveWorkbenchWindow(event)
.getActivePage(), xwikiConnection);
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/handlers/DisconnectHandler.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/handlers/DisconnectHandler.java
2007-11-18 22:15:48 UTC (rev 6002)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/handlers/DisconnectHandler.java
2007-11-19 09:56:06 UTC (rev 6003)
@@ -49,9 +49,6 @@
e.printStackTrace();
}
- //
XWikiEclipseUtil.closeReopenEditorsForConnection(HandlerUtil.getActiveWorkbenchWindow(event).getActivePage(),
- // xwikiConnection);
-
XWikiEclipseUtil.updateEditors(HandlerUtil.getActiveWorkbenchWindow(event)
.getActivePage(), xwikiConnection);
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
2007-11-18 22:15:48 UTC (rev 6002)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/views/XWikiExplorerView.java
2007-11-19 09:56:06 UTC (rev 6003)
@@ -22,6 +22,9 @@
import java.util.Collection;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.expressions.EvaluationResult;
import org.eclipse.core.expressions.Expression;
import org.eclipse.core.expressions.ExpressionInfo;
@@ -36,6 +39,7 @@
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -54,6 +58,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.widgets.Form;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.handlers.HandlerUtil;
import org.eclipse.ui.handlers.IHandlerActivation;
import org.eclipse.ui.handlers.IHandlerService;
import org.eclipse.ui.menus.CommandContributionItem;
@@ -96,7 +101,27 @@
private WorkingSet currentWorkingSet;
private Form form;
+
+ private class RefreshHandler extends AbstractHandler {
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException
+ {
+ ISelection selection = HandlerUtil.getCurrentSelection(event);
+ Object selectedObject =
+
XWikiEclipseUtil.getSingleSelectedObjectInStructuredSelection(selection);
+
+ if (selectedObject instanceof IXWikiConnection) {
+ treeViewer.refresh(selectedObject);
+ }
+ else if (selectedObject instanceof IXWikiSpace) {
+ treeViewer.refresh(selectedObject);
+ }
+
+ return null;
+ }
+ }
+
private class SelectWorkingSetAction extends Action
{
private WorkingSet workingSet;
@@ -319,6 +344,20 @@
SWT.NONE));
menuManager.add(new Separator());
+
+ menuManager.add(new CommandContributionItem(getSite(),
+ null,
+ XWikiEclipseConstants.REFRESH_COMMAND,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ SWT.NONE));
+
+ menuManager.add(new Separator());
menuManager.add(new CommandContributionItem(getSite(),
null,
@@ -539,7 +578,38 @@
return EvaluationResult.FALSE;
}
});
+
+ handlerService.activateHandler(XWikiEclipseConstants.REFRESH_COMMAND,
+ new RefreshHandler(), new Expression()
+ {
+ @Override
+ public void collectExpressionInfo(ExpressionInfo info)
+ {
+
info.addVariableNameAccess(ISources.ACTIVE_CURRENT_SELECTION_NAME);
+ }
+ @Override
+ public EvaluationResult evaluate(IEvaluationContext context)
throws CoreException
+ {
+ Object selection =
+
context.getVariable(ISources.ACTIVE_CURRENT_SELECTION_NAME);
+
+ Object selectedObject =
+
XWikiEclipseUtil.getSingleSelectedObjectInStructuredSelection(selection);
+
+ if(selectedObject instanceof IXWikiConnection) {
+ return EvaluationResult.TRUE;
+ }
+
+ if (selectedObject instanceof IXWikiSpace) {
+ return EvaluationResult.TRUE;
+ }
+
+ return EvaluationResult.FALSE;
+ }
+ });
+
+
}
public void handleEvent(final Object sender, final XWikiEclipseEvent
event, final Object data)
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
