X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.swt%2Fsrc%2Forg%2Fargeo%2Fapp%2Fswt%2Fux%2FSwtAppUi.java;h=9654a8ed81c67a8ee68e5e7c8565b7e773161c09;hb=0652a702f6c9109ccb858f658b5cf14e6f73b815;hp=a604fc0a4db55b01e77adf48bd629c1a0f3333e9;hpb=e007028c81cf85df3c23b761856779427f86a633;p=gpl%2Fargeo-suite.git diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtAppUi.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtAppUi.java index a604fc0..9654a8e 100644 --- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtAppUi.java +++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtAppUi.java @@ -5,6 +5,7 @@ import java.util.Map; import org.argeo.api.acr.Content; import org.argeo.api.cms.CmsLog; +import org.argeo.app.ux.AppUi; import org.argeo.app.ux.SuiteStyle; import org.argeo.cms.Localized; import org.argeo.cms.swt.CmsSwtUi; @@ -14,7 +15,11 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; /** The view for the default UX of Argeo Suite. */ -public class SwtAppUi extends CmsSwtUi { +public class SwtAppUi extends CmsSwtUi implements AppUi { + static enum Structural { + header, footer, leadPane, sidePane, loginScreen, adminLeadPane; + } + private static final long serialVersionUID = 6207018859086689108L; private final static CmsLog log = CmsLog.getLog(SwtAppUi.class); @@ -148,6 +153,11 @@ public class SwtAppUi extends CmsSwtUi { } public void addLayer(String id, SwtAppLayer layer) { + if (!id.equals(layer.getId())) { + log.error("Layer id as key '" + id + "' is not consistent with layer id '" + layer.getId() + + "', ignoring..."); + return; + } layers.put(id, layer); } @@ -206,6 +216,7 @@ public class SwtAppUi extends CmsSwtUi { this.userDir = userDir; } +// @Override public Localized getTitle() { return title; } @@ -214,6 +225,7 @@ public class SwtAppUi extends CmsSwtUi { this.title = title; } + @Override public boolean isLoginScreen() { return loginScreen; }