Adapt to changes in Argeo Commons.

[gpl/argeo-suite.git] / org.argeo.suite.e4.rap / src / org / argeo / suite / e4 / rap / ArgeoOfficeRapE4App.java

diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java
index f9180c7ccf4d7dab30f6cb74ec9366f33a64d42d..3e732ef664f642b4d1bbf6e180b8369462d45649 100644 (file)
--- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java
+++ b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java
@@ -1,45 +1,46 @@
 package org.argeo.suite.e4.rap;
 
-import java.util.Map;
-
 import org.argeo.cms.e4.rap.AbstractRapE4App;
-import org.argeo.cms.util.BundleResourceLoader;
-import org.eclipse.rap.e4.E4ApplicationConfig;
-import org.eclipse.rap.rwt.RWT;
+import org.argeo.cms.util.CmsTheme;
 import org.eclipse.rap.rwt.application.Application;
 import org.eclipse.rap.rwt.client.WebClient;
-import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 
+/** Argeo Office RAP application. */
 public class ArgeoOfficeRapE4App extends AbstractRapE4App {
        private BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
 
        public ArgeoOfficeRapE4App() {
-               setPageTitle("Argeo Office");
-               setE4Xmi("org.argeo.suite.e4/e4xmi/argeo-office.e4xmi");
-               setPath("/office");
+//             setPageTitle("Argeo Office");
+//             setE4Xmi("org.argeo.suite.e4/e4xmi/argeo-office.e4xmi");
+//             setPath("/office");
                setLifeCycleUri("bundleclass://org.argeo.suite.e4.rap/org.argeo.suite.e4.rap.ArgeoSuiteLoginLifecycle");
        }
 
        @Override
-       protected void addEntryPoint(Application application, E4ApplicationConfig config, Map<String, String> properties) {
-               // String theme ="org.argeo.theme.argeo2.office";
-               String theme = RWT.DEFAULT_THEME_ID;
-               Bundle themeBundle = findTheme("org.argeo.theme.argeo2");
-               // application.addStyleSheet(theme, "rap/office-rwt.css", new
-               // BundleResourceLoader(themeBundle));
-               application.addStyleSheet(theme, "rap/office.css", new BundleResourceLoader(themeBundle));
-               properties.put(WebClient.THEME_ID, theme);
+       protected void addEntryPoints(Application application) {
+               CmsTheme cmsTheme = new CmsTheme(bc, "org.argeo.theme.argeo2");
+               cmsTheme.apply(application);
+
                String font = "<link rel='stylesheet' href='http://fonts.googleapis.com/css?family=Source+Sans+Pro'/>";
-               properties.put(WebClient.HEAD_HTML, font);
-               super.addEntryPoint(application, config, properties);
-       }
+               getBaseProperties().put(WebClient.HEAD_HTML, font);
 
-       Bundle findTheme(String symbolicName) {
-               for (Bundle b : bc.getBundles())
-                       if (symbolicName.equals(b.getSymbolicName()))
-                               return b;
-               throw new RuntimeException("Theme bundle " + symbolicName + " not found");
+               addE4EntryPoint(application, "/office", "org.argeo.suite.e4/e4xmi/argeo-office.e4xmi", customise("Office"));
+               addE4EntryPoint(application, "/docs", "org.argeo.suite.e4/e4xmi/argeo-docs.e4xmi", customise("Docs"));
        }
+
+//     protected void addEntryPoint(Application application, E4ApplicationConfig config, Map<String, String> properties) {
+//             // String theme ="org.argeo.theme.argeo2.office";
+//             String theme = RWT.DEFAULT_THEME_ID;
+//             Bundle themeBundle = findTheme("org.argeo.theme.argeo2");
+//             // application.addStyleSheet(theme, "rap/office-rwt.css", new
+//             // BundleResourceLoader(themeBundle));
+//             application.addStyleSheet(theme, "rap/office.css", new BundleResourceLoader(themeBundle));
+//             properties.put(WebClient.THEME_ID, theme);
+//             String font = "<link rel='stylesheet' href='http://fonts.googleapis.com/css?family=Source+Sans+Pro'/>";
+//             properties.put(WebClient.HEAD_HTML, font);
+//             //super.addEntryPoint(application, config, properties);
+//     }
+
 }