Index: src/main/java/org/xwiki/eclipse/ui/adapters/XWikiEclipsePageSummaryAdapter.java
===================================================================
--- src/main/java/org/xwiki/eclipse/ui/adapters/XWikiEclipsePageSummaryAdapter.java	(revision 13931)
+++ src/main/java/org/xwiki/eclipse/ui/adapters/XWikiEclipsePageSummaryAdapter.java	(working copy)
@@ -47,8 +47,7 @@
             final XWikiEclipsePageSummary pageSummary = (XWikiEclipsePageSummary) object;
 
             try {
-                List<XWikiEclipseObjectSummary> result =
-                    pageSummary.getDataManager().getObjects(pageSummary.getData().getId());
+                List<XWikiEclipseObjectSummary> result = pageSummary.getObjectSummaries();
                 return result.toArray();
             } catch (XWikiEclipseException e) {
                 UIUtils
Index: src/main/java/org/xwiki/eclipse/ui/adapters/XWikiEclipseSpaceSummaryAdapter.java
===================================================================
--- src/main/java/org/xwiki/eclipse/ui/adapters/XWikiEclipseSpaceSummaryAdapter.java	(revision 13931)
+++ src/main/java/org/xwiki/eclipse/ui/adapters/XWikiEclipseSpaceSummaryAdapter.java	(working copy)
@@ -47,8 +47,7 @@
             final XWikiEclipseSpaceSummary spaceSummary = (XWikiEclipseSpaceSummary) object;
 
             try {
-                List<XWikiEclipsePageSummary> result =
-                    spaceSummary.getDataManager().getPages(spaceSummary.getData().getKey());
+                List<XWikiEclipsePageSummary> result = spaceSummary.getPageSummaries();
                 return result.toArray();
             } catch (XWikiEclipseException e) {
                 UIUtils