Author: fmancinelli
Date: 2007-10-29 18:24:03 +0100 (Mon, 29 Oct 2007)
New Revision: 5556
Added:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/icons/xwiki-banner.png
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/xeclipse/adapters/AdapterFactory.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/XWikiConnectionAdapter.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/views/XWikiExplorerView.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/wizards/NewConnectionWizard.java
Log:
XECLIPSE-30 Relinked all components to make xwiki explorer fully functional
Added:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/icons/xwiki-banner.png
===================================================================
(Binary files differ)
Property changes on:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/icons/xwiki-banner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/plugin.xml
===================================================================
--- xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/plugin.xml
2007-10-29 17:17:45 UTC (rev 5555)
+++ xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/plugin.xml
2007-10-29 17:24:03 UTC (rev 5556)
@@ -95,6 +95,9 @@
<adapter
type="org.eclipse.ui.model.IWorkbenchAdapter">
</adapter>
+ <adapter
+ type="org.eclipse.ui.progress.IDeferredWorkbenchAdapter">
+ </adapter>
</factory>
<factory
adaptableType="org.xwiki.xeclipse.model.IXWikiSpace"
@@ -102,6 +105,9 @@
<adapter
type="org.eclipse.ui.model.IWorkbenchAdapter">
</adapter>
+ <adapter
+ type="org.eclipse.ui.progress.IDeferredWorkbenchAdapter">
+ </adapter>
</factory>
<factory
adaptableType="org.xwiki.xeclipse.model.IXWikiPage"
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/AdapterFactory.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/AdapterFactory.java
2007-10-29 17:17:45 UTC (rev 5555)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/AdapterFactory.java
2007-10-29 17:24:03 UTC (rev 5556)
@@ -24,6 +24,8 @@
import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.ui.progress.IDeferredWorkbenchAdapter;
import org.xwiki.xeclipse.model.IXWikiConnection;
+import org.xwiki.xeclipse.model.IXWikiPage;
+import org.xwiki.xeclipse.model.IXWikiSpace;
/**
* Adapter factory for adapting XWiki Eclipse model object to different
workbench interfaces.
@@ -38,13 +40,13 @@
/**
* The adapter for XWiki spaces.
*/
- private IDeferredWorkbenchAdapter xwikiSpaceDescriptorAdapter =
+ private IDeferredWorkbenchAdapter xwikiSpaceAdapter =
new XWikiSpaceDescriptorAdapter();
/**
* The adapter for XWiki pages.
*/
- private IWorkbenchAdapter xwikiPageDescriptorAdapter = new
XWikiPageAdapter();
+ private IWorkbenchAdapter xwikiPageAdapter = new XWikiPageAdapter();
/**
* [EMAIL PROTECTED]
@@ -62,6 +64,19 @@
return xwikiConnectionAdapter;
}
+ if (adapterType == IDeferredWorkbenchAdapter.class
+ && adaptableObject instanceof IXWikiSpace) {
+ return xwikiSpaceAdapter;
+ }
+
+ if (adapterType == IWorkbenchAdapter.class && adaptableObject
instanceof IXWikiSpace) {
+ return xwikiSpaceAdapter;
+ }
+
+ if (adapterType == IWorkbenchAdapter.class && adaptableObject
instanceof IXWikiPage) {
+ return xwikiPageAdapter;
+ }
+
return null;
}
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/XWikiConnectionAdapter.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/XWikiConnectionAdapter.java
2007-10-29 17:17:45 UTC (rev 5555)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/XWikiConnectionAdapter.java
2007-10-29 17:24:03 UTC (rev 5556)
@@ -22,7 +22,6 @@
import java.util.Collection;
-import org.codehaus.swizzle.confluence.SwizzleConfluenceException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.jface.resource.ImageDescriptor;
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/views/XWikiExplorerView.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/views/XWikiExplorerView.java
2007-10-29 17:17:45 UTC (rev 5555)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/views/XWikiExplorerView.java
2007-10-29 17:24:03 UTC (rev 5556)
@@ -217,11 +217,13 @@
public void connectionAdded(IXWikiConnection xwikiConnection)
{
xwikiConnection.addConnectionEstablishedListener(this);
+ treeViewer.refresh();
}
public void connectionRemoved(IXWikiConnection xwikiConnection)
{
xwikiConnection.removeConnectionEstablishedListener(this);
+ treeViewer.refresh();
}
public void connectionEstablished(IXWikiConnection connection)
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/wizards/NewConnectionWizard.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/wizards/NewConnectionWizard.java
2007-10-29 17:17:45 UTC (rev 5555)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/wizards/NewConnectionWizard.java
2007-10-29 17:24:03 UTC (rev 5556)
@@ -20,6 +20,7 @@
*/
package org.xwiki.xeclipse.wizards;
+import java.io.File;
import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -29,7 +30,10 @@
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
+import org.xwiki.plugins.eclipse.XWikiEclipsePlugin;
+import org.xwiki.xeclipse.XWikiConnectionManager;
import org.xwiki.xeclipse.model.IXWikiConnection;
+import org.xwiki.xeclipse.model.XWikiConnectionException;
import org.xwiki.xeclipse.model.XWikiConnectionFactory;
public class NewConnectionWizard extends Wizard implements INewWizard
@@ -73,6 +77,14 @@
return false;
}
+
+ try {
+ IXWikiConnection connection =
XWikiConnectionFactory.createCachedConnection(newConnectionWizardState.getServerUrl(),
newConnectionWizardState.getUserName(), new
File(XWikiEclipsePlugin.getDefault().getStateLocation().toFile(), "cache"));
+ XWikiConnectionManager.getDefault().addConnection(connection);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
return true;
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
