projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify CMS app deployment.
[gpl/argeo-suite.git]
/
org.argeo.app.ui
/
src
/
org
/
argeo
/
app
/
ui
/
SuiteApp.java
diff --git
a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
index 0d898f5e22b0dbc6bb1239d3434bd67125e11f73..f6770dbac1302d30915f1bdb04bd22a721273fe4 100644
(file)
--- a/
org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
+++ b/
org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
@@
-70,10
+70,9
@@
public class SuiteApp extends AbstractCmsApp implements EventHandler {
private String adminLeadPanePid;
private String loginScreenPid;
private String adminLeadPanePid;
private String loginScreenPid;
-
private String defaultUiName = "app";
private String adminUiName = "admin";
private String defaultUiName = "app";
private String adminUiName = "admin";
-
+
// FIXME such default names make refactoring more dangerous
@Deprecated
private String defaultLayerPid = "argeo.suite.ui.dashboardLayer";
// FIXME such default names make refactoring more dangerous
@Deprecated
private String defaultLayerPid = "argeo.suite.ui.dashboardLayer";
@@
-92,7
+91,6
@@
public class SuiteApp extends AbstractCmsApp implements EventHandler {
private Repository repository;
private Repository repository;
-
public void init(Map<String, Object> properties) {
if (log.isDebugEnabled())
log.info("Argeo Suite App started");
public void init(Map<String, Object> properties) {
if (log.isDebugEnabled())
log.info("Argeo Suite App started");
@@
-124,8
+122,9
@@
public class SuiteApp extends AbstractCmsApp implements EventHandler {
public void destroy(Map<String, Object> properties) {
for (SuiteUi ui : managedUis.values())
public void destroy(Map<String, Object> properties) {
for (SuiteUi ui : managedUis.values())
- if (!ui.isDisposed())
- ui.dispose();
+ if (!ui.isDisposed()) {
+ ui.getDisplay().syncExec(() -> ui.dispose());
+ }
if (log.isDebugEnabled())
log.info("Argeo Suite App stopped");
if (log.isDebugEnabled())
log.info("Argeo Suite App stopped");
@@
-141,8
+140,9
@@
public class SuiteApp extends AbstractCmsApp implements EventHandler {
@Override
public CmsUi initUi(Object parent) {
@Override
public CmsUi initUi(Object parent) {
- Composite uiParent =(Composite) parent;
- String uiName = uiParent.getData(UI_NAME_PROPERTY) != null ? uiParent.getData(UI_NAME_PROPERTY).toString() : null;
+ Composite uiParent = (Composite) parent;
+ String uiName = uiParent.getData(UI_NAME_PROPERTY) != null ? uiParent.getData(UI_NAME_PROPERTY).toString()
+ : null;
CmsView cmsView = CmsSwtUtils.getCmsView(uiParent);
if (cmsView == null)
throw new IllegalStateException("No CMS view is registered.");
CmsView cmsView = CmsSwtUtils.getCmsView(uiParent);
if (cmsView == null)
throw new IllegalStateException("No CMS view is registered.");
@@
-162,6
+162,9
@@
public class SuiteApp extends AbstractCmsApp implements EventHandler {
@Override
public String getThemeId(String uiName) {
@Override
public String getThemeId(String uiName) {
+ String themeId = System.getProperty("org.argeo.app.theme.default");
+ if (themeId != null)
+ return themeId;
return defaultThemeId;
}
return defaultThemeId;
}
@@
-637,5
+640,4
@@
public class SuiteApp extends AbstractCmsApp implements EventHandler {
this.repository = repository;
}
this.repository = repository;
}
-
}
}