projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt after AppService API modification
[gpl/argeo-suite.git]
/
org.argeo.suite.web
/
src
/
org
/
argeo
/
suite
/
web
/
DefaultMainPage.java
diff --git
a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
index 6c4c74e8fdfb7b73c088cda7489b90439fb907cc..3adbc294bdb4b64ecd2572e2911c65e9d6977bd4 100644
(file)
--- a/
org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
+++ b/
org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
@@
-16,11
+16,12
@@
import org.argeo.cms.ui.CmsView;
import org.argeo.cms.ui.LifeCycleUiProvider;
import org.argeo.cms.util.CmsUtils;
import org.argeo.cms.widgets.auth.CmsLogin;
import org.argeo.cms.ui.LifeCycleUiProvider;
import org.argeo.cms.util.CmsUtils;
import org.argeo.cms.widgets.auth.CmsLogin;
-import org.argeo.connect.people.PeopleService;
-import org.argeo.connect.people.PeopleTypes;
-import org.argeo.connect.people.web.pages.PeopleDefaultPage;
-import org.argeo.connect.resources.ResourceService;
+import org.argeo.connect.ConnectTypes;
+import org.argeo.connect.resources.ResourcesService;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.people.PeopleService;
+import org.argeo.people.PeopleTypes;
+import org.argeo.people.web.pages.PeopleDefaultPage;
import org.argeo.suite.web.fs.MyFilesBrowserPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionListener;
import org.argeo.suite.web.fs.MyFilesBrowserPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionListener;
@@
-42,7
+43,7
@@
public class DefaultMainPage implements LifeCycleUiProvider {
private CmsUiProvider fsBrowserPage;
/* DEPENDENCY INJECTION */
private CmsUiProvider fsBrowserPage;
/* DEPENDENCY INJECTION */
- private Resource
Service resource
Service;
+ private Resource
sService resources
Service;
private PeopleService peopleService;
private FileSystemProvider nodeFileSystemProvider;
private Map<String, String> peopleIconPaths;
private PeopleService peopleService;
private FileSystemProvider nodeFileSystemProvider;
private Map<String, String> peopleIconPaths;
@@
-52,8
+53,8
@@
public class DefaultMainPage implements LifeCycleUiProvider {
@Override
public void init(Session adminSession) throws RepositoryException {
@Override
public void init(Session adminSession) throws RepositoryException {
- dashboardPage = new DefaultDashboard(resourceService, peopleService, peopleIconPaths);
- peoplePage = new PeopleDefaultPage(resourceService, peopleService, peopleIconPaths);
+ dashboardPage = new DefaultDashboard(resource
s
Service, peopleService, peopleIconPaths);
+ peoplePage = new PeopleDefaultPage(resource
s
Service, peopleService, peopleIconPaths);
fsBrowserPage = new MyFilesBrowserPage(nodeFileSystemProvider);
}
fsBrowserPage = new MyFilesBrowserPage(nodeFileSystemProvider);
}
@@
-62,9
+63,9
@@
public class DefaultMainPage implements LifeCycleUiProvider {
if (CurrentUser.isAnonymous())
return createAnonymousUi(parent, context);
if (CurrentUser.isAnonymous())
return createAnonymousUi(parent, context);
- if (context.isNodeType(
PeopleTypes.PEOPLE
_ENTITY))
+ if (context.isNodeType(
ConnectTypes.CONNECT
_ENTITY))
return peoplePage.createUi(parent, context);
return peoplePage.createUi(parent, context);
- else if (
peopleService.getBasePath(null
).equals(context.getPath()))
+ else if (
("/"+peopleService.getBaseRelPath(PeopleTypes.PEOPLE_PERSON)
).equals(context.getPath()))
return peoplePage.createUi(parent, context);
else if (context.isNodeType(NodeType.NT_FOLDER) || context.isNodeType(NodeType.NT_FILE))
return fsBrowserPage.createUi(parent, context);
return peoplePage.createUi(parent, context);
else if (context.isNodeType(NodeType.NT_FOLDER) || context.isNodeType(NodeType.NT_FILE))
return fsBrowserPage.createUi(parent, context);
@@
-123,8
+124,8
@@
public class DefaultMainPage implements LifeCycleUiProvider {
}
/* DEPENDENCY INJECTION */
}
/* DEPENDENCY INJECTION */
- public void setResource
Service(ResourceService resource
Service) {
- this.resource
Service = resource
Service;
+ public void setResource
sService(ResourcesService resources
Service) {
+ this.resource
sService = resources
Service;
}
public void setPeopleService(PeopleService peopleService) {
}
public void setPeopleService(PeopleService peopleService) {