Merge tag 'v2.3.18' into testing

[lgpl/argeo-commons.git] / swt / org.argeo.cms.swt / src / org / argeo / cms / swt / acr / ContentComposite.java

diff --git a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/ContentComposite.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/ContentComposite.java
index 951889eeea24a4d3c435de6744f126c286c9da79..4cab6d0083d40a08ad31e315031a0a530712d518 100644 (file)
--- a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/ContentComposite.java
+++ b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/acr/ContentComposite.java
@@ -2,17 +2,26 @@ package org.argeo.cms.swt.acr;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.spi.ProvidedContent;
+import org.argeo.cms.ux.acr.ContentPart;
 import org.eclipse.swt.widgets.Composite;
 
 /** A composite which can (optionally) manage a content. */
-public class ContentComposite extends Composite {
+public class ContentComposite extends Composite implements ContentPart {
        private static final long serialVersionUID = -1447009015451153367L;
 
        public ContentComposite(Composite parent, int style, Content item) {
                super(parent, style);
-               setData(item);
+               if (item != null)
+                       setData(item);
        }
 
+       public boolean hasContent() {
+               if (getData() == null)
+                       return false;
+               return getData() instanceof Content;
+       }
+
+       @Override
        public Content getContent() {
                return (Content) getData();
        }