X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms.e4.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Frap%2FAbstractRapE4App.java;h=66c796b8359b291a261123e7bc98dac6071d71d2;hb=743fc68ed576cb578a9cc6c59e1f423d29213be1;hp=9d1f782e6830cab29dae9056146b92f880eb06df;hpb=5044fd730feba048c6b6647222881f7b3eeb8a33;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java index 9d1f782e6..66c796b83 100644 --- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java +++ b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java @@ -3,8 +3,6 @@ package org.argeo.cms.e4.rap; import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.argeo.cms.ui.dialogs.CmsFeedback; import org.eclipse.rap.e4.E4ApplicationConfig; import org.eclipse.rap.rwt.application.Application; @@ -12,14 +10,8 @@ import org.eclipse.rap.rwt.application.Application.OperationMode; import org.eclipse.rap.rwt.application.ApplicationConfiguration; import org.eclipse.rap.rwt.application.ExceptionHandler; import org.eclipse.rap.rwt.client.WebClient; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; public abstract class AbstractRapE4App implements ApplicationConfiguration { - private final static Log log = LogFactory.getLog(AbstractRapE4App.class); - - private final BundleContext bc = FrameworkUtil.getBundle(AbstractRapE4App.class).getBundleContext(); - private String pageTitle; private String e4Xmi; private String path; @@ -31,44 +23,13 @@ public abstract class AbstractRapE4App implements ApplicationConfiguration { @Override public void handleException(Throwable throwable) { CmsFeedback.show("Unexpected RWT exception", throwable); - // log.error("Unexpected RWT exception", throwable); - } }); Map properties = new HashMap(); properties.put(WebClient.PAGE_TITLE, pageTitle); - E4ApplicationConfig config = new E4ApplicationConfig(e4Xmi, lifeCycleUri, null, false, true, true); + E4ApplicationConfig config = new E4ApplicationConfig(e4Xmi, lifeCycleUri, null, null, false, true, true); addEntryPoint(application, config, properties); - // config.isClearPersistedState(); - // E4EntryPointFactory entryPointFactory = new E4EntryPointFactory(config) { - // - // @Override - // public EntryPoint create() { - // Subject subject = new Subject(); - // EntryPoint ep = createEntryPoint(); - // EntryPoint authEp = new EntryPoint() { - // - // @Override - // public int createUI() { - // return Subject.doAs(subject, new PrivilegedAction() { - // - // @Override - // public Integer run() { - // return ep.createUI(); - // } - // - // }); - // } - // }; - // return authEp; - // } - // - // protected EntryPoint createEntryPoint() { - // return super.create(); - // } - // - // }; } protected void addEntryPoint(Application application, E4ApplicationConfig config, Map properties) {