();
private String variable;
@@ -737,6 +739,12 @@ public class UIPropertySheet extends UIPanel implements NamingContainer
propSheetItem = (PropertySheetItem)context.getApplication().
createComponent(RepoConstants.ALFRESCO_FACES_CHILD_ASSOCIATION);
}
+ else if (item instanceof SeparatorConfig)
+ {
+ id = SEP_ID_PREFIX + item.getName();
+ propSheetItem = (PropertySheetItem)context.getApplication().
+ createComponent(RepoConstants.ALFRESCO_FACES_SEPARATOR);
+ }
// now setup the common stuff across all component types
if (propSheetItem != null)
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UISeparator.java b/source/java/org/alfresco/web/ui/repo/component/property/UISeparator.java
new file mode 100644
index 0000000000..5059ae26c3
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UISeparator.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ * http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.property;
+
+import java.io.IOException;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+import org.alfresco.web.app.servlet.FacesHelper;
+import org.alfresco.web.ui.repo.RepoConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Component to represent a separator within a property sheet
+ *
+ * @author gavinc
+ */
+public class UISeparator extends PropertySheetItem
+{
+ public static final String COMPONENT_FAMILY = "org.alfresco.faces.Separator";
+
+ private static Log logger = LogFactory.getLog(UISeparator.class);
+
+ /**
+ * Default constructor
+ */
+ public UISeparator()
+ {
+ // set the default renderer
+ setRendererType("org.alfresco.faces.SeparatorRenderer");
+ }
+
+ /**
+ * @see javax.faces.component.UIComponent#getFamily()
+ */
+ public String getFamily()
+ {
+ return COMPONENT_FAMILY;
+ }
+
+ protected String getIncorrectParentMsg()
+ {
+ return "The separator component must be nested within a property sheet component";
+ }
+
+ protected void generateItem(FacesContext context, UIPropertySheet propSheet) throws IOException
+ {
+ String componentGeneratorName = this.getComponentGenerator();
+
+ if (componentGeneratorName == null)
+ {
+ componentGeneratorName = RepoConstants.GENERATOR_SEPARATOR;
+ }
+
+ UIComponent separator = FacesHelper.getComponentGenerator(context, componentGeneratorName).
+ generateAndAdd(context, propSheet, this);
+
+ if (logger.isDebugEnabled())
+ logger.debug("Created separator " + separator + "(" +
+ separator.getClientId(context) +
+ ") for '" + this.getName() +
+ "' and added it to component " + this);
+ }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/renderer/property/PropertySheetItemRenderer.java b/source/java/org/alfresco/web/ui/repo/renderer/property/PropertySheetItemRenderer.java
index 82913887a7..bdc291f124 100644
--- a/source/java/org/alfresco/web/ui/repo/renderer/property/PropertySheetItemRenderer.java
+++ b/source/java/org/alfresco/web/ui/repo/renderer/property/PropertySheetItemRenderer.java
@@ -70,8 +70,6 @@ public class PropertySheetItemRenderer extends BaseRenderer
UIComponent label = children.get(0);
UIComponent control = children.get(1);
- out.write("");
-
// encode the mandatory marker component if present
if (count == 3)
{
diff --git a/source/java/org/alfresco/web/ui/repo/renderer/property/SeparatorRenderer.java b/source/java/org/alfresco/web/ui/repo/renderer/property/SeparatorRenderer.java
new file mode 100644
index 0000000000..24ab159804
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/renderer/property/SeparatorRenderer.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ * http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.renderer.property;
+
+import java.io.IOException;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.renderer.BaseRenderer;
+
+/**
+ * Renderer for a Separator component
+ *
+ * @author gavinc
+ */
+public class SeparatorRenderer extends BaseRenderer
+{
+ /**
+ * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+ */
+ public void encodeBegin(FacesContext context, UIComponent component) throws IOException
+ {
+ if (component.isRendered() == false)
+ {
+ return;
+ }
+
+ // NOTE: we close off the first | generated by the property sheet's grid renderer
+ context.getResponseWriter().write(" | ");
+ }
+
+ /**
+ * @see javax.faces.render.Renderer#encodeChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+ */
+ @SuppressWarnings("unchecked")
+ public void encodeChildren(FacesContext context, UIComponent component) throws IOException
+ {
+ if (component.isRendered() == false)
+ {
+ return;
+ }
+
+ ResponseWriter out = context.getResponseWriter();
+
+ int count = component.getChildCount();
+
+ if (count == 1)
+ {
+ // there should be 3 columns so write out a td with colspan of 3
+ // then render the child component
+ out.write("");
+ Utils.encodeRecursive(context, (UIComponent)component.getChildren().get(0));
+
+ // NOTE: we'll allow the property sheet's grid renderer close off the last |
+ }
+ }
+
+ /**
+ * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+ */
+ public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+ {
+ // we don't need to do anything in here
+ }
+
+ /**
+ * @see javax.faces.render.Renderer#getRendersChildren()
+ */
+ public boolean getRendersChildren()
+ {
+ return true;
+ }
+}
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index 4a5e2a1ac6..2e4aa100fa 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -1869,6 +1869,24 @@
ChildAssociationGenerator
org.alfresco.web.bean.generator.ChildAssociationGenerator
request
+
+
+
+
+ Bean that generates a separator component
+
+ SeparatorGenerator
+ org.alfresco.web.bean.generator.SeparatorGenerator
+ request
+
+
+
+
+ Bean that generates a header separator component
+
+ HeaderSeparatorGenerator
+ org.alfresco.web.bean.generator.HeaderSeparatorGenerator
+ request
diff --git a/source/web/WEB-INF/faces-config-repo.xml b/source/web/WEB-INF/faces-config-repo.xml
index c7869359a3..2bd25e9e89 100644
--- a/source/web/WEB-INF/faces-config-repo.xml
+++ b/source/web/WEB-INF/faces-config-repo.xml
@@ -12,6 +12,11 @@
org.alfresco.faces.Property
org.alfresco.web.ui.repo.component.property.UIProperty
+
+
+
+ org.alfresco.faces.Separator
+ org.alfresco.web.ui.repo.component.property.UISeparator
@@ -170,6 +175,12 @@
org.alfresco.faces.Property
org.alfresco.faces.PropertyRenderer
org.alfresco.web.ui.repo.renderer.property.PropertyRenderer
+
+
+
+ org.alfresco.faces.Separator
+ org.alfresco.faces.SeparatorRenderer
+ org.alfresco.web.ui.repo.renderer.property.SeparatorRenderer
|