Author: fmancinelli
Date: 2007-11-02 19:58:42 +0100 (Fri, 02 Nov 2007)
New Revision: 5620
Added:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/icons/page-settings-banner.png
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/icons/space-settings-banner.png
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/impl/DiskCacheDAO.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/model/impl/XWikiSpace.java
Log:
XECLIPSE-30
* Model refactoring
* Shows only spaces with cached pages when disconnected
Added:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/icons/page-settings-banner.png
===================================================================
(Binary files differ)
Property changes on:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/icons/page-settings-banner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/icons/space-settings-banner.png
===================================================================
(Binary files differ)
Property changes on:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/icons/space-settings-banner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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-11-02 18:36:08 UTC (rev 5619)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/IXWikiConnection.java
2007-11-02 18:58:42 UTC (rev 5620)
@@ -70,7 +70,7 @@
* @return A collection of page descriptors for the pages available in the
space with the given key.
* @throws XWikiConnectionException
*/
- public Collection<IXWikiPage> getPages(String spaceKey)
+ public Collection<IXWikiPage> getPages(IXWikiSpace space)
throws XWikiConnectionException;
/**
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/DiskCacheDAO.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/DiskCacheDAO.java
2007-11-02 18:36:08 UTC (rev 5619)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/DiskCacheDAO.java
2007-11-02 18:58:42 UTC (rev 5620)
@@ -172,13 +172,16 @@
List<SpaceSummary> result = new ArrayList<SpaceSummary>();
try {
- for (String dataFileName :
indexAggregate.getSpaceToDataFileNameIndex().values()) {
- ObjectInputStream ois =
- new ObjectInputStream(new FileInputStream(new
File(cacheDir, dataFileName)));
- Map map = (Map) ois.readObject();
- ois.close();
- result.add(new SpaceSummary(map));
- }
+ for(String spaceKey :
indexAggregate.getSpaceToPagesIndex().keySet()) {
+
if(!indexAggregate.getSpaceToPagesIndex().get(spaceKey).isEmpty()) {
+ String dataFileName =
indexAggregate.getSpaceToDataFileNameIndex().get(spaceKey);
+ ObjectInputStream ois =
+ new ObjectInputStream(new FileInputStream(new
File(cacheDir, dataFileName)));
+ Map map = (Map) ois.readObject();
+ ois.close();
+ result.add(new SpaceSummary(map));
+ }
+ }
} catch (Exception e) {
throw new XWikiDAOException(e);
}
@@ -372,9 +375,10 @@
return indexAggregate.getPageToDataFileNameIndex().get(pageId) != null
? true : false;
}
- public Space createSpace(String key, String name, String description)
throws XWikiDAOException
+ public Space createSpace(String key, String name, String description)
+ throws XWikiDAOException
{
- throw new XWikiDAOException("Cannot create spaces on a local cache");
+ throw new XWikiDAOException("Cannot create spaces on a local cache");
}
public Page createPage(String spaceKey, String title, String content)
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-11-02 18:36:08 UTC (rev 5619)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiCachedConnection.java
2007-11-02 18:58:42 UTC (rev 5620)
@@ -306,7 +306,7 @@
/**
* [EMAIL PROTECTED]
*/
- public Collection<IXWikiPage> getPages(String spaceKey) throws
XWikiConnectionException
+ public Collection<IXWikiPage> getPages(IXWikiSpace space) throws
XWikiConnectionException
{
assertNotDisposed();
@@ -314,9 +314,9 @@
try {
List<PageSummary> pageSummaries;
if (isConnected()) {
- pageSummaries = remoteDAO.getPages(spaceKey);
+ pageSummaries = remoteDAO.getPages(space.getKey());
} else {
- pageSummaries = cacheDAO.getPages(spaceKey);
+ pageSummaries = cacheDAO.getPages(space.getKey());
}
if (pageSummaries != null) {
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-11-02 18:36:08 UTC (rev 5619)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiPlainConnection.java
2007-11-02 18:58:42 UTC (rev 5620)
@@ -137,7 +137,7 @@
/**
* [EMAIL PROTECTED]
*/
- public Collection<IXWikiPage> getPages(String spaceKey) throws
XWikiConnectionException
+ public Collection<IXWikiPage> getPages(IXWikiSpace space) throws
XWikiConnectionException
{
assertNotDisposed();
@@ -145,7 +145,7 @@
try {
List<PageSummary> pageSummaries = null;
if (isConnected()) {
- pageSummaries = remoteDAO.getPages(spaceKey);
+ pageSummaries = remoteDAO.getPages(space.getKey());
}
if (pageSummaries != null) {
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiSpace.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiSpace.java
2007-11-02 18:36:08 UTC (rev 5619)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/model/impl/XWikiSpace.java
2007-11-02 18:58:42 UTC (rev 5620)
@@ -84,7 +84,7 @@
public Collection<IXWikiPage> getPages() throws XWikiConnectionException
{
- return connection.getPages(space.getKey());
+ return connection.getPages(this);
}
public String getType()
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
