Massive Argeo APIs refactoring

[gpl/argeo-suite.git] / org.argeo.publishing.ui / src / org / argeo / publishing / ui / PublishingApp.java

diff --git a/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java b/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java
index 705eb96facadc4a415211beffa0e83135dc79695..464f0c93e0440526c61b4683b45069d95b2b47e7 100644 (file)
--- a/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java
+++ b/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java
@@ -8,14 +8,14 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.jcr.Node;
+import javax.jcr.Repository;
 import javax.jcr.Session;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.ui.AbstractCmsApp;
-import org.argeo.cms.ui.CmsApp;
+import org.argeo.api.cms.CmsApp;
+import org.argeo.api.cms.CmsUi;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.cms.AbstractCmsApp;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.docbook.ui.DocumentPage;
 import org.argeo.jcr.Jcr;
 import org.argeo.suite.ui.SuiteApp;
 import org.argeo.util.LangUtils;
@@ -31,7 +31,7 @@ import org.osgi.service.event.EventHandler;
  * site.
  */
 public class PublishingApp extends AbstractCmsApp implements EventHandler {
-       private final static Log log = LogFactory.getLog(PublishingApp.class);
+       private final static CmsLog log = CmsLog.getLog(PublishingApp.class);
 
        private String pid;
        private String defaultThemeId;
@@ -42,6 +42,8 @@ public class PublishingApp extends AbstractCmsApp implements EventHandler {
        private CmsUiProvider landingPage;
        private CmsUiProvider defaultProvider = new DocumentUiProvider();
 
+       private Repository repository;
+
        public void init(Map<String, String> properties) {
                if (properties.containsKey(DEFAULT_UI_NAME_PROPERTY))
                        defaultUiName = LangUtils.get(properties, DEFAULT_UI_NAME_PROPERTY);
@@ -68,7 +70,8 @@ public class PublishingApp extends AbstractCmsApp implements EventHandler {
        }
 
        @Override
-       public Composite initUi(Composite parent) {
+       public CmsUi initUi(Object uiParent) {
+               Composite parent = (Composite) uiParent;
 //             Session adminSession = NodeUtils.openDataAdminSession(getRepository(), null);
                Session session = Jcr.login(getRepository(), null);
                parent.setLayout(new GridLayout());
@@ -86,11 +89,12 @@ public class PublishingApp extends AbstractCmsApp implements EventHandler {
                } else {
                        page = defaultProvider.createUiPart(parent, indexNode);
                }
-               return (Composite) page;
+               return (CmsUi) page;
        }
 
        @Override
-       public void refreshUi(Composite parent, String state) {
+       public void refreshUi(CmsUi cmsUi, String state) {
+               Composite parent = (Composite) cmsUi;
                parent.setLayout(new GridLayout());
                if (landingPage != null)
                        landingPage.createUiPart(parent, null);
@@ -99,7 +103,7 @@ public class PublishingApp extends AbstractCmsApp implements EventHandler {
        }
 
        @Override
-       public void setState(Composite parent, String state) {
+       public void setState(CmsUi cmsUi, String state) {
 
        }
 
@@ -118,4 +122,12 @@ public class PublishingApp extends AbstractCmsApp implements EventHandler {
 
        }
 
+       public Repository getRepository() {
+               return repository;
+       }
+
+       public void setRepository(Repository repository) {
+               this.repository = repository;
+       }
+
 }