You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/10/09 19:44:05 UTC

svn commit: r583236 - in /myfaces/orchestra/trunk: core/ core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/ core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/ core15/src/main/java/org/apache/myfaces/orche...

Author: imario
Date: Tue Oct  9 10:44:03 2007
New Revision: 583236

URL: http://svn.apache.org/viewvc?rev=583236&view=rev
Log:
fixed orchestra-maven reference in trunk
dynaForm: added ability to render all id fields in display-only mode

Modified:
    myfaces/orchestra/trunk/core/pom.xml
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaForm.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormRenderer.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormTag.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/GuiBuilder.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/Slipstream.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilderDecorator.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/ejb/EjbExtractor.java
    myfaces/orchestra/trunk/core15/src/main/tld/myfaces_orchestra15.tld
    myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java

Modified: myfaces/orchestra/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/pom.xml?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/pom.xml (original)
+++ myfaces/orchestra/trunk/core/pom.xml Tue Oct  9 10:44:03 2007
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.apache.myfaces.orchestra</groupId>
 		<artifactId>myfaces-orchestra-maven</artifactId>
-		<version>1.0</version>
+		<version>1.1-SNAPSHOT</version>
 	</parent>
 
 	<scm>

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaForm.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaForm.java?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaForm.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaForm.java Tue Oct  9 10:44:03 2007
@@ -46,8 +46,9 @@
 	private String valueBindingPrefix;
 	private Boolean displayOnly;
 	private Boolean exclusiveFields;
+    private Boolean idAsDisplayOnly;
 
-	@Transient
+    @Transient
 	private transient UriResolver.Configuration configuration = null;
 	private transient DynaConfigs formConfigs = null;
 
@@ -148,7 +149,7 @@
 	}
 
 	/**
-	 * @see #setVar
+	 * @see #setDisplayOnly(boolean)
 	 */
 	public boolean isDisplayOnly()
 	{
@@ -169,7 +170,37 @@
 		return false;
 	}
 
-	/**
+    /**
+     * Display id fields in form in read only mode
+     */
+    public void setIdAsDisplayOnly(boolean idAsDisplayOnly)
+    {
+        this.idAsDisplayOnly = idAsDisplayOnly;
+    }
+
+    /**
+     * @see #setIdAsDisplayOnly(boolean)
+     */
+    public boolean isIdAsDisplayOnly()
+    {
+        if (idAsDisplayOnly != null)
+        {
+            return idAsDisplayOnly.booleanValue();
+        }
+        ValueBinding vb = getValueBinding("idAsDisplayOnly");
+        if (vb != null)
+        {
+            Boolean ret = (Boolean) vb.getValue(getFacesContext());
+            if (ret != null)
+            {
+                return ret.booleanValue();
+            }
+        }
+
+        return false;
+    }
+
+    /**
 	 * Process only fields listed by their facets
 	 */
 	public void setExclusiveFields(boolean exclusiveFields)
@@ -217,7 +248,8 @@
 		displayOnly = (Boolean) states[2];
 		bundle = (String) states[3];
 		valueBindingPrefix = (String) states[4];
-	}
+        idAsDisplayOnly = (Boolean) states[5];
+    }
 
 	@Override
 	public Object saveState(FacesContext context)
@@ -229,8 +261,9 @@
 				// var,
 				displayOnly,
 				bundle,
-				valueBindingPrefix
-			};
+				valueBindingPrefix,
+                idAsDisplayOnly
+            };
 	}
 
 	/**

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormRenderer.java?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormRenderer.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormRenderer.java Tue Oct  9 10:44:03 2007
@@ -227,6 +227,7 @@
 		Slipstream slipstream = new Slipstream();
 		slipstream.setModelMetaData(metaData);
 		slipstream.setDisplayOnly(dynaForm.isDisplayOnly());
+        slipstream.setIdAsDisplayOnly(dynaForm.isIdAsDisplayOnly());
 
 		if (dynaForm.getBundle() != null)
 		{

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormTag.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormTag.java?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormTag.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormTag.java Tue Oct  9 10:44:03 2007
@@ -30,15 +30,17 @@
 	private String displayOnly;
 	private String bundle;
 	private String exclusiveFields;
+    private String idAsDisplayOnly;
 
-	public void release()
+    public void release()
 	{
 		super.release();
 
 		uri = null;
 		// var = null;
 		displayOnly = null;
-		bundle = null;
+        idAsDisplayOnly = null;
+        bundle = null;
 		exclusiveFields = null;
 		valueBindingPrefix = null;
 	}
@@ -52,6 +54,7 @@
 		setBooleanProperty(component, "displayOnly", displayOnly);
 		setStringProperty(component, "bundle", bundle);
 		setBooleanProperty(component, "exclusiveFields", exclusiveFields);
+        setBooleanProperty(component, "idAsDisplayOnly", idAsDisplayOnly);
 	}
 
 	/**
@@ -102,7 +105,23 @@
 		this.displayOnly = displayOnly;
 	}
 
-	/**
+    /**
+     * @see DynaForm#setIdAsDisplayOnly(boolean)
+     */
+    public String getIdAsDisplayOnly()
+    {
+        return idAsDisplayOnly;
+    }
+
+    /**
+     * @see DynaForm#setIdAsDisplayOnly(boolean)
+     */
+    public void setIdAsDisplayOnly(String idAsDisplayOnly)
+    {
+        this.idAsDisplayOnly = idAsDisplayOnly;
+    }
+
+    /**
 	 * @see DynaForm#setBundle(String)
 	 */
 	public String getBundle()

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/GuiBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/GuiBuilder.java?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/GuiBuilder.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/GuiBuilder.java Tue Oct  9 10:44:03 2007
@@ -31,17 +31,17 @@
  */
 public abstract class GuiBuilder
 {
+    private boolean idAsDisplayOnly;
 	private boolean displayOnly;
 	private Map labelBundle;
 
-	/**
-	 * @see #setDisplayOnly(boolean)
-	 */
-	public boolean isDisplayOnly()
-	{
-		return displayOnly;
-	}
-
+    /**
+     * check if this field should be rendered display only
+     */
+    protected boolean isDisplayOnly(FieldInterface field)
+    {
+        return displayOnly || (isIdAsDisplayOnly() && field.isId());
+    }
 	/**
 	 * set if the guiBuilder should build a read only form only
 	 */
@@ -50,7 +50,23 @@
 		this.displayOnly = displayOnly;
 	}
 
-	/**
+    /**
+     * @see #setIdAsDisplayOnly(boolean)
+     */
+    public boolean isIdAsDisplayOnly()
+    {
+        return idAsDisplayOnly;
+    }
+
+    /**
+     * set if the guiBuilder should build all id fields display only 
+     */
+    public void setIdAsDisplayOnly(boolean idAsDisplayOnly)
+    {
+        this.idAsDisplayOnly = idAsDisplayOnly;
+    }
+
+    /**
 	 * @see #setLabelBundle(Map)
 	 */
 	public Map getLabelBundle()

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/Slipstream.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/Slipstream.java?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/Slipstream.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/Slipstream.java Tue Oct  9 10:44:03 2007
@@ -30,6 +30,7 @@
 public class Slipstream
 {
 	private boolean displayOnly;
+    private boolean idAsDisplayOnly;
 	private MetaDataInterface modelMetaData;
 	private GuiBuilder guiBuilder;
 	private Map labelBundle;
@@ -48,7 +49,17 @@
 		this.displayOnly = displayOnly;
 	}
 
-	public MetaDataInterface getModelMetaData()
+    public boolean isIdAsDisplayOnly()
+    {
+        return idAsDisplayOnly;
+    }
+
+    public void setIdAsDisplayOnly(boolean idAsDisplayOnly)
+    {
+        this.idAsDisplayOnly = idAsDisplayOnly;
+    }
+
+    public MetaDataInterface getModelMetaData()
 	{
 		return modelMetaData;
 	}
@@ -97,6 +108,6 @@
 	{
 		guiBuilder.setDisplayOnly(isDisplayOnly());
 		guiBuilder.setLabelBundle(getLabelBundle());
-	}
-
+        guiBuilder.setIdAsDisplayOnly(isIdAsDisplayOnly());
+    }
 }

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java Tue Oct  9 10:44:03 2007
@@ -73,7 +73,6 @@
 	private FacesContext context;
 	private NewComponentListener newComponentListener;
 	private String backingEntityPrefix;
-	// private String backingBeanPrefix;
 
 	private static final Map<String, JsfGuiElementBuilder> builderMap = new TreeMap<String, JsfGuiElementBuilder>();
 
@@ -138,7 +137,7 @@
 	public void createInputDate(FieldInterface field)
 	{
 		UIComponent cmp;
-		if (!isDisplayOnly())
+		if (!isDisplayOnly(field))
 		{
 			cmp = doCreateInputDate(field);
 		}
@@ -153,7 +152,7 @@
 	public void createInputText(FieldInterface field)
 	{
 		UIComponent cmp;
-		if (!isDisplayOnly())
+		if (!isDisplayOnly(field))
 		{
 			cmp = doCreateInputText(field);
 		}
@@ -168,7 +167,7 @@
 	public void createInputNumber(FieldInterface field)
 	{
 		UIComponent cmp;
-		if (!isDisplayOnly())
+		if (!isDisplayOnly(field))
 		{
 			cmp = doCreateInputNumber(field);
 		}
@@ -183,7 +182,7 @@
 	public void createInputBoolean(FieldInterface field)
 	{
 		UIComponent cmp;
-		if (!isDisplayOnly())
+		if (!isDisplayOnly(field))
 		{
 			cmp = doCreateInputBoolean(field);
 		}
@@ -198,7 +197,7 @@
 	public void createSelectOneMenu(FieldInterface field)
 	{
 		UIComponent cmp;
-		if (!isDisplayOnly())
+		if (!isDisplayOnly(field))
 		{
 			cmp = doCreateSelectOneMenu(field);
 		}
@@ -213,7 +212,7 @@
 	public void createSearchFor(FieldInterface field)
 	{
 		UIComponent cmp;
-		if (!isDisplayOnly())
+		if (!isDisplayOnly(field))
 		{
 			cmp = doCreateSearchFor(field);
 		}
@@ -228,7 +227,7 @@
 	public void createSearchForSelectMenu(FieldInterface field)
 	{
 		UIComponent cmp;
-		if (!isDisplayOnly())
+		if (!isDisplayOnly(field))
 		{
 			cmp = doCreateSearchForSelectMenu(field);
 		}
@@ -244,7 +243,7 @@
 	public void createSearchForSelectMenu(FieldInterface field)
 	{
 		UIComponent cmp;
-		if (!isDisplayOnly())
+		if (!isDisplayOnly(field))
 		{
 			cmp = doCreateSearchForSelectMenu(field);
 		}

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilderDecorator.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilderDecorator.java?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilderDecorator.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilderDecorator.java Tue Oct  9 10:44:03 2007
@@ -275,11 +275,6 @@
 		original.initValueBinding(cmp, field);
 	}
 
-	public boolean isDisplayOnly()
-	{
-		return original.isDisplayOnly();
-	}
-
 	/*
 	public void setBackingBeanPrefix(String backingBeanPrefix)
 	{

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java Tue Oct  9 10:44:03 2007
@@ -36,7 +36,9 @@
 
 	public boolean isEntityType();
 
-	public Boolean getDisabled();
+    public boolean isId();
+
+    public Boolean getDisabled();
 
 	public Boolean getCanRead();
 

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java Tue Oct  9 10:44:03 2007
@@ -52,6 +52,7 @@
 		private String preferredExternalName;
 		private Class type;
 		private boolean entityType;
+        private boolean id;
 		private Boolean canRead;
 		private Boolean canWrite;
 		private Boolean disabled;
@@ -319,12 +320,22 @@
 			return entityType;
 		}
 
-		public void setEntityType(boolean entityType)
+        public void setEntityType(boolean entityType)
 		{
 			this.entityType = entityType;
 		}
 
-		public boolean isEmbedded()
+        public boolean isId()
+        {
+            return id;
+        }
+
+        public void setId(boolean id)
+        {
+            this.id = id;
+        }
+
+        public boolean isEmbedded()
 		{
 			return embedded;
 		}

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/ejb/EjbExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/ejb/EjbExtractor.java?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/ejb/EjbExtractor.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/ejb/EjbExtractor.java Tue Oct  9 10:44:03 2007
@@ -74,17 +74,19 @@
 
 	protected static class ContextInfo
 	{
-		private Boolean accessField;
-		private String name;
-		private boolean embedded;
+		private final Boolean accessField;
+		private final String name;
+		private final boolean embedded;
+        private final boolean id;
 
-		protected ContextInfo(final String name, final Boolean accessField, final boolean embedded)
+        protected ContextInfo(final String name, final Boolean accessField, final boolean embedded, final boolean id)
 		{
 			super();
 			this.name = name;
 			this.accessField = accessField;
 			this.embedded = embedded;
-		}
+            this.id = id;
+        }
 	}
 
 	protected static class Context
@@ -108,7 +110,7 @@
 			return accessField;
 		}
 
-		protected void startEmbedded(final String name, final boolean embedded)
+		protected void startEmbedded(final String name, final boolean embedded, final boolean id)
 		{
 			embeddLevel++;
 
@@ -118,7 +120,7 @@
 				contextName = accessFields.peek().name + "." + name;
 			}
 
-			accessFields.push(new ContextInfo(contextName, accessField, embedded));
+			accessFields.push(new ContextInfo(contextName, accessField, embedded, id));
 		}
 
 		protected void endEmbedded()
@@ -146,6 +148,16 @@
 
 			return accessFields.peek().embedded;
 		}
+
+        public boolean isId()
+        {
+            if (accessFields.isEmpty())
+            {
+                return true;
+            }
+
+            return accessFields.peek().id;
+        }
 	}
 
 	public EjbExtractor()
@@ -345,15 +357,18 @@
 
 	protected boolean processEmbedded(Context context, MetaData metaData, AccessibleObject accessibleObject, String name, Class<?> type)
 	{
-		if (accessibleObject.isAnnotationPresent(Embedded.class) || accessibleObject.isAnnotationPresent(Id.class))
+		if (accessibleObject.isAnnotationPresent(Embedded.class) || accessibleObject.isAnnotationPresent(Id.class) || accessibleObject.isAnnotationPresent(EmbeddedId.class))
 		{
 			if (type.isAnnotationPresent(Embeddable.class) || type.isAnnotationPresent(MappedSuperclass.class))
 			{
 				// process embedded type
 				try
 				{
-					context.startEmbedded(name, true);
-					create(context, metaData, type);
+                    boolean isId = context.isId() || accessibleObject.isAnnotationPresent(Id.class) || accessibleObject.isAnnotationPresent(EmbeddedId.class);
+
+                    context.startEmbedded(name, true, isId);
+
+                    create(context, metaData, type);
 				}
 				finally
 				{
@@ -410,7 +425,7 @@
 			{
 				previousLock = metaData.setLockFields(true);
 			}
-			context.startEmbedded(name, false);
+			context.startEmbedded(name, false, context.isId());
 			create(context, metaData, entityType);
 		}
 		finally
@@ -465,9 +480,16 @@
 			}
 		}
 
-		if (accessibleObject.isAnnotationPresent(Id.class))
+        if (accessibleObject.isAnnotationPresent(Id.class)
+            || accessibleObject.isAnnotationPresent(EmbeddedId.class)
+            || context.isId())
+        {
+            mdField.setId(true);
+        }
+
+        if (accessibleObject.isAnnotationPresent(Id.class))
 		{
-			// id column cant be written if its a generated value
+            // id column cant be written if its a generated value
 			if (accessibleObject.isAnnotationPresent(GeneratedValue.class))
 			{
 				setSpecialFieldDisabled(mdField);

Modified: myfaces/orchestra/trunk/core15/src/main/tld/myfaces_orchestra15.tld
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/tld/myfaces_orchestra15.tld?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/tld/myfaces_orchestra15.tld (original)
+++ myfaces/orchestra/trunk/core15/src/main/tld/myfaces_orchestra15.tld Tue Oct  9 10:44:03 2007
@@ -162,6 +162,15 @@
     </attribute>
 
     <attribute>
+      <name>idAsDisplayOnly</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+          Render id fields in the form in display (non editable) only mode
+      </description>
+    </attribute>
+
+    <attribute>
       <name>bundle</name>
       <required>false</required>
       <rtexprvalue>false</rtexprvalue>

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java?rev=583236&r1=583235&r2=583236&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java Tue Oct  9 10:44:03 2007
@@ -95,7 +95,7 @@
 	@Override
 	public void createInputDate(FieldInterface field)
 	{
-		if (isDisplayOnly())
+		if (isDisplayOnly(field))
 		{
 			super.createInputDate(field);
 			return;