Author: fmancinelli
Date: 2007-10-29 23:28:56 +0100 (Mon, 29 Oct 2007)
New Revision: 5563
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/XWikiEclipseConstants.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/model/IXWikiConnection.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/AbstractXWikiConnection.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiCachedConnection.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiPlainConnection.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/wizards/NewConnectionWizard.java
Log:
XECLIPSE-30 Some model refactorings
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/XWikiEclipseConstants.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/XWikiEclipseConstants.java
2007-10-29 21:21:43 UTC (rev 5562)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/XWikiEclipseConstants.java
2007-10-29 22:28:56 UTC (rev 5563)
@@ -7,5 +7,6 @@
public static final String DISCONNECT_COMMAND =
"org.xwiki.xeclipse.command.Disconnect";
public static final String NEW_CONNECTION_COMMAND =
"org.xwiki.xeclipse.command.NewConnection";
- public static final String CONNECTION_SETTINGS_BANNER =
"icons/connection-settings-banner.gif";
+ public static final String CONNECTION_SETTINGS_BANNER =
"icons/connection-settings-banner.gif";
+ public static final String XWIKI_ICON = "icons/xwiki.png";
}
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 21:21:43 UTC (rev 5562)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/XWikiConnectionAdapter.java
2007-10-29 22:28:56 UTC (rev 5563)
@@ -27,6 +27,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.progress.IDeferredWorkbenchAdapter;
import org.eclipse.ui.progress.IElementCollector;
+import org.xwiki.plugins.eclipse.XWikiEclipsePlugin;
import org.xwiki.xeclipse.XWikiEclipseConstants;
import org.xwiki.xeclipse.model.IXWikiConnection;
import org.xwiki.xeclipse.model.IXWikiSpace;
@@ -67,7 +68,7 @@
*/
public ImageDescriptor getImageDescriptor(Object object)
{
- return null;
+ return
XWikiEclipsePlugin.getImageDescriptor(XWikiEclipseConstants.XWIKI_ICON);
}
/**
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/IXWikiConnection.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/IXWikiConnection.java
2007-10-29 21:21:43 UTC (rev 5562)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/IXWikiConnection.java
2007-10-29 22:28:56 UTC (rev 5563)
@@ -29,6 +29,11 @@
public interface IXWikiConnection
{
/**
+ * @return An unique identifier for the connection.
+ */
+ public String getId();
+
+ /**
* Connects to the remote XWiki server.
*
* @param password The password to be used in order to access the remote
account.
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/AbstractXWikiConnection.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/AbstractXWikiConnection.java
2007-10-29 21:21:43 UTC (rev 5562)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/AbstractXWikiConnection.java
2007-10-29 22:28:56 UTC (rev 5563)
@@ -1,16 +1,19 @@
package org.xwiki.xeclipse.model.impl;
+import java.io.Serializable;
import java.util.UUID;
import org.codehaus.swizzle.confluence.Page;
import org.codehaus.swizzle.confluence.Space;
+import org.eclipse.core.runtime.ListenerList;
import org.xwiki.xeclipse.model.IXWikiConnection;
+import org.xwiki.xeclipse.model.IXWikiConnectionListener;
import org.xwiki.xeclipse.model.XWikiConnectionException;
/**
* This is the base class for different type of XWiki connections
*/
-public abstract class AbstractXWikiConnection implements IXWikiConnection
+public abstract class AbstractXWikiConnection implements IXWikiConnection,
Serializable
{
private String id;
@@ -19,6 +22,8 @@
private String userName;
protected transient boolean isDisposed;
+
+ private transient ListenerList connectionListenerList;
/**
* Constructor.
@@ -41,6 +46,7 @@
private void init()
{
isDisposed = false;
+ connectionListenerList = new ListenerList();
}
/**
@@ -77,4 +83,35 @@
abstract Page getRawPage(String pageId) throws XWikiConnectionException;
abstract Space getRawSpace(String key);
+
+ // /////////////////////////// Event listeners management
/////////////////////////////
+
+ public void addConnectionEstablishedListener(IXWikiConnectionListener
listener)
+ {
+ connectionListenerList.add(listener);
+ }
+
+ public void removeConnectionEstablishedListener(IXWikiConnectionListener
listener)
+ {
+ connectionListenerList.remove(listener);
+ }
+
+ protected void fireConnectionEstablished()
+ {
+ final Object[] listeners = connectionListenerList.getListeners();
+ for (int i = 0; i < listeners.length; i++) {
+ final IXWikiConnectionListener listener =
(IXWikiConnectionListener) listeners[i];
+ listener.connectionEstablished(this);
+ }
+ }
+
+ protected void fireConnectionClosed()
+ {
+ final Object[] listeners = connectionListenerList.getListeners();
+ for (int i = 0; i < listeners.length; i++) {
+ final IXWikiConnectionListener listener =
(IXWikiConnectionListener) listeners[i];
+ listener.connectionClosed(this);
+ }
+ }
+
}
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiCachedConnection.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiCachedConnection.java
2007-10-29 21:21:43 UTC (rev 5562)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiCachedConnection.java
2007-10-29 22:28:56 UTC (rev 5563)
@@ -1,6 +1,7 @@
package org.xwiki.xeclipse.model.impl;
import java.io.File;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -18,16 +19,16 @@
import org.xwiki.xeclipse.model.IXWikiSpace;
import org.xwiki.xeclipse.model.XWikiConnectionException;
-public class XWikiCachedConnection extends AbstractXWikiConnection
-{
+public class XWikiCachedConnection extends AbstractXWikiConnection implements
Serializable
+{
+ private static final long serialVersionUID = -3186885585670670854L;
+
private File cacheDir;
private transient IXWikiDAO remoteDAO;
private transient IXWikiCacheDAO cacheDAO;
- transient private ListenerList connectionListenerList;
-
/**
* Constructor.
*
@@ -40,7 +41,7 @@
{
super(serverUrl, username);
this.cacheDir = cacheDir;
-
+
init();
}
@@ -52,8 +53,7 @@
private void init() throws XWikiConnectionException
{
try {
- cacheDAO = new DiskCacheDAO(new File(cacheDir, getId()));
- connectionListenerList = new ListenerList();
+ cacheDAO = new DiskCacheDAO(new File(cacheDir, getId()));
} catch (Exception e) {
throw new XWikiConnectionException(e);
}
@@ -422,37 +422,7 @@
return cacheDAO.isInConflict(pageId);
}
-
- // /////////////////////////// Event listeners management
/////////////////////////////
- public void addConnectionEstablishedListener(IXWikiConnectionListener
listener)
- {
- connectionListenerList.add(listener);
- }
-
- public void removeConnectionEstablishedListener(IXWikiConnectionListener
listener)
- {
- connectionListenerList.remove(listener);
- }
-
- protected void fireConnectionEstablished()
- {
- final Object[] listeners = connectionListenerList.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- final IXWikiConnectionListener listener =
(IXWikiConnectionListener) listeners[i];
- listener.connectionEstablished(this);
- }
- }
-
- protected void fireConnectionClosed()
- {
- final Object[] listeners = connectionListenerList.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- final IXWikiConnectionListener listener =
(IXWikiConnectionListener) listeners[i];
- listener.connectionClosed(this);
- }
- }
-
/**
* USED ONLY FOR UNIT TESTING
*
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiPlainConnection.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiPlainConnection.java
2007-10-29 21:21:43 UTC (rev 5562)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiPlainConnection.java
2007-10-29 22:28:56 UTC (rev 5563)
@@ -16,9 +16,11 @@
public class XWikiPlainConnection extends AbstractXWikiConnection
{
+ private static final long serialVersionUID = -8019449922717442495L;
+
private transient IXWikiDAO remoteDAO;
- transient private ListenerList connectionListenerList;
+ private transient ListenerList connectionListenerList;
/**
* Constructor.
@@ -251,37 +253,7 @@
return false;
}
-
- // /////////////////////////// Event listeners management
/////////////////////////////
-
- public void addConnectionEstablishedListener(IXWikiConnectionListener
listener)
- {
- connectionListenerList.add(listener);
- }
-
- public void removeConnectionEstablishedListener(IXWikiConnectionListener
listener)
- {
- connectionListenerList.remove(listener);
- }
-
- protected void fireConnectionEstablished()
- {
- final Object[] listeners = connectionListenerList.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- final IXWikiConnectionListener listener =
(IXWikiConnectionListener) listeners[i];
- listener.connectionEstablished(this);
- }
- }
-
- protected void fireConnectionClosed()
- {
- final Object[] listeners = connectionListenerList.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- final IXWikiConnectionListener listener =
(IXWikiConnectionListener) listeners[i];
- listener.connectionClosed(this);
- }
- }
-
+
/**
* USED ONLY FOR UNIT TESTING
*
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 21:21:43 UTC (rev 5562)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/wizards/NewConnectionWizard.java
2007-10-29 22:28:56 UTC (rev 5563)
@@ -78,7 +78,7 @@
return false;
}
- try {
+ try {
IXWikiConnection connection =
XWikiConnectionFactory.createCachedConnection(newConnectionWizardState.getServerUrl(),
newConnectionWizardState.getUserName(), new
File(XWikiEclipsePlugin.getDefault().getStateLocation().toFile(), "cache"));
XWikiConnectionManager.getDefault().addConnection(connection);
} catch (Exception e) {
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
