Author: julien(a)jboss.com Date: 2008-06-27 18:38:06 -0400 (Fri, 27 Jun 2008) New Revision: 11183 Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElement.java modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElementContext.java modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElementState.java modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutStructure.java modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/NestedStructure.java modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/SimpleElement.java Log: a bit of javadoc Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElement.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElement.java 2008-06-27 22:29:25 UTC (rev 11182) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElement.java 2008-06-27 22:38:06 UTC (rev 11183) @@ -38,24 +38,28 @@ /** . */ private LayoutElementContext context; + /** The state. */ + final LayoutElementState state; + /** The structure to which this element belongs. */ LayoutStructure structure; protected LayoutElement() { + this.state = new LayoutElementState(); } - LayoutElementContext getContext() + final LayoutElementContext getContext() { return context; } - void register(LayoutElementContext context) + final void register(LayoutElementContext context) { this.context = context; } - void unregister() + final void unregister() { throw new NotYetImplemented("No need for now"); } @@ -76,20 +80,18 @@ return context.getId(); } - /** - * Returns the state of the layout object. - * - * @return the state - */ - public abstract LayoutElementState getState(); + public final LayoutElementState getState() + { + return state; + } - public Serializable getProperty(String name) + public final Serializable getProperty(String name) { - return getState().getProperty(name); + return state.getProperty(name); } - public void setProperty(String name, Serializable value) + public final void setProperty(String name, Serializable value) { - getState().setProperty(name, value); + state.setProperty(name, value); } } Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElementContext.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElementContext.java 2008-06-27 22:29:25 UTC (rev 11182) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElementContext.java 2008-06-27 22:38:06 UTC (rev 11183) @@ -23,7 +23,7 @@ package org.jboss.portal.presentation.portal.model.layout; /** - * The context of a layout item that is not exposed. + * The context of a layout element that is not exposed. * * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElementState.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElementState.java 2008-06-27 22:29:25 UTC (rev 11182) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutElementState.java 2008-06-27 22:38:06 UTC (rev 11183) @@ -28,7 +28,7 @@ import java.util.Collections; /** - * A generic state of layout items. + * A generic state of layout element. * * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutStructure.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutStructure.java 2008-06-27 22:29:25 UTC (rev 11182) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutStructure.java 2008-06-27 22:38:06 UTC (rev 11183) @@ -26,7 +26,7 @@ import java.util.ArrayList; /** - * The structure of a layout. + * The structure of a layout is a layout element that contains other layout elements. * * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ @@ -37,13 +37,9 @@ /** The elements of the structure. */ private final Collection<LayoutElement> elements; - /** The state. */ - final LayoutElementState state; - LayoutStructure() { this.elements = new ArrayList<LayoutElement>(); - this.state = new LayoutElementState(); } public Collection<LayoutElement> getElements() Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/NestedStructure.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/NestedStructure.java 2008-06-27 22:29:25 UTC (rev 11182) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/NestedStructure.java 2008-06-27 22:38:06 UTC (rev 11183) @@ -30,4 +30,5 @@ */ public final class NestedStructure extends LayoutStructure { + // Nothing added yet } Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/SimpleElement.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/SimpleElement.java 2008-06-27 22:29:25 UTC (rev 11182) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/SimpleElement.java 2008-06-27 22:38:06 UTC (rev 11183) @@ -32,22 +32,13 @@ /** . */ private final String ref; - /** . */ - private final LayoutElementState state; - SimpleElement(String ref) { this.ref = ref; - this.state = new LayoutElementState(); } public String getRef() { return ref; } - - public LayoutElementState getState() - { - return state; - } }