projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing setter
[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 a05d7bc6869ca6e63a7496adfa75b739b412f76d..b84a653d654e62ca62c7206d5baee685f6e8b42c 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
@@
-11,17
+11,19
@@
import javax.jcr.nodetype.NodeType;
import org.argeo.cms.CmsMsg;
import org.argeo.cms.auth.CurrentUser;
import org.argeo.cms.CmsMsg;
import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.text.TextStyles;
import org.argeo.cms.ui.CmsUiProvider;
import org.argeo.cms.ui.CmsView;
import org.argeo.cms.ui.LifeCycleUiProvider;
import org.argeo.cms.ui.CmsUiProvider;
import org.argeo.cms.ui.CmsView;
import org.argeo.cms.ui.LifeCycleUiProvider;
-import org.argeo.cms.ui.fs.MyFilesBrowserPage;
import org.argeo.cms.util.CmsUtils;
import org.argeo.cms.widgets.auth.CmsLogin;
import org.argeo.cms.util.CmsUtils;
import org.argeo.cms.widgets.auth.CmsLogin;
-import org.argeo.connect.
people.Peopl
eService;
-import org.argeo.connect.
people.People
Types;
-import org.argeo.connect.
people.web.pages.PeopleDefaultPag
e;
+import org.argeo.connect.
AppMaintenanc
eService;
+import org.argeo.connect.
Connect
Types;
+import org.argeo.connect.
resources.ResourcesServic
e;
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.eclipse.swt.layout.GridData;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
@@
-32,8
+34,8
@@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
/**
import org.eclipse.swt.widgets.Label;
/**
- * Default entry point for the Argeo Suite CMS. Forwards the request to the
relevant
- * CmsUiProvider
+ * Default entry point for the Argeo Suite CMS. Forwards the request to the
+ *
relevant
CmsUiProvider
*/
public class DefaultMainPage implements LifeCycleUiProvider {
*/
public class DefaultMainPage implements LifeCycleUiProvider {
@@
-42,6
+44,7
@@
public class DefaultMainPage implements LifeCycleUiProvider {
private CmsUiProvider fsBrowserPage;
/* DEPENDENCY INJECTION */
private CmsUiProvider fsBrowserPage;
/* DEPENDENCY INJECTION */
+ private ResourcesService resourcesService;
private PeopleService peopleService;
private FileSystemProvider nodeFileSystemProvider;
private Map<String, String> peopleIconPaths;
private PeopleService peopleService;
private FileSystemProvider nodeFileSystemProvider;
private Map<String, String> peopleIconPaths;
@@
-51,8
+54,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(peopleService, peopleIconPaths);
- peoplePage = new PeopleDefaultPage(peopleService, peopleIconPaths);
+ dashboardPage = new DefaultDashboard(
resourcesService,
peopleService, peopleIconPaths);
+ peoplePage = new PeopleDefaultPage(
resourcesService,
peopleService, peopleIconPaths);
fsBrowserPage = new MyFilesBrowserPage(nodeFileSystemProvider);
}
fsBrowserPage = new MyFilesBrowserPage(nodeFileSystemProvider);
}
@@
-61,9
+64,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);
@@
-89,7
+92,7
@@
public class DefaultMainPage implements LifeCycleUiProvider {
Label anonymousLbl = new Label(body, SWT.WRAP);
anonymousLbl.setText("You should login or register to access your private dashboard");
Label anonymousLbl = new Label(body, SWT.WRAP);
anonymousLbl.setText("You should login or register to access your private dashboard");
-
+
return body;
}
return body;
}
@@
-122,6
+125,10
@@
public class DefaultMainPage implements LifeCycleUiProvider {
}
/* DEPENDENCY INJECTION */
}
/* DEPENDENCY INJECTION */
+ public void setResourcesService(ResourcesService resourcesService) {
+ this.resourcesService = resourcesService;
+ }
+
public void setPeopleService(PeopleService peopleService) {
this.peopleService = peopleService;
}
public void setPeopleService(PeopleService peopleService) {
this.peopleService = peopleService;
}
@@
-133,4
+140,9
@@
public class DefaultMainPage implements LifeCycleUiProvider {
public void setPeopleIconPaths(Map<String, String> peopleIconPaths) {
this.peopleIconPaths = peopleIconPaths;
}
public void setPeopleIconPaths(Map<String, String> peopleIconPaths) {
this.peopleIconPaths = peopleIconPaths;
}
+
+ // Only used has a blocker.
+ public void setSuiteMaintenanceService(AppMaintenanceService suiteMaintenanceService) {
+ }
+
}
}