Author: asiri
Date: 2007-09-09 09:06:21 +0200 (Sun, 09 Sep 2007)
New Revision: 4853
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/Activator.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiDocumentProvider.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiEditor.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiMarkupEditorPart.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/IXWikiConnection.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/IXWikiSpace.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/adapters/TreeAdapter.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiConnection.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiConnectionManager.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiPage.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiSpace.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiConnectionManagerWrapper.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiConnectionWrapper.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiPageWrapper.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiSpaceWrapper.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/CacheUtils.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/DummyProgressMonitor.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/XWikiConstants.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/XWikiProgressRunner.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/views/navigator/XWikiNavigatorContentProvider.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/XWikiWizardDialog.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/XWikiWizardPage.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/connect/pages/SettingsPage.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/connect/ui/SpacesUI.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newpage/pages/PageSettingsPage.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newpage/ui/PageSettingsPageUI.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newspace/pages/SpaceSettingsPage.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newspace/ui/SpaceSettingsPageUI.java
Log:
Improved caching routines, Added Space Caching, re-applied coding standards.
Still, long way to go.... :(
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/Activator.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/Activator.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/Activator.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -26,9 +26,8 @@
import org.osgi.framework.BundleContext;
/**
- * The activator class controls the plug-in life cycle,
- * this is a mandatory class and is used by the eclipse
- * plugin framework.
+ * The activator class controls the plug-in life cycle, this is a mandatory
class and is used by the
+ * eclipse plugin framework.
*/
public class Activator extends AbstractUIPlugin
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiDocumentProvider.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiDocumentProvider.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiDocumentProvider.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -31,9 +31,8 @@
import org.xwiki.plugins.eclipse.model.wrappers.XWikiPageWrapper;
/**
- * This class handles the mapping between model's document
- * [EMAIL PROTECTED] IXWikiPage} and the visual representation of that
- * document within the eclipse editor.
+ * This class handles the mapping between model's document [EMAIL PROTECTED]
IXWikiPage} and the visual
+ * representation of that document within the eclipse editor.
*/
public class XWikiDocumentProvider extends StorageDocumentProvider
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiEditor.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiEditor.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiEditor.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -31,10 +31,10 @@
import org.eclipse.ui.part.MultiPageEditorPart;
/**
- * This class represents the Page editor. It has two tabs (pages in eclipse
terminology),
- * one for editing the markup (Simple Text Editor) and another for displaying
the
- * browser output (which is an actual browser widget). For each page opened
for editing,
- * one instance of this class will be created with corresponding IXWikiPage as
the input.
+ * This class represents the Page editor. It has two tabs (pages in eclipse
terminology), one for
+ * editing the markup (Simple Text Editor) and another for displaying the
browser output (which is
+ * an actual browser widget). For each page opened for editing, one instance
of this class will be
+ * created with corresponding IXWikiPage as the input.
*/
public class XWikiEditor extends MultiPageEditorPart implements
IResourceChangeListener
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiMarkupEditorPart.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiMarkupEditorPart.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/XWikiMarkupEditorPart.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -25,9 +25,8 @@
import org.eclipse.ui.texteditor.AbstractTextEditor;
/**
- * This is the text editor widget used inside [EMAIL PROTECTED] XWikiEditor}.
- * This class extends [EMAIL PROTECTED] AbstractTextEditor} for the purpose
- * of customizing it into XWiki's needs.
+ * This is the text editor widget used inside [EMAIL PROTECTED] XWikiEditor}.
This class extends
+ * [EMAIL PROTECTED] AbstractTextEditor} for the purpose of customizing it
into XWiki's needs.
*/
public class XWikiMarkupEditorPart extends AbstractTextEditor
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/IXWikiConnection.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/IXWikiConnection.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/IXWikiConnection.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -28,8 +28,8 @@
import org.eclipse.core.runtime.IPath;
/**
- * A connection (session...) to a XWiki server.
- * Each connection is uniquely identified by a loginToken.
+ * A connection (session...) to a XWiki server. Each connection is uniquely
identified by a
+ * loginToken.
*/
public interface IXWikiConnection
{
@@ -77,10 +77,10 @@
public IXWikiSpace getSpace(String spaceKey);
/**
- * @return The local cache directory of this connection.
+ * @return Cache path of this connection.
*/
- public IPath getCacheDirectory();
-
+ public IPath getCachePath();
+
/**
* @return True if spaces have been retrieved, otherwise returns false.
*/
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/IXWikiSpace.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/IXWikiSpace.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/IXWikiSpace.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -24,6 +24,7 @@
import java.util.Collection;
import org.codehaus.swizzle.confluence.SwizzleConfluenceException;
+import org.eclipse.core.runtime.IPath;
/**
* Represents an XWiki Space.
@@ -76,6 +77,11 @@
public String getDescriptionAsHtml();
/**
+ * @return The cache path for this space.
+ */
+ public IPath getCachePath();
+
+ /**
* @return Whether this space should be displyed or not.
*/
public boolean isMasked();
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/adapters/TreeAdapter.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/adapters/TreeAdapter.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/adapters/TreeAdapter.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -24,8 +24,7 @@
import org.eclipse.swt.graphics.Image;
/**
- * Interface implemented by all nodes participating
- * in the tree viewer of XWikiNavigator.
+ * Interface implemented by all nodes participating in the tree viewer of
XWikiNavigator.
*/
public interface TreeAdapter
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiConnection.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiConnection.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiConnection.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -21,6 +21,10 @@
package org.xwiki.plugins.eclipse.model.impl;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -36,18 +40,19 @@
import org.xwiki.plugins.eclipse.model.IXWikiSpace;
import org.xwiki.plugins.eclipse.model.adapters.TreeAdapter;
import org.xwiki.plugins.eclipse.model.wrappers.XWikiConnectionWrapper;
+import org.xwiki.plugins.eclipse.util.CacheUtils;
import org.xwiki.plugins.eclipse.util.GuiUtils;
import org.xwiki.plugins.eclipse.util.XWikiConstants;
/**
* Default implementation of [EMAIL PROTECTED] IXWikiConnection}
*/
-public class XWikiConnection implements IXWikiConnection, TreeAdapter
+public class XWikiConnection implements IXWikiConnection, TreeAdapter,
Serializable
{
/**
* An XML-RPC proxy
*/
- private Confluence rpc;
+ private transient Confluence rpc;
/**
* Username supplied by the user for this connection.
@@ -62,7 +67,7 @@
/**
* Top-level spaces. Mapped by spaceKey
*/
- private HashMap<String, IXWikiSpace> spacesByKey;
+ private transient HashMap<String, IXWikiSpace> spacesByKey;
/**
* Whether spaces have been retrieved or not.
@@ -70,10 +75,10 @@
private boolean spacesReady = false;
/**
- * Local cache directory for this connection.
+ * Cache path of this connection.
*/
- private IPath localCacheDir;
-
+ private transient IPath cachePath;
+
/**
* Default constructor. A connection should only be acquired by going
through ConnectionManager
*/
@@ -216,11 +221,16 @@
{
if (!isSpacesReady()) {
List spaceSummaries = rpc.getSpaces();
- for (int i = 0; i < spaceSummaries.size(); i++){
- SpaceSummary summary = (SpaceSummary)spaceSummaries.get(i);
- IXWikiSpace xwikiSpace = new XWikiSpace(this, summary);
+ for (int i = 0; i < spaceSummaries.size(); i++) {
+ SpaceSummary summary = (SpaceSummary) spaceSummaries.get(i);
+ XWikiSpace xwikiSpace = new XWikiSpace(this, summary);
+ // Initialize and update cache.
+
xwikiSpace.setCachePath(getCachePath().addTrailingSeparator().append(
+ xwikiSpace.getKey()));
+ CacheUtils.saveSpace(xwikiSpace);
+ xwikiSpace.getCachePath().toFile().mkdir();
addSpace(xwikiSpace);
- }
+ }
setSpacesReady(true);
}
}
@@ -244,9 +254,9 @@
summary.setName(result.getName());
summary.setType(result.getType());
summary.setUrl(result.getUrl());
-
+
IXWikiSpace wikiSpace = new XWikiSpace(this, summary, result);
-
+
// We need this space to be displayed.
wikiSpace.setMasked(false);
// Finally, add the space to local model.
@@ -312,26 +322,27 @@
public String getUserName()
{
return userName;
- }
-
+ }
+
/**
* [EMAIL PROTECTED]
*
- * @see
org.xwiki.plugins.eclipse.model.IXWikiConnection#getCacheDirectory()
- */
- public IPath getCacheDirectory() {
- return localCacheDir;
- }
-
+ * @see org.xwiki.plugins.eclipse.model.IXWikiConnection#getCachePath()
+ */
+ public IPath getCachePath()
+ {
+ return cachePath;
+ }
+
/**
* Sets the local cache directory of this connection.
*/
- public void setCacheDirectory(IPath localCacheDir)
+ protected void setCachePath(IPath cachePath)
{
- this.localCacheDir = localCacheDir;
+ this.cachePath = cachePath;
}
- /**
+ /**
* [EMAIL PROTECTED]
*
* @see org.xwiki.plugins.eclipse.model.IXWikiConnection#isSpacesReady()
@@ -351,4 +362,20 @@
rpc.removeSpace(key);
spacesByKey.remove(key);
}
+
+ /**
+ * Custom serializer method.
+ */
+ private void writeObject(ObjectOutputStream out) throws IOException
+ {
+ out.defaultWriteObject();
+ }
+
+ /**
+ * Custom deserializer method.
+ */
+ private void readObject(ObjectInputStream in) throws IOException,
ClassNotFoundException
+ {
+ // We'll worry about this later.
+ }
}
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiConnectionManager.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiConnectionManager.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiConnectionManager.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -22,6 +22,7 @@
package org.xwiki.plugins.eclipse.model.impl;
import java.util.Collection;
+import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -29,6 +30,7 @@
import org.codehaus.swizzle.confluence.IdentityObjectConvertor;
import org.codehaus.swizzle.confluence.SwizzleConfluenceException;
import org.codehaus.swizzle.confluence.SwizzleXWiki;
+import org.eclipse.core.runtime.IPath;
import org.xwiki.plugins.eclipse.model.IXWikiConnection;
import org.xwiki.plugins.eclipse.model.IXWikiConnectionManager;
import org.xwiki.plugins.eclipse.util.CacheUtils;
@@ -93,8 +95,15 @@
conection.setServerUrl(serverUrl);
conection.setUserName(userName);
conection.setRpcProxy(rpc);
+ // Initialize and update cache.
+ Date timeStamp = new Date();
+ IPath masterCacheDir = CacheUtils.getMasterCacheDirectory();
+ IPath cachePath =
+
masterCacheDir.addTrailingSeparator().append(String.valueOf(timeStamp.getTime()));
+ conection.setCachePath(cachePath);
+ CacheUtils.saveConnection(conection);
+ conection.getCachePath().toFile().mkdir();
connections.add(conection);
- CacheUtils.saveConnection(conection);
return conection;
}
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiPage.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiPage.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiPage.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -59,8 +59,9 @@
* Summary of this page.
*/
private PageSummary summary;
- // TODO Again, like for spaces, why keep a summary when it's all included
in the page ?
-
+
+ // TODO Again, like for spaces, why keep a summary when it's all included
in the page ?
+
/**
* Data (opposite of summary ?) of this page.
*/
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiSpace.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiSpace.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/impl/XWikiSpace.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -21,6 +21,10 @@
package org.xwiki.plugins.eclipse.model.impl;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -31,45 +35,54 @@
import org.codehaus.swizzle.confluence.Space;
import org.codehaus.swizzle.confluence.SpaceSummary;
import org.codehaus.swizzle.confluence.SwizzleConfluenceException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.swt.graphics.Image;
import org.xwiki.plugins.eclipse.model.IXWikiConnection;
import org.xwiki.plugins.eclipse.model.IXWikiPage;
import org.xwiki.plugins.eclipse.model.IXWikiSpace;
import org.xwiki.plugins.eclipse.model.adapters.TreeAdapter;
import org.xwiki.plugins.eclipse.model.wrappers.XWikiSpaceWrapper;
+import org.xwiki.plugins.eclipse.util.CacheUtils;
import org.xwiki.plugins.eclipse.util.GuiUtils;
import org.xwiki.plugins.eclipse.util.XWikiConstants;
/**
* Default implementation of [EMAIL PROTECTED] IXWikiSpace}.
*/
-public class XWikiSpace implements IXWikiSpace, TreeAdapter
+public class XWikiSpace implements IXWikiSpace, TreeAdapter, Serializable
{
/**
* Parent connection to which this space belongs to.
*/
- private IXWikiConnection parent;
+ private transient IXWikiConnection parent;
/**
* Set of pages under this space, mapped by ID.
*/
- private HashMap<String, IXWikiPage> pagesByID;
+ private transient HashMap<String, IXWikiPage> pagesByID;
/**
- * Summary of this space.
+ * Summary of this space.
*/
- private SpaceSummary summary;
+ private transient SpaceSummary summary;
+
// TODO This is (almost) a subset of the space. Why do we need both ?
- // -- in general summaries are exact subsets ... here it's an anomaly and
should be treated as such
+ // -- in general summaries are exact subsets ... here it's an anomaly and
should be treated as
+ // such
// -- especially since xwiki does not have a notion of space type
/**
* Complete data for this space.
*/
- private Space space;
+ private transient Space space;
/**
+ * Cache path of this space.
+ */
+ private transient IPath cachePath;
+
+ /**
* Whether this space should be displayed or not.
*/
private boolean masked = true;
@@ -113,8 +126,6 @@
this.space = space;
}
-
-
/**
* Used by internal code to initialize this space.
*
@@ -133,7 +144,7 @@
protected void addPage(IXWikiPage page)
{
pagesByID.put(page.getId(), page);
- // pagesByTitle.put(page.getTitle(), page);
+ // pagesByTitle.put(page.getTitle(), page);
}
/**
@@ -142,7 +153,7 @@
* @param parent Parent connection of this space.
*/
protected void setConnection(IXWikiConnection parent)
- {
+ {
this.parent = parent;
}
@@ -254,18 +265,19 @@
*/
public void init() throws SwizzleConfluenceException
{
- if (!isDataReady()) {
+ if (!isDataReady()) {
Confluence rpc = getConnection().getRpcProxy();
String spaceKey = getKey();
- this.space = rpc.getSpace(spaceKey);
+ this.space = rpc.getSpace(spaceKey);
+ CacheUtils.saveSpace(this);
setDataReady(true);
}
if (!isPagesReady()) {
Confluence rpc = getConnection().getRpcProxy();
String spaceKey = getKey();
List<Object> pages = rpc.getPages(spaceKey);
- for (int i = 0; i<pages.size(); i++) {
- PageSummary pageSummary = (PageSummary)pages.get(i);
+ for (int i = 0; i < pages.size(); i++) {
+ PageSummary pageSummary = (PageSummary) pages.get(i);
IXWikiPage xwikiPage = new XWikiPage(this, pageSummary);
addPage(xwikiPage);
}
@@ -295,8 +307,8 @@
* @see org.xwiki.plugins.eclipse.model.IXWikiSpace#getConnection()
*/
public IXWikiConnection getConnection()
- {
- return this.parent;
+ {
+ return this.parent;
}
/**
@@ -358,9 +370,9 @@
public IXWikiPage searchPage(String pageTitle)
{
for (IXWikiPage page : pagesByID.values()) {
- if (page.getTitle().equals(pageTitle)) {
- return page;
- }
+ if (page.getTitle().equals(pageTitle)) {
+ return page;
+ }
}
return null;
}
@@ -428,6 +440,26 @@
/**
* [EMAIL PROTECTED]
*
+ * @see org.xwiki.plugins.eclipse.model.IXWikiSpace#getCachePath()
+ */
+ public IPath getCachePath()
+ {
+ return this.cachePath;
+ }
+
+ /**
+ * Sets the cache path for this space.
+ *
+ * @param cachePath Cache path to be set.
+ */
+ protected void setCachePath(IPath cachePath)
+ {
+ this.cachePath = cachePath;
+ }
+
+ /**
+ * [EMAIL PROTECTED]
+ *
* @see org.xwiki.plugins.eclipse.model.IXWikiSpace#isPagesReady()
*/
public boolean isPagesReady()
@@ -494,4 +526,21 @@
// TODO implement this.
}
+ /**
+ * Custom serializer method.
+ */
+ private void writeObject(ObjectOutputStream out) throws IOException
+ {
+ out.writeObject(summary.toMap());
+ out.writeObject(space.toMap());
+ out.defaultWriteObject();
+ }
+
+ /**
+ * Custom deserializer method.
+ */
+ private void readObject(ObjectInputStream in) throws IOException,
ClassNotFoundException
+ {
+ // We'll worry about this later.
+ }
}
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiConnectionManagerWrapper.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiConnectionManagerWrapper.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiConnectionManagerWrapper.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -33,8 +33,8 @@
import org.xwiki.plugins.eclipse.util.XWikiProgressRunner;
/**
- * Implentation of Decorator Pattern for adding GUI icing for
- * underlying [EMAIL PROTECTED] IXWikiConnectionManager}.
+ * Implentation of Decorator Pattern for adding GUI icing for underlying
+ * [EMAIL PROTECTED] IXWikiConnectionManager}.
*/
public class XWikiConnectionManagerWrapper implements IXWikiConnectionManager
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiConnectionWrapper.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiConnectionWrapper.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiConnectionWrapper.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -35,8 +35,7 @@
import org.xwiki.plugins.eclipse.util.XWikiProgressRunner;
/**
- * Implentation of Decorator Pattern for adding GUI icing for
- * underlying [EMAIL PROTECTED] IXWikiConnection}.
+ * Implentation of Decorator Pattern for adding GUI icing for underlying
[EMAIL PROTECTED] IXWikiConnection}.
*/
public class XWikiConnectionWrapper implements IXWikiConnection
{
@@ -122,7 +121,7 @@
}
}
-
+
/**
* [EMAIL PROTECTED]
*
@@ -169,17 +168,17 @@
return connection.getUserName();
}
-
-
- /**
+ /**
* [EMAIL PROTECTED]
- * @see
org.xwiki.plugins.eclipse.model.IXWikiConnection#getCacheDirectory()
- */
- public IPath getCacheDirectory() {
- return connection.getCacheDirectory();
- }
+ *
+ * @see org.xwiki.plugins.eclipse.model.IXWikiConnection#getCachePath()
+ */
+ public IPath getCachePath()
+ {
+ return connection.getCachePath();
+ }
- /**
+ /**
* [EMAIL PROTECTED]
*
* @see org.xwiki.plugins.eclipse.model.IXWikiConnection#init()
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiPageWrapper.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiPageWrapper.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiPageWrapper.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -32,8 +32,7 @@
import org.xwiki.plugins.eclipse.util.XWikiProgressRunner;
/**
- * Implentation of Decorator Pattern for adding GUI icing for
- * underlying [EMAIL PROTECTED] IXWikiPage}.
+ * Implentation of Decorator Pattern for adding GUI icing for underlying
[EMAIL PROTECTED] IXWikiPage}.
*/
public class XWikiPageWrapper implements IXWikiPage
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiSpaceWrapper.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiSpaceWrapper.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/model/wrappers/XWikiSpaceWrapper.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -26,6 +26,7 @@
import java.util.Collection;
import org.codehaus.swizzle.confluence.SwizzleConfluenceException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.xwiki.plugins.eclipse.model.IXWikiConnection;
import org.xwiki.plugins.eclipse.model.IXWikiPage;
@@ -34,8 +35,7 @@
import org.xwiki.plugins.eclipse.util.XWikiProgressRunner;
/**
- * Implentation of Decorator Pattern for adding GUI icing for
- * underlying [EMAIL PROTECTED] IXWikiSpace}.
+ * Implentation of Decorator Pattern for adding GUI icing for underlying
[EMAIL PROTECTED] IXWikiSpace}.
*/
public class XWikiSpaceWrapper implements IXWikiSpace
{
@@ -59,7 +59,8 @@
*
* @see
org.xwiki.plugins.eclipse.model.IXWikiSpace#addPage(java.lang.String,
java.lang.String)
*/
- public void addPage(final String title, final String content) throws
SwizzleConfluenceException
+ public void addPage(final String title, final String content)
+ throws SwizzleConfluenceException
{
// It is assumed that at this point it has been verified that the
// given title is unique. (i.e. no page with same title exists)
@@ -196,6 +197,16 @@
/**
* [EMAIL PROTECTED]
*
+ * @see org.xwiki.plugins.eclipse.model.IXWikiSpace#getCachePath()
+ */
+ public IPath getCachePath()
+ {
+ return space.getCachePath();
+ }
+
+ /**
+ * [EMAIL PROTECTED]
+ *
* @see org.xwiki.plugins.eclipse.model.IXWikiSpace#getUrl()
*/
public String getUrl()
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/CacheUtils.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/CacheUtils.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/CacheUtils.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -24,56 +24,60 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
import org.eclipse.core.runtime.IPath;
import org.xwiki.plugins.eclipse.Activator;
import org.xwiki.plugins.eclipse.model.impl.XWikiConnection;
+import org.xwiki.plugins.eclipse.model.impl.XWikiSpace;
/**
* All utility functions related to local cache management should go here.
*/
-public class CacheUtils {
-
- /**
- * @return The direcotory into which local cache should be stuffed in.
- */
- public static IPath getCacheDirectory() {
- // Return the plugin state location for now.
- return Activator.getDefault().getStateLocation();
- }
-
+public class CacheUtils
+{
+
/**
+ * @return The direcotory into which local cache should be stuffed in.
+ */
+ public static IPath getMasterCacheDirectory()
+ {
+ // Return the plugin state location for now.
+ return Activator.getDefault().getStateLocation();
+ }
+
+ /**
* Saves the given xwiki connection into local cache.
+ *
* @param connection Connection to be cached.
*/
- public static void saveConnection(XWikiConnection connection) {
- // Get cache locations
- IPath masterCacheDir = CacheUtils.getCacheDirectory();
- Date timeStamp = new Date();
- IPath connectionCacheDir =
-
masterCacheDir.addTrailingSeparator().append(String.valueOf(timeStamp.getTime()));
- IPath connectionCacheFile =
-
masterCacheDir.addTrailingSeparator().append(String.valueOf(timeStamp.getTime()))
- .addFileExtension("cache");
- // Prepare the data to be cached
- Map<String, String> cacheData = new HashMap<String, String>();
- cacheData.put(XWikiConstants.CONNECTION_USERNAME,
connection.getUserName());
- cacheData.put(XWikiConstants.CONNECTION_URL,
connection.getServerUrl());
- // Write to the cache
+ public static void saveConnection(XWikiConnection connection)
+ {
try {
ObjectOutputStream oos =
- new ObjectOutputStream(new
FileOutputStream(connectionCacheFile.toFile()));
- oos.writeObject(cacheData);
+ new ObjectOutputStream(new
FileOutputStream(connection.getCachePath()
+ .addFileExtension("cache").toFile()));
+ oos.writeObject(connection);
oos.close();
} catch (IOException e) {
- // TODO What should happen here ?
+ // TODO What should happen here ?
}
- // Create and set the cache directory for this connection
- connectionCacheDir.toFile().mkdir();
- connection.setCacheDirectory(connectionCacheDir);
- // Done updating cache.
}
+
+ /**
+ * Saves the given xwiki space into local cache.
+ *
+ * @param space Space to be cached.
+ */
+ public static void saveSpace(XWikiSpace space)
+ {
+ try {
+ ObjectOutputStream oos =
+ new ObjectOutputStream(new
FileOutputStream(space.getCachePath()
+ .addFileExtension("cache").toFile()));
+ oos.writeObject(space);
+ oos.close();
+ } catch (IOException e) {
+ // TODO What should happen here ?
+ }
+ }
}
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/DummyProgressMonitor.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/DummyProgressMonitor.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/DummyProgressMonitor.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -24,8 +24,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
/**
- * This class is used to hide progress information
- * in case the user wants them to be suppressed.
+ * This class is used to hide progress information in case the user wants them
to be suppressed.
*/
class DummyProgressMonitor implements IProgressMonitor
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/XWikiConstants.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/XWikiConstants.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/XWikiConstants.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -52,8 +52,8 @@
public static String TOGGLE_BUTTON_ICON = "icons/view-fullscreen.png";
/* Cache Constants */
- public static String CONNECTION_USERNAME = "USERNAME";
-
- public static String CONNECTION_URL = "URL";
-
+ public static String CONNECTION_USERNAME = "USERNAME";
+
+ public static String CONNECTION_URL = "URL";
+
}
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/XWikiProgressRunner.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/XWikiProgressRunner.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/util/XWikiProgressRunner.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -25,8 +25,7 @@
import org.eclipse.jface.operation.IRunnableWithProgress;
/**
- * Customized [EMAIL PROTECTED] IRunnableWithProgress} to accomodate
- * XWiki specific tasks.
+ * Customized [EMAIL PROTECTED] IRunnableWithProgress} to accomodate XWiki
specific tasks.
*/
abstract public class XWikiProgressRunner implements IRunnableWithProgress
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/views/navigator/XWikiNavigatorContentProvider.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/views/navigator/XWikiNavigatorContentProvider.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/views/navigator/XWikiNavigatorContentProvider.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -27,8 +27,8 @@
import org.xwiki.plugins.eclipse.model.impl.XWikiConnectionManager;
/**
- * Acts as the converter between model objects and the TreeViewer.
- * (Builds the tree out of model objects).
+ * Acts as the converter between model objects and the TreeViewer. (Builds the
tree out of model
+ * objects).
*/
public class XWikiNavigatorContentProvider implements ITreeContentProvider
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/XWikiWizardDialog.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/XWikiWizardDialog.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/XWikiWizardDialog.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -26,8 +26,7 @@
import org.eclipse.swt.widgets.Shell;
/**
- * Extended WizardDialog to receive button clicks
- * from within internal Wizard Pages.
+ * Extended WizardDialog to receive button clicks from within internal Wizard
Pages.
*/
public class XWikiWizardDialog extends WizardDialog
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/XWikiWizardPage.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/XWikiWizardPage.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/XWikiWizardPage.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -24,8 +24,7 @@
import org.eclipse.jface.wizard.WizardPage;
/**
- * Extended WizardPage to receive button clicks.
- * (from [EMAIL PROTECTED] XWikiWizardDialog})
+ * Extended WizardPage to receive button clicks. (from [EMAIL PROTECTED]
XWikiWizardDialog})
*/
public abstract class XWikiWizardPage extends WizardPage
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/connect/pages/SettingsPage.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/connect/pages/SettingsPage.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/connect/pages/SettingsPage.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -39,8 +39,7 @@
import org.xwiki.plugins.eclipse.wizards.connect.ui.SettingsUI;
/**
- * The WizardPage responsible for getting user input,
- * validating and making the initial connection.
+ * The WizardPage responsible for getting user input, validating and making
the initial connection.
*/
public class SettingsPage extends XWikiWizardPage implements ModifyListener,
Listener
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/connect/ui/SpacesUI.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/connect/ui/SpacesUI.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/connect/ui/SpacesUI.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -38,7 +38,7 @@
*/
public class SpacesUI extends Composite
{
-
+
private Group selectedListGroup;
private List availableSpacesList;
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newpage/pages/PageSettingsPage.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newpage/pages/PageSettingsPage.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newpage/pages/PageSettingsPage.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -30,8 +30,7 @@
import org.xwiki.plugins.eclipse.wizards.newpage.ui.PageSettingsPageUI;
/**
- * WizardPage responsible for getting user
- * input required to add a new page.
+ * WizardPage responsible for getting user input required to add a new page.
*/
public class PageSettingsPage extends XWikiWizardPage implements ModifyListener
{
@@ -125,13 +124,12 @@
if (pageTitle.equals("")) {
setErrorMessage(" Page Title Cannot be Empty.");
return false;
- }
+ }
// check whether page already exists.
if (space.searchPage(pageTitle) != null) {
setErrorMessage(" Page Title Must be Unique : " + pageTitle);
return false;
- }
- else if (pageContent.trim().equals("")) {
+ } else if (pageContent.trim().equals("")) {
setErrorMessage(" Initial Page Content Cannot be Empty.");
return false;
} else {
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newpage/ui/PageSettingsPageUI.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newpage/ui/PageSettingsPageUI.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newpage/ui/PageSettingsPageUI.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -37,7 +37,7 @@
*/
public class PageSettingsPageUI extends Composite
{
-
+
private Label titleLabel;
private Text contentText;
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newspace/pages/SpaceSettingsPage.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newspace/pages/SpaceSettingsPage.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newspace/pages/SpaceSettingsPage.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -30,8 +30,7 @@
import org.xwiki.plugins.eclipse.wizards.newspace.ui.SpaceSettingsPageUI;
/**
- * WizardPage responsible for getting user input required
- * to create a new Space.
+ * WizardPage responsible for getting user input required to create a new
Space.
*/
public class SpaceSettingsPage extends XWikiWizardPage implements
ModifyListener
{
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newspace/ui/SpaceSettingsPageUI.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newspace/ui/SpaceSettingsPageUI.java
2007-09-08 23:01:36 UTC (rev 4852)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/wizards/newspace/ui/SpaceSettingsPageUI.java
2007-09-09 07:06:21 UTC (rev 4853)
@@ -37,7 +37,7 @@
*/
public class SpaceSettingsPageUI extends Composite
{
-
+
private Text spaceNameText;
private Label spaceDescriptionLabel;
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
