svn commit: r673822 [6/7] - in /myfaces/orchestra/trunk: examples/src/main/java/org/apache/myfaces/examples/annotations/ examples/src/main/java/org/apache/myfaces/examples/ballot/backings/ examples/src/main/java/org/apache/myfaces/examples/ballot/dao/ ...

[sk...@apache.org]

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java Thu Jul  3 14:34:56 2008
@@ -20,27 +20,27 @@
 
 public class MyFacesCheck
 {
-	private static boolean myFacesAvailable;
+    private static boolean myFacesAvailable;
 
-	static
-	{
-		try
-		{
-			Class.forName("org.apache.myfaces.webapp.MyFacesServlet");
-			myFacesAvailable = true;
-		}
-		catch (ClassNotFoundException e)
-		{
-			myFacesAvailable = false;
-		}
-	}
+    static
+    {
+        try
+        {
+            Class.forName("org.apache.myfaces.webapp.MyFacesServlet");
+            myFacesAvailable = true;
+        }
+        catch (ClassNotFoundException e)
+        {
+            myFacesAvailable = false;
+        }
+    }
 
-	private MyFacesCheck()
-	{
-	}
+    private MyFacesCheck()
+    {
+    }
 
-	public static boolean isMyFacesAvailable()
-	{
-		return myFacesAvailable;
-	}
+    public static boolean isMyFacesAvailable()
+    {
+        return myFacesAvailable;
+    }
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java Thu Jul  3 14:34:56 2008
@@ -39,15 +39,15 @@
  */
 public class MyFacesGuiBuilder extends JsfGuiBuilder
 {
-	public MyFacesGuiBuilder()
-	{
-		super();
-	}
-
-	/* TODO: SANDBOX COMPONENT - promote to tomahawk */
-	@Override
-	public Converter doCreateConverter(MetaField field)
-	{
+    public MyFacesGuiBuilder()
+    {
+        super();
+    }
+
+    /* TODO: SANDBOX COMPONENT - promote to tomahawk */
+    @Override
+    public Converter doCreateConverter(MetaField field)
+    {
         Class type = field.getType();
 
         if (Float.class.isAssignableFrom(type)
@@ -55,19 +55,19 @@
             || float.class.isAssignableFrom(type)
             || double.class.isAssignableFrom(type)
             || BigDecimal.class.isAssignableFrom(type))
-		{
-			// use the super duper intelligent number converter
-			TypedNumberConverter converter = (TypedNumberConverter) getContext().getApplication().createConverter(TypedNumberConverter.CONVERTER_ID);
-			converter.setDestType(type);
-			return converter;
-		}
-
-		return super.doCreateConverter(field);
-	}
-
-	@Override
-	public HtmlInputText doCreateInputDateComponent(MetaField field)
-	{
+        {
+            // use the super duper intelligent number converter
+            TypedNumberConverter converter = (TypedNumberConverter) getContext().getApplication().createConverter(TypedNumberConverter.CONVERTER_ID);
+            converter.setDestType(type);
+            return converter;
+        }
+
+        return super.doCreateConverter(field);
+    }
+
+    @Override
+    public HtmlInputText doCreateInputDateComponent(MetaField field)
+    {
         if (!TemporalType.DATE.equals(field.getTemporalType()))
         {
             // we can select dates only - yet!
@@ -75,84 +75,84 @@
         }
 
         HtmlInputCalendar cmp = (HtmlInputCalendar) getContext()
-				.getApplication().createComponent(
-						HtmlInputCalendar.COMPONENT_TYPE);
-		cmp.setRenderAsPopup(true);
-
-		if (Boolean.FALSE.equals(field.getCanWrite()))
-		{
-			cmp.setReadonly(true);
-		}
-		if (Boolean.TRUE.equals(field.getDisabled()))
-		{
-			cmp.setDisabled(true);
-		}
-
-		return cmp;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void createInputDate(MetaField field)
-	{
-		if (isFieldDisplayOnly(field))
-		{
-			super.createInputDate(field);
-			return;
-		}
-
-		UIComponent cmp = doCreateInputDate(field);
-
-		// workaround to avoid wrap of date-component and its button ==>
-		HtmlPanelGroup panel = doCreatePanelGroupComponent();
-		panel.setId("pnl_" + cmp.getId());
-		panel.getChildren().add(cmp);
-		panel.setStyle("white-space:nowrap;");
-		// <==
-
-		fireNewComponent(field, panel);
-	}
-
-	/* TODO: SANDBOX COMPONENT - promote to tomahawk */
-	@Override
-	public UIComponent doCreateSearchFor(MetaField field)
-	{
-		HtmlPanelGroup panel = doCreatePanelGroupComponent();
-
-		InputSuggestAjax cmp = (InputSuggestAjax) getContext()
-			.getApplication().createComponent(InputSuggestAjax.COMPONENT_TYPE);
-		initInputDefaults(cmp, field);
-
-		String dataSource = field.getDataSource();
-		String dataSourceDescription = field.getDataSourceDescription();
-
-		MethodBinding mbSearch = FacesContext.getCurrentInstance().getApplication().createMethodBinding(
-			dataSource,
-			new Class[]
-				{
-					String.class
-				});
-		MethodBinding mbLabel = FacesContext.getCurrentInstance().getApplication().createMethodBinding(
-			dataSourceDescription,
-			new Class[]
-				{
-					field.getType()
-				});
-
-		cmp.setSuggestedItemsMethod(mbSearch);
-		cmp.setItemLabelMethod(mbLabel);
-		// set dojo-autocomplete to false to allow "in string search"
-		cmp.setAutoComplete(Boolean.FALSE);
-		// set html-autocomplete to false to avoid having the browser rendering its
-		// "autocomplete/lookup old values" stuff
-		cmp.setAutocomplete("off"); // NON-NLS
-
-		if (cmp.getConverter() == null)
-		{
-			cmp.setConverter(new ObjectSerializationConverter());
-		}
-
-		panel.getChildren().add(cmp);
-		return panel;
-	}
+                .getApplication().createComponent(
+                        HtmlInputCalendar.COMPONENT_TYPE);
+        cmp.setRenderAsPopup(true);
+
+        if (Boolean.FALSE.equals(field.getCanWrite()))
+        {
+            cmp.setReadonly(true);
+        }
+        if (Boolean.TRUE.equals(field.getDisabled()))
+        {
+            cmp.setDisabled(true);
+        }
+
+        return cmp;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void createInputDate(MetaField field)
+    {
+        if (isFieldDisplayOnly(field))
+        {
+            super.createInputDate(field);
+            return;
+        }
+
+        UIComponent cmp = doCreateInputDate(field);
+
+        // workaround to avoid wrap of date-component and its button ==>
+        HtmlPanelGroup panel = doCreatePanelGroupComponent();
+        panel.setId("pnl_" + cmp.getId());
+        panel.getChildren().add(cmp);
+        panel.setStyle("white-space:nowrap;");
+        // <==
+
+        fireNewComponent(field, panel);
+    }
+
+    /* TODO: SANDBOX COMPONENT - promote to tomahawk */
+    @Override
+    public UIComponent doCreateSearchFor(MetaField field)
+    {
+        HtmlPanelGroup panel = doCreatePanelGroupComponent();
+
+        InputSuggestAjax cmp = (InputSuggestAjax) getContext()
+            .getApplication().createComponent(InputSuggestAjax.COMPONENT_TYPE);
+        initInputDefaults(cmp, field);
+
+        String dataSource = field.getDataSource();
+        String dataSourceDescription = field.getDataSourceDescription();
+
+        MethodBinding mbSearch = FacesContext.getCurrentInstance().getApplication().createMethodBinding(
+            dataSource,
+            new Class[]
+                {
+                    String.class
+                });
+        MethodBinding mbLabel = FacesContext.getCurrentInstance().getApplication().createMethodBinding(
+            dataSourceDescription,
+            new Class[]
+                {
+                    field.getType()
+                });
+
+        cmp.setSuggestedItemsMethod(mbSearch);
+        cmp.setItemLabelMethod(mbLabel);
+        // set dojo-autocomplete to false to allow "in string search"
+        cmp.setAutoComplete(Boolean.FALSE);
+        // set html-autocomplete to false to avoid having the browser rendering its
+        // "autocomplete/lookup old values" stuff
+        cmp.setAutocomplete("off"); // NON-NLS
+
+        if (cmp.getConverter() == null)
+        {
+            cmp.setConverter(new ObjectSerializationConverter());
+        }
+
+        panel.getChildren().add(cmp);
+        return panel;
+    }
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/SuggestSelectListMethodWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/SuggestSelectListMethodWrapper.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/SuggestSelectListMethodWrapper.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/SuggestSelectListMethodWrapper.java Thu Jul  3 14:34:56 2008
@@ -35,129 +35,129 @@
  */
 public class SuggestSelectListMethodWrapper extends MethodBinding
 {
-	private final MethodBinding original;
-	private final String valueProperty;
-	private final String[] descriptionPropertiesArray;
-
-	SuggestSelectListMethodWrapper(MethodBinding original, String valueProperty, String descriptionProperties)
-	{
-		this.original = original;
-		this.valueProperty = valueProperty;
-		if (descriptionProperties != null)
-		{
-			descriptionPropertiesArray = descriptionProperties.split(",\\s*");
-		}
-		else
-		{
-			descriptionPropertiesArray = new String[]{};
-		}
-	}
-
-	@Override
-	public Class<?> getType(FacesContext facesContext) throws MethodNotFoundException
-	{
-		return List.class;
-	}
-
-	@Override
-	public Object invoke(FacesContext facesContext, Object[] objects) throws EvaluationException
-	{
-		Object items = original.invoke(facesContext, objects);
-		if (items == null)
-		{
-			return items;
-		}
-
-		if (!(items instanceof Collection))
-		{
-			throw new UnsupportedOperationException("unknown return type " + items.getClass().getName() + " for " + getExpressionString() + " awaited instanceof java.util.Collection");
-		}
-
-		Collection<?> coll = (Collection<?>) items;
-
-		List<SelectItem> selectItems = new ArrayList<SelectItem>(coll.size());
-		for (Object o : coll)
-		{
-			SelectItem si;
-
-			if (o instanceof SelectItem)
-			{
-				si = (SelectItem) o;
-			}
-			else
-			{
-				Object value = getValueProperty(o, valueProperty);
-				String description = buildDescription(o, descriptionPropertiesArray);
-
-				si = new SelectItem(value, description);
-			}
-
-			selectItems.add(si);
-		}
-
-		return selectItems;
-	}
-
-	protected String buildDescription(Object o, String[] descriptionPropertiesArray)
-	{
-		StringBuffer sb = new StringBuffer(80);
-
-		for (String descriptionProperty : descriptionPropertiesArray)
-		{
-			Object descriptionValue = null;
-			try
-			{
-				descriptionValue = BeanUtils.getProperty(o, descriptionProperty);
-			}
-			catch (IllegalAccessException e)
-			{
-				throw new EvaluationException(e);
-			}
-			catch (InvocationTargetException e)
-			{
-				throw new EvaluationException(e);
-			}
-			catch (NoSuchMethodException e)
-			{
-				throw new EvaluationException(e);
-			}
-
-			if (descriptionValue != null)
-			{
-				if (sb.length() > 0)
-				{
-					sb.append(", ");
-				}
-
-				sb.append(descriptionValue);
-			}
-		}
-
-		return sb.toString();
-	}
-
-	protected Object getValueProperty(Object o, String valueProperty)
-	{
-		if (valueProperty == null || valueProperty.trim().length() < 1)
-		{
-			return o;
-		}
-
-		try
-		{
-			return BeanUtils.getProperty(o, valueProperty);
-		}
-		catch (IllegalAccessException e)
-		{
-			throw new EvaluationException(e);
-		}
-		catch (InvocationTargetException e)
-		{
-			throw new EvaluationException(e);
-		}
-		catch (NoSuchMethodException e)
-		{
-			throw new EvaluationException(e);
-		}
-	}
+    private final MethodBinding original;
+    private final String valueProperty;
+    private final String[] descriptionPropertiesArray;
+
+    SuggestSelectListMethodWrapper(MethodBinding original, String valueProperty, String descriptionProperties)
+    {
+        this.original = original;
+        this.valueProperty = valueProperty;
+        if (descriptionProperties != null)
+        {
+            descriptionPropertiesArray = descriptionProperties.split(",\\s*");
+        }
+        else
+        {
+            descriptionPropertiesArray = new String[]{};
+        }
+    }
+
+    @Override
+    public Class<?> getType(FacesContext facesContext) throws MethodNotFoundException
+    {
+        return List.class;
+    }
+
+    @Override
+    public Object invoke(FacesContext facesContext, Object[] objects) throws EvaluationException
+    {
+        Object items = original.invoke(facesContext, objects);
+        if (items == null)
+        {
+            return items;
+        }
+
+        if (!(items instanceof Collection))
+        {
+            throw new UnsupportedOperationException("unknown return type " + items.getClass().getName() + " for " + getExpressionString() + " awaited instanceof java.util.Collection");
+        }
+
+        Collection<?> coll = (Collection<?>) items;
+
+        List<SelectItem> selectItems = new ArrayList<SelectItem>(coll.size());
+        for (Object o : coll)
+        {
+            SelectItem si;
+
+            if (o instanceof SelectItem)
+            {
+                si = (SelectItem) o;
+            }
+            else
+            {
+                Object value = getValueProperty(o, valueProperty);
+                String description = buildDescription(o, descriptionPropertiesArray);
+
+                si = new SelectItem(value, description);
+            }
+
+            selectItems.add(si);
+        }
+
+        return selectItems;
+    }
+
+    protected String buildDescription(Object o, String[] descriptionPropertiesArray)
+    {
+        StringBuffer sb = new StringBuffer(80);
+
+        for (String descriptionProperty : descriptionPropertiesArray)
+        {
+            Object descriptionValue = null;
+            try
+            {
+                descriptionValue = BeanUtils.getProperty(o, descriptionProperty);
+            }
+            catch (IllegalAccessException e)
+            {
+                throw new EvaluationException(e);
+            }
+            catch (InvocationTargetException e)
+            {
+                throw new EvaluationException(e);
+            }
+            catch (NoSuchMethodException e)
+            {
+                throw new EvaluationException(e);
+            }
+
+            if (descriptionValue != null)
+            {
+                if (sb.length() > 0)
+                {
+                    sb.append(", ");
+                }
+
+                sb.append(descriptionValue);
+            }
+        }
+
+        return sb.toString();
+    }
+
+    protected Object getValueProperty(Object o, String valueProperty)
+    {
+        if (valueProperty == null || valueProperty.trim().length() < 1)
+        {
+            return o;
+        }
+
+        try
+        {
+            return BeanUtils.getProperty(o, valueProperty);
+        }
+        catch (IllegalAccessException e)
+        {
+            throw new EvaluationException(e);
+        }
+        catch (InvocationTargetException e)
+        {
+            throw new EvaluationException(e);
+        }
+        catch (NoSuchMethodException e)
+        {
+            throw new EvaluationException(e);
+        }
+    }
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ConditionEnum.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ConditionEnum.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ConditionEnum.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ConditionEnum.java Thu Jul  3 14:34:56 2008
@@ -20,15 +20,15 @@
 
 public enum ConditionEnum
 {
-	auto,
-	eq,
-	ne,
-	gt,
-	lt,
-	ge,
-	le,
-	isNull,
-	isNotNull,
-	like,
-	ilike
+    auto,
+    eq,
+    ne,
+    gt,
+    lt,
+    ge,
+    le,
+    isNull,
+    isNotNull,
+    like,
+    ilike
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/DefaultValueMap.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/DefaultValueMap.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/DefaultValueMap.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/DefaultValueMap.java Thu Jul  3 14:34:56 2008
@@ -25,97 +25,97 @@
 
 public class DefaultValueMap<K, V> implements Map<K, V>, Serializable
 {
-	private static final long serialVersionUID = -1311019539599397096L;
+    private static final long serialVersionUID = -1311019539599397096L;
 
-	private final Map<K, V> original;
-	private final DefaultValueFactory<V> defaultValueFactory;
+    private final Map<K, V> original;
+    private final DefaultValueFactory<V> defaultValueFactory;
 
-	public static interface DefaultValueFactory<V> extends Serializable
-	{
-		public V create();
-	}
-
-	public DefaultValueMap(Map<K, V> original, DefaultValueFactory<V> defaultValueFactory)
-	{
-		this.original = original;
-		this.defaultValueFactory = defaultValueFactory;
-	}
-
-	public void clear()
-	{
-		original.clear();
-	}
-
-	public boolean containsKey(Object key)
-	{
-		return original.containsKey(key);
-	}
-
-	public boolean containsValue(Object value)
-	{
-		return original.containsValue(value);
-	}
-
-	public Set<Entry<K, V>> entrySet()
-	{
-		return original.entrySet();
-	}
-
-	public boolean equals(Object o)
-	{
-		return original.equals(o);
-	}
-
-	@SuppressWarnings("unchecked")
-	public V get(Object key)
-	{
-		V ret = original.get(key);
-		if (ret == null)
-		{
-			ret = defaultValueFactory.create();
-			original.put((K) key, ret);
-		}
-
-		return ret;
-	}
-
-	public int hashCode()
-	{
-		return original.hashCode();
-	}
-
-	public boolean isEmpty()
-	{
-		return original.isEmpty();
-	}
-
-	public Set<K> keySet()
-	{
-		return original.keySet();
-	}
-
-	public V put(K key, V value)
-	{
-		return original.put(key, value);
-	}
-
-	public void putAll(Map<? extends K, ? extends V> t)
-	{
-		original.putAll(t);
-	}
-
-	public V remove(Object key)
-	{
-		return original.remove(key);
-	}
-
-	public int size()
-	{
-		return original.size();
-	}
-
-	public Collection<V> values()
-	{
-		return original.values();
-	}
+    public static interface DefaultValueFactory<V> extends Serializable
+    {
+        public V create();
+    }
+
+    public DefaultValueMap(Map<K, V> original, DefaultValueFactory<V> defaultValueFactory)
+    {
+        this.original = original;
+        this.defaultValueFactory = defaultValueFactory;
+    }
+
+    public void clear()
+    {
+        original.clear();
+    }
+
+    public boolean containsKey(Object key)
+    {
+        return original.containsKey(key);
+    }
+
+    public boolean containsValue(Object value)
+    {
+        return original.containsValue(value);
+    }
+
+    public Set<Entry<K, V>> entrySet()
+    {
+        return original.entrySet();
+    }
+
+    public boolean equals(Object o)
+    {
+        return original.equals(o);
+    }
+
+    @SuppressWarnings("unchecked")
+    public V get(Object key)
+    {
+        V ret = original.get(key);
+        if (ret == null)
+        {
+            ret = defaultValueFactory.create();
+            original.put((K) key, ret);
+        }
+
+        return ret;
+    }
+
+    public int hashCode()
+    {
+        return original.hashCode();
+    }
+
+    public boolean isEmpty()
+    {
+        return original.isEmpty();
+    }
+
+    public Set<K> keySet()
+    {
+        return original.keySet();
+    }
+
+    public V put(K key, V value)
+    {
+        return original.put(key, value);
+    }
+
+    public void putAll(Map<? extends K, ? extends V> t)
+    {
+        original.putAll(t);
+    }
+
+    public V remove(Object key)
+    {
+        return original.remove(key);
+    }
+
+    public int size()
+    {
+        return original.size();
+    }
+
+    public Collection<V> values()
+    {
+        return original.values();
+    }
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/DynaFormException.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/DynaFormException.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/DynaFormException.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/DynaFormException.java Thu Jul  3 14:34:56 2008
@@ -21,23 +21,23 @@
 @SuppressWarnings("serial")
 public class DynaFormException extends RuntimeException
 {
-	public DynaFormException()
-	{
-		super();
-	}
+    public DynaFormException()
+    {
+        super();
+    }
 
-	public DynaFormException(String message)
-	{
-		super(message);
-	}
+    public DynaFormException(String message)
+    {
+        super(message);
+    }
 
-	public DynaFormException(String message, Throwable cause)
-	{
-		super(message, cause);
-	}
+    public DynaFormException(String message, Throwable cause)
+    {
+        super(message, cause);
+    }
 
-	public DynaFormException(Throwable cause)
-	{
-		super(cause);
-	}
+    public DynaFormException(Throwable cause)
+    {
+        super(cause);
+    }
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/MatchModeEnum.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/MatchModeEnum.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/MatchModeEnum.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/MatchModeEnum.java Thu Jul  3 14:34:56 2008
@@ -20,8 +20,8 @@
 
 public enum MatchModeEnum
 {
-	none,
-	start,
-	end,
-	anywhere
+    none,
+    start,
+    end,
+    anywhere
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/NullObject.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/NullObject.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/NullObject.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/NullObject.java Thu Jul  3 14:34:56 2008
@@ -22,15 +22,15 @@
 
 public class NullObject implements Serializable
 {
-	private static final long serialVersionUID = -5631278744813815987L;
+    private static final long serialVersionUID = -5631278744813815987L;
 
-	public NullObject()
-	{
-	}
+    public NullObject()
+    {
+    }
 
-	@Override
-	public boolean equals(Object obj)
-	{
-		return obj == null || obj instanceof NullObject;
-	}
+    @Override
+    public boolean equals(Object obj)
+    {
+        return obj == null || obj instanceof NullObject;
+    }
 }
\ No newline at end of file

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ObjectSerializationConverter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ObjectSerializationConverter.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ObjectSerializationConverter.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ObjectSerializationConverter.java Thu Jul  3 14:34:56 2008
@@ -38,84 +38,84 @@
  */
 public class ObjectSerializationConverter implements Converter
 {
-	public static final NullObject SELECT_NULL_OBJECT = new NullObject();
+    public static final NullObject SELECT_NULL_OBJECT = new NullObject();
 
-	public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException
-	{
-		if (value == null || value.length() < 1 || SELECT_NULL_OBJECT.equals(value))
-		{
-			return null;
-		}
+    public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException
+    {
+        if (value == null || value.length() < 1 || SELECT_NULL_OBJECT.equals(value))
+        {
+            return null;
+        }
 
-		ObjectInputStream ois = null;
-		Serializable objectIdent;
-		try
-		{
-			byte[] base64 = Base64.decodeBase64(value.getBytes("UTF-8"));
-			ois = new ObjectInputStream(new ByteArrayInputStream(base64));
-			objectIdent = (Serializable) ois.readObject();
-			ois.close();
-		}
-		catch (IOException e)
-		{
-			throw new ConverterException(e);
-		}
-		catch (ClassNotFoundException e)
-		{
-			throw new ConverterException(e);
-		}
-		finally
-		{
-			if (ois != null)
-			{
-				try
-				{
-					ois.close();
-				}
-				catch (IOException e)
-				{
-					// consume exception, should never happen
-				}
-			}
-		}
+        ObjectInputStream ois = null;
+        Serializable objectIdent;
+        try
+        {
+            byte[] base64 = Base64.decodeBase64(value.getBytes("UTF-8"));
+            ois = new ObjectInputStream(new ByteArrayInputStream(base64));
+            objectIdent = (Serializable) ois.readObject();
+            ois.close();
+        }
+        catch (IOException e)
+        {
+            throw new ConverterException(e);
+        }
+        catch (ClassNotFoundException e)
+        {
+            throw new ConverterException(e);
+        }
+        finally
+        {
+            if (ois != null)
+            {
+                try
+                {
+                    ois.close();
+                }
+                catch (IOException e)
+                {
+                    // consume exception, should never happen
+                }
+            }
+        }
 
-		return objectIdent;
-	}
+        return objectIdent;
+    }
 
-	public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException
-	{
-		if (value == null || SELECT_NULL_OBJECT.equals(value))
-		{
-			return "";
-		}
+    public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException
+    {
+        if (value == null || SELECT_NULL_OBJECT.equals(value))
+        {
+            return "";
+        }
 
-		ObjectOutputStream oos = null;
-		try
-		{
-			ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
-			oos = new ObjectOutputStream(baos);
-			oos.writeObject(value);
-			byte[] base64 = Base64.encodeBase64(baos.toByteArray());
-			String objectString = new String(base64, "UTF-8");
-			return objectString;
-		}
-		catch (IOException e)
-		{
-			throw new ConverterException(e);
-		}
-		finally
-		{
-			if (oos != null)
-			{
-				try
-				{
-					oos.close();
-				}
-				catch (IOException e)
-				{
-					// consume exception, should never happen
-				}
-			}
-		}
-	}
+        ObjectOutputStream oos = null;
+        try
+        {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
+            oos = new ObjectOutputStream(baos);
+            oos.writeObject(value);
+            byte[] base64 = Base64.encodeBase64(baos.toByteArray());
+            String objectString = new String(base64, "UTF-8");
+            return objectString;
+        }
+        catch (IOException e)
+        {
+            throw new ConverterException(e);
+        }
+        finally
+        {
+            if (oos != null)
+            {
+                try
+                {
+                    oos.close();
+                }
+                catch (IOException e)
+                {
+                    // consume exception, should never happen
+                }
+            }
+        }
+    }
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/OrderDirectionEnum.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/OrderDirectionEnum.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/OrderDirectionEnum.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/OrderDirectionEnum.java Thu Jul  3 14:34:56 2008
@@ -20,6 +20,6 @@
 
 public enum OrderDirectionEnum
 {
-	asc,
-	desc
+    asc,
+    desc
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/SelectionSourceEnum.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/SelectionSourceEnum.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/SelectionSourceEnum.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/SelectionSourceEnum.java Thu Jul  3 14:34:56 2008
@@ -20,7 +20,7 @@
 
 public enum SelectionSourceEnum
 {
-	manual,
-	relation,
-	distinct
+    manual,
+    relation,
+    distinct
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/SelectionTypeEnum.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/SelectionTypeEnum.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/SelectionTypeEnum.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/SelectionTypeEnum.java Thu Jul  3 14:34:56 2008
@@ -20,7 +20,7 @@
 
 public enum SelectionTypeEnum
 {
-	none,
-	one,
-	many
+    none,
+    one,
+    many
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ViewType.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ViewType.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ViewType.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/ViewType.java Thu Jul  3 14:34:56 2008
@@ -20,6 +20,6 @@
 
 public enum ViewType
 {
-	FORM,
-	LIST
+    FORM,
+    LIST
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/_FacesUtils.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/_FacesUtils.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/_FacesUtils.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/lib/_FacesUtils.java Thu Jul  3 14:34:56 2008
@@ -35,118 +35,118 @@
  */
 public final class _FacesUtils
 {
-	private static final Class<?>[] ARGS_SET_VALUE_EXPR = new Class[]
+    private static final Class<?>[] ARGS_SET_VALUE_EXPR = new Class[]
     {
         String.class,
         ValueExpression.class
     };
 
-	private static final Class<?>[] ARGS_GET_VALUE_EXPR = new Class[]
+    private static final Class<?>[] ARGS_GET_VALUE_EXPR = new Class[]
     {
         String.class
     };
 
-	private static final Method _methodGELC = getMethod(FacesContext.class, "getELContext", (Class[]) null);
-	private static final Method _methodGVE = getMethod(UIComponent.class, "getValueExpression", ARGS_GET_VALUE_EXPR);
-	private static final Method _methodSVE = getMethod(UIComponent.class, "setValueExpression", ARGS_SET_VALUE_EXPR);
-	private static final Method _methodEF = getMethod(Application.class, "getExpressionFactory", (Class[]) null);
-
-	private _FacesUtils()
-	{
-	}
-
-	private static Method getMethod(Class<?> clazz, String name, Class<?>[] args)
-	{
-		try
-		{
-			return clazz.getMethod(name, args);
-		}
-		catch(Exception e)
-		{
-			return null;
-		}
-	}
-
-	private static <T> T invoke(Class<T> retType, Method method, Object target, Object[] args)
-	throws FacesException
-	{
-		try
-		{
-			@SuppressWarnings("unchecked")
-			T result = (T) method.invoke(target, args);
-			return result;
-		}
-		catch(IllegalAccessException e)
-		{
-			// should never happen
-			throw new FacesException("Unable to invoke standard JSF method", e);
-		}
-		catch(InvocationTargetException e)
-		{
-			// should never happen
-			throw new FacesException("Unable to invoke standard JSF method", e);
-		}
-	}
-
-	public static void copyRendered(UIComponent source, UIComponent destination)
-	{
-		boolean renderedSet = false;
-		if (_methodGVE != null)
-		{
-			ValueExpression ve = invoke(ValueExpression.class, _methodGVE, source, new Object[] {"rendered"});
-			if (ve != null)
-			{
-				invoke(Void.class, _methodSVE, destination, new Object[]{"rendered", ve});
-				renderedSet = true;
-			}
-		}
-		else
-		{
-			ValueBinding vb = source.getValueBinding("rendered");
-			if (vb != null)
-			{
-				destination.setValueBinding("rendered", vb);
-				renderedSet = true;
-			}
-		}
-		if (!renderedSet)
-		{
-			destination.setRendered(destination.isRendered());
-		}
-	}
-
-	/**
-	 * This associates an EL expression with the "value" attribute of the specified UIComponent.
-	 * <p> 
-	 * @param cmp is the component whose value attribute is to be updated.
-	 * 
-	 * @param elCtx is optional; when specified and this is a JSF1.2 environment then this is
-	 * used when resolving the expression. When this is not a JSF1.2 environment then this
-	 * parameter is ignored.
-	 * 
-	 * @param context is the JSF FacesContext to use.
-	 * 
-	 * @param vbString is the expression string, eg "#{someBean.someProperty}"
-	 */
-	public static void setValueExpression(UIComponent cmp, ELContext elCtx, FacesContext context, String vbString)
-	{
-		Application app = context.getApplication();
-		if (_methodGELC != null)
-		{
-			if (elCtx == null)
-			{
-				elCtx = invoke(ELContext.class, _methodGELC, context, (Object[]) null);
-			}
-
-			ExpressionFactory expressionFactory = invoke(ExpressionFactory.class, _methodEF, app, (Object[]) null);
-			ValueExpression ve = expressionFactory.createValueExpression(elCtx, vbString, Object.class);
-
-			invoke(Void.class, _methodSVE, cmp, new Object[] {"value", ve});
-		}
-		else
-		{
-			ValueBinding vb = app.createValueBinding(vbString);
-			cmp.setValueBinding("value", vb);
-		}
-	}
+    private static final Method _methodGELC = getMethod(FacesContext.class, "getELContext", (Class[]) null);
+    private static final Method _methodGVE = getMethod(UIComponent.class, "getValueExpression", ARGS_GET_VALUE_EXPR);
+    private static final Method _methodSVE = getMethod(UIComponent.class, "setValueExpression", ARGS_SET_VALUE_EXPR);
+    private static final Method _methodEF = getMethod(Application.class, "getExpressionFactory", (Class[]) null);
+
+    private _FacesUtils()
+    {
+    }
+
+    private static Method getMethod(Class<?> clazz, String name, Class<?>[] args)
+    {
+        try
+        {
+            return clazz.getMethod(name, args);
+        }
+        catch(Exception e)
+        {
+            return null;
+        }
+    }
+
+    private static <T> T invoke(Class<T> retType, Method method, Object target, Object[] args)
+    throws FacesException
+    {
+        try
+        {
+            @SuppressWarnings("unchecked")
+            T result = (T) method.invoke(target, args);
+            return result;
+        }
+        catch(IllegalAccessException e)
+        {
+            // should never happen
+            throw new FacesException("Unable to invoke standard JSF method", e);
+        }
+        catch(InvocationTargetException e)
+        {
+            // should never happen
+            throw new FacesException("Unable to invoke standard JSF method", e);
+        }
+    }
+
+    public static void copyRendered(UIComponent source, UIComponent destination)
+    {
+        boolean renderedSet = false;
+        if (_methodGVE != null)
+        {
+            ValueExpression ve = invoke(ValueExpression.class, _methodGVE, source, new Object[] {"rendered"});
+            if (ve != null)
+            {
+                invoke(Void.class, _methodSVE, destination, new Object[]{"rendered", ve});
+                renderedSet = true;
+            }
+        }
+        else
+        {
+            ValueBinding vb = source.getValueBinding("rendered");
+            if (vb != null)
+            {
+                destination.setValueBinding("rendered", vb);
+                renderedSet = true;
+            }
+        }
+        if (!renderedSet)
+        {
+            destination.setRendered(destination.isRendered());
+        }
+    }
+
+    /**
+     * This associates an EL expression with the "value" attribute of the specified UIComponent.
+     * <p> 
+     * @param cmp is the component whose value attribute is to be updated.
+     * 
+     * @param elCtx is optional; when specified and this is a JSF1.2 environment then this is
+     * used when resolving the expression. When this is not a JSF1.2 environment then this
+     * parameter is ignored.
+     * 
+     * @param context is the JSF FacesContext to use.
+     * 
+     * @param vbString is the expression string, eg "#{someBean.someProperty}"
+     */
+    public static void setValueExpression(UIComponent cmp, ELContext elCtx, FacesContext context, String vbString)
+    {
+        Application app = context.getApplication();
+        if (_methodGELC != null)
+        {
+            if (elCtx == null)
+            {
+                elCtx = invoke(ELContext.class, _methodGELC, context, (Object[]) null);
+            }
+
+            ExpressionFactory expressionFactory = invoke(ExpressionFactory.class, _methodEF, app, (Object[]) null);
+            ValueExpression ve = expressionFactory.createValueExpression(elCtx, vbString, Object.class);
+
+            invoke(Void.class, _methodSVE, cmp, new Object[] {"value", ve});
+        }
+        else
+        {
+            ValueBinding vb = app.createValueBinding(vbString);
+            cmp.setValueBinding("value", vb);
+        }
+    }
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/Extractor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/Extractor.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/Extractor.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/Extractor.java Thu Jul  3 14:34:56 2008
@@ -24,14 +24,14 @@
  */
 public interface Extractor
 {
-	/**
-	 * Get metadata information from the given entity and add it to the
-	 * provided MetaData object.
-	 * <p>
-	 * Any information is added to the existing info (if any) in the provided
-	 * MetaData instance. If information conflicts with existing data, then the
-	 * new data overwrites the old data. A chain of Extractors can therefore
-	 * be used (in the correct order) to control exactly what metadata applies.
-	 */
-	public void getMetaData(MetaDataWritable metaData, Object entity);
+    /**
+     * Get metadata information from the given entity and add it to the
+     * provided MetaData object.
+     * <p>
+     * Any information is added to the existing info (if any) in the provided
+     * MetaData instance. If information conflicts with existing data, then the
+     * new data overwrites the old data. A chain of Extractors can therefore
+     * be used (in the correct order) to control exactly what metadata applies.
+     */
+    public void getMetaData(MetaDataWritable metaData, Object entity);
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldRepresentation.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldRepresentation.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldRepresentation.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldRepresentation.java Thu Jul  3 14:34:56 2008
@@ -25,11 +25,11 @@
  */
 public enum FieldRepresentation
 {
-	Automatic,
-	OutputText,
-	InputText,
-	InputDate,
-	InputNumber,
-	InputBoolean,
-	SelectOneMenu,
+    Automatic,
+    OutputText,
+    InputText,
+    InputDate,
+    InputNumber,
+    InputBoolean,
+    SelectOneMenu,
 }
\ No newline at end of file

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java Thu Jul  3 14:34:56 2008
@@ -25,23 +25,23 @@
  */
 public interface MetaData
 {
-	/**
-	 * number of fields
-	 */
-	public int getFieldCount();
+    /**
+     * number of fields
+     */
+    public int getFieldCount();
 
-	/**
-	 * iterate through fields
-	 */
-	public Iterator<String> iterFieldNames();
+    /**
+     * iterate through fields
+     */
+    public Iterator<String> iterFieldNames();
 
-	/**
-	 * get the field by name
-	 */
-	public MetaField getField(String name);
+    /**
+     * get the field by name
+     */
+    public MetaField getField(String name);
 
-	/**
-	 * get all fields names
-	 */
-	public String[] getFieldNames();
+    /**
+     * get all fields names
+     */
+    public String[] getFieldNames();
 }
\ No newline at end of file

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaDataWritable.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaDataWritable.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaDataWritable.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaDataWritable.java Thu Jul  3 14:34:56 2008
@@ -37,55 +37,55 @@
  */
 public interface MetaDataWritable extends MetaData
 {
-	/**
-	 * Indicate whether the field with the specified name should be
-	 * used or ignored.
-	 *
-	 * @see #setLockFields(boolean)
-	 */
-	public boolean isWantedField(String name);
-
-	/**
-			// we processed this field due to the fact that it was the parent of a requestedField
-	 * should this field be processed.
-	 *
-	 * @return true if the given name is the parent of one of the requestedFields
-	 * @see #processField(String)
-	 * @see #setLockFields(boolean)
-	 */
-	public boolean isParentOfWantedField(String name);
-
-	/**
-	 * request to add this field if we reach it. eg. used to trigger traversing the object graph for
-	 * linked entities
-	 * <p>
-	 * Name may be of form "foo.bar.baz"
-	 */
-	public void requestField(String name);
-
-	public Set<String> getRequestedFields();
-
-	/**
-	 * add a new field to the metadata or return one if one already exists for
-	 * the given name
-	 */
-	public MetaFieldWritable getOrCreateField(String name);
-
-	public int getFieldCount();
-
-	public Iterator<String> iterFieldNames();
-
-	public MetaField getField(String name);
-
-	public String[] getFieldNames();
-
-	/**
-	 * Prevent the adding of any new MetaField objects to this instance (but
-	 * enhancing existing fields is permitted).
-	 * <p>
-	 * When set to true, any call to isProcessableField will return false for names
-	 * that are not already known, and getOrCreateField will throw an exception if
-	 * the field does not exist.
-	 */
-	public boolean setLockFields(boolean lockFields);
+    /**
+     * Indicate whether the field with the specified name should be
+     * used or ignored.
+     *
+     * @see #setLockFields(boolean)
+     */
+    public boolean isWantedField(String name);
+
+    /**
+            // we processed this field due to the fact that it was the parent of a requestedField
+     * should this field be processed.
+     *
+     * @return true if the given name is the parent of one of the requestedFields
+     * @see #processField(String)
+     * @see #setLockFields(boolean)
+     */
+    public boolean isParentOfWantedField(String name);
+
+    /**
+     * request to add this field if we reach it. eg. used to trigger traversing the object graph for
+     * linked entities
+     * <p>
+     * Name may be of form "foo.bar.baz"
+     */
+    public void requestField(String name);
+
+    public Set<String> getRequestedFields();
+
+    /**
+     * add a new field to the metadata or return one if one already exists for
+     * the given name
+     */
+    public MetaFieldWritable getOrCreateField(String name);
+
+    public int getFieldCount();
+
+    public Iterator<String> iterFieldNames();
+
+    public MetaField getField(String name);
+
+    public String[] getFieldNames();
+
+    /**
+     * Prevent the adding of any new MetaField objects to this instance (but
+     * enhancing existing fields is permitted).
+     * <p>
+     * When set to true, any call to isProcessableField will return false for names
+     * that are not already known, and getOrCreateField will throw an exception if
+     * the field does not exist.
+     */
+    public boolean setLockFields(boolean lockFields);
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaField.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaField.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaField.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaField.java Thu Jul  3 14:34:56 2008
@@ -33,104 +33,104 @@
  */
 public interface MetaField
 {
-	public String getName();
+    public String getName();
 
-	public String getBaseName();
+    public String getBaseName();
 
-	public String getExternalName();
+    public String getExternalName();
 
-	// The type of the property that this Field instance represents.
-	public Class<?> getType();
+    // The type of the property that this Field instance represents.
+    public Class<?> getType();
 
-	// Is this field a stand-alone persistent entity, or just a
-	// plain property?
-	public boolean isEntityType();
+    // Is this field a stand-alone persistent entity, or just a
+    // plain property?
+    public boolean isEntityType();
 
-	// Is this the key property of this entity?
-	// TODO: what about compound keys?
+    // Is this the key property of this entity?
+    // TODO: what about compound keys?
     public boolean isId();
 
     public Boolean getDisabled();
 
-	public Boolean getCanRead();
+    public Boolean getCanRead();
 
-	public Boolean getCanWrite();
+    public Boolean getCanWrite();
 
-	public Boolean getDisplayOnly();
+    public Boolean getDisplayOnly();
 
-	// Can the entity be persisted when this field is null?
-	public boolean getRequired();
+    // Can the entity be persisted when this field is null?
+    public boolean getRequired();
 
-	public Selection[] getAllowedSelections();
+    public Selection[] getAllowedSelections();
 
-	/**
-	 * Indicates whether this property is a <i>relation</i> to some other object.
-	 * <p>
-	 * For primitive fields, this returns NONE.
-	 */
-	public RelationType getRelationType();
+    /**
+     * Indicates whether this property is a <i>relation</i> to some other object.
+     * <p>
+     * For primitive fields, this returns NONE.
+     */
+    public RelationType getRelationType();
 
-	/**
-	 * In case of hierarchical structures this defines if a child class should be treatened
-	 * as "embedded".<br />
-	 * <ul>
-	 * <li>Embedded: like a composite key in hibernate</li>
-	 * <li>Not Embedded: like a relation to another entity (ManyToOne)</li>
-	 * </ul>
-	 * This is not a metadata for the field itself, but for the context in which this field
-	 * (or its entity) will be used
-	 */
-	public boolean isEmbedded();
+    /**
+     * In case of hierarchical structures this defines if a child class should be treatened
+     * as "embedded".<br />
+     * <ul>
+     * <li>Embedded: like a composite key in hibernate</li>
+     * <li>Not Embedded: like a relation to another entity (ManyToOne)</li>
+     * </ul>
+     * This is not a metadata for the field itself, but for the context in which this field
+     * (or its entity) will be used
+     */
+    public boolean isEmbedded();
 
-	// Used only for text fields. Limits the number of characters.
-	// OR: does this also limit # of chars for numeric and date fields?
-	public Integer getMaxSize();
+    // Used only for text fields. Limits the number of characters.
+    // OR: does this also limit # of chars for numeric and date fields?
+    public Integer getMaxSize();
 
-	/**
-	 * For numeric fields, this specifies the maximum value permitted for this field.
-	 * Returns null for non-numeric fields.
-	 */
-	public Double getMaxValue();
+    /**
+     * For numeric fields, this specifies the maximum value permitted for this field.
+     * Returns null for non-numeric fields.
+     */
+    public Double getMaxValue();
 
-	// Used only for text fields. Limits the number of characters.
-	// must be less than maxSize.
-	public Integer getMinSize();
+    // Used only for text fields. Limits the number of characters.
+    // must be less than maxSize.
+    public Integer getMinSize();
 
-	// How much space should the input/output component take up on
-	// the screen? If this is less than maxSize then the field will
-	// usually allow scrolling internally.
-	public Integer getDisplaySize();
+    // How much space should the input/output component take up on
+    // the screen? If this is less than maxSize then the field will
+    // usually allow scrolling internally.
+    public Integer getDisplaySize();
 
-	/**
-	 * For numeric fields, this specifies the minimum value permitted for this field.
-	 * Returns null for non-numeric fields.
-	 */
-	public Double getMinValue();
+    /**
+     * For numeric fields, this specifies the minimum value permitted for this field.
+     * Returns null for non-numeric fields.
+     */
+    public Double getMinValue();
 
-	// Explicitly allow control over what JSF component is created to
-	// represent this field.
-	public UIComponent getWantedComponent();
+    // Explicitly allow control over what JSF component is created to
+    // represent this field.
+    public UIComponent getWantedComponent();
 
-	public FieldRepresentation getWantedComponentType();
+    public FieldRepresentation getWantedComponentType();
 
-	public TemporalType getTemporalType();
+    public TemporalType getTemporalType();
 
-	public boolean getAllowMultipleSelections();
+    public boolean getAllowMultipleSelections();
 
-	public SelectionSourceEnum getSelectionSource();
+    public SelectionSourceEnum getSelectionSource();
 
-	public String getDataSource();
+    public String getDataSource();
 
-	public String getDataSourceDescription();
+    public String getDataSourceDescription();
 
-	public String getConverterId();
+    public String getConverterId();
 
-	// TODO: remove this method, it is jsf-specific
-	public Class<? extends Converter> getConverterClass();
+    // TODO: remove this method, it is jsf-specific
+    public Class<? extends Converter> getConverterClass();
 
-	public String getConverterBean();
+    public String getConverterBean();
 
-	public DynaFormComponentHandler getComponentHandler();
+    public DynaFormComponentHandler getComponentHandler();
 
-	public Object getAttribute(String name);
+    public Object getAttribute(String name);
 }
\ No newline at end of file

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaFieldWritable.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaFieldWritable.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaFieldWritable.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaFieldWritable.java Thu Jul  3 14:34:56 2008
@@ -31,34 +31,34 @@
  */
 public interface MetaFieldWritable extends MetaField
 {
-	public void setPreferredExternalName(String preferredExternalName);
-	public void setType(Class<?> type);
-	public void setDisplayOnly(Boolean displayOnly);
-	public void setCanRead(boolean canRead);
-	public void setCanWrite(boolean canWrite);
-	public void setDisabled(boolean disabled);
-	public void setRequired(boolean nullable);
-	public void setAllowedSelections(Selection[] allowedSelections);
-	public void setRelationType(RelationType relationType);
-	public void setMaxSize(Integer maxSize);
-	public void setMaxValue(Double maxValue);
-	public void setMinSize(Integer minSize);
-	public void setMinValue(Double minValue);
-	public void setWantedComponent(UIComponent component);
-	public void setWantedComponentType(FieldRepresentation componentType);
-	public void setDisplaySize(int displaySize);
-	public void setTemporalType(TemporalType temporalType);
-	public void setAllowMultipleSelections(boolean allowMultipleSelections);
-	public void setSelectionSource(SelectionSourceEnum selectionSource);
+    public void setPreferredExternalName(String preferredExternalName);
+    public void setType(Class<?> type);
+    public void setDisplayOnly(Boolean displayOnly);
+    public void setCanRead(boolean canRead);
+    public void setCanWrite(boolean canWrite);
+    public void setDisabled(boolean disabled);
+    public void setRequired(boolean nullable);
+    public void setAllowedSelections(Selection[] allowedSelections);
+    public void setRelationType(RelationType relationType);
+    public void setMaxSize(Integer maxSize);
+    public void setMaxValue(Double maxValue);
+    public void setMinSize(Integer minSize);
+    public void setMinValue(Double minValue);
+    public void setWantedComponent(UIComponent component);
+    public void setWantedComponentType(FieldRepresentation componentType);
+    public void setDisplaySize(int displaySize);
+    public void setTemporalType(TemporalType temporalType);
+    public void setAllowMultipleSelections(boolean allowMultipleSelections);
+    public void setSelectionSource(SelectionSourceEnum selectionSource);
     public void setEntityType(boolean entityType);
     public void setId(boolean id);
-	public void setEmbedded(boolean embedded);
-	public void setDataSource(String dataSource);
-	public void setDataSourceDescription(String dataSourceDescription);
-	public void setConverterId(String converterId);
-	public void setConverterClass(Class<Converter> converterClass);
-	public void setConverterBean(String converterBean);
-	public void setComponentHandler(DynaFormComponentHandler componentHandler);
-	public void setAttribute(String name, Object value);
+    public void setEmbedded(boolean embedded);
+    public void setDataSource(String dataSource);
+    public void setDataSourceDescription(String dataSourceDescription);
+    public void setConverterId(String converterId);
+    public void setConverterClass(Class<Converter> converterClass);
+    public void setConverterBean(String converterBean);
+    public void setComponentHandler(DynaFormComponentHandler componentHandler);
+    public void setAttribute(String name, Object value);
 }
 

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/RelationType.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/RelationType.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/RelationType.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/RelationType.java Thu Jul  3 14:34:56 2008
@@ -20,9 +20,9 @@
 
 public enum RelationType
 {
-	NONE,
-	ONE_TO_ONE,
-	ONE_TO_MANY,
-	MANY_TO_ONE,
-	MANY_TO_MANY
+    NONE,
+    ONE_TO_ONE,
+    ONE_TO_MANY,
+    MANY_TO_ONE,
+    MANY_TO_MANY
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/Selection.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/Selection.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/Selection.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/Selection.java Thu Jul  3 14:34:56 2008
@@ -25,33 +25,33 @@
  */
 public class Selection implements Serializable
 {
-	private final String label;
-	private final Object value;
+    private final String label;
+    private final Object value;
 
-	/**
-	 * let the gui determine how to display this value
-	 */
-	public Selection(Object value)
-	{
-		this(null, value);
-	}
+    /**
+     * let the gui determine how to display this value
+     */
+    public Selection(Object value)
+    {
+        this(null, value);
+    }
 
-	/**
-	 * selection with fixed label
-	 */
-	public Selection(String label, Object value)
-	{
-		this.label = label;
-		this.value = value;
-	}
+    /**
+     * selection with fixed label
+     */
+    public Selection(String label, Object value)
+    {
+        this.label = label;
+        this.value = value;
+    }
 
-	public String getLabel()
-	{
-		return label;
-	}
+    public String getLabel()
+    {
+        return label;
+    }
 
-	public Object getValue()
-	{
-		return value;
-	}
+    public Object getValue()
+    {
+        return value;
+    }
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/MetaDataImpl.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/MetaDataImpl.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/MetaDataImpl.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/MetaDataImpl.java Thu Jul  3 14:34:56 2008
@@ -42,132 +42,132 @@
  */
 public class MetaDataImpl implements MetaDataWritable
 {
-	private final Set<String> requestedFields = new TreeSet<String>();
-	private final Set<String> requestedFieldParents = new TreeSet<String>();
-	
-	// Here, a LinkedHashMap is used to ensure that fields can be iterated over
-	// in the order in which they were added to the map.
-	private final Map<String, MetaFieldImpl> fields = new LinkedHashMap<String, MetaFieldImpl>();
-
-	private boolean lockFields = false;
-
-	public MetaDataImpl()
-	{
-	}
-
-	/**
-	 * Indicates whether metadata about this field is wanted.
-	 * <p>
-	 * If this object is not "locked", then this always returns true.
-	 * <p>
-	 * Even when locked, this returns true if:
-	 * <ul>
-	 * <li>The field is already added to this object, or
-	 * <li>The field has explicitly been "requested", or
-	 * <li>The name is of form "foo.bar", and "foo.bar.baz" has
-	 *  been added to the "requested" fields. 
-	 * </ul>
-	 *
-	 * @see #setLockFields(boolean)
-	 */
-	public boolean isWantedField(String name)
-	{
-		return !lockFields 
-			|| isParentOfWantedField(name)
-			|| requestedFields.contains(name)
-			|| fields.containsKey(name);
-	}
-
-	/**
-	 * Is metadata about this field wanted because some child field of this
-	 * field has explicitly been marked as requested?
-	 *
-	 * @return true if the given name is the parent of one of the requestedFields
-	 * @see #processField(String)
-	 * @see #setLockFields(boolean)
-	 */
-	public boolean isParentOfWantedField(String name)
-	{
-		return requestedFieldParents.contains(name);
-	}
-
-	/**
-	 * Allow a field to be added to this object even after this MetaData object is
-	 * "locked" for field addition.
-	 * <p>
-	 * This is used when traversing the object graph for linked entities.
-	 * <p>
-	 * When a name like "foo.bar.baz" is passed to this method, the requestedFieldsParent
-	 * list has "foo" and "foo.bar" added to it. 
-	 */
-	public void requestField(String name)
-	{
-		int currIndex = name.indexOf('.');
-		while (currIndex > -1)
-		{
-			String key = name.substring(0, currIndex);
-			if (!requestedFieldParents.contains(key))
-			{
-				requestedFieldParents.add(key);
-			}
-			currIndex = name.indexOf('.', currIndex + 1);
-		}
-
-		requestedFields.add(name);
-	}
-
-	public Set<String> getRequestedFields()
-	{
-		return Collections.unmodifiableSet(requestedFields);
-	}
-
-	/**
-	 * Add a new field to the metadata or return one if one already exists for
-	 * the given name
-	 */
-	public MetaFieldImpl getOrCreateField(String name)
-	{
-		if (!isWantedField(name))
-		{
-			throw new SecurityException("Current state do not allow to add the field: " + name);
-		}
-
-		MetaFieldImpl field = fields.get(name);
-		if (field == null)
-		{
-			field = new MetaFieldImpl(name);
-			fields.put(name, field);
-		}
-		return field;
-	}
-
-	public int getFieldCount()
-	{
-		return fields.size();
-	}
-
-	public Iterator<String> iterFieldNames()
-	{
-		return fields.keySet().iterator();
-	}
-
-	public MetaField getField(String name)
-	{
-		return fields.get(name);
-	}
-
-	public String[] getFieldNames()
-	{
-		return fields.keySet().toArray(new String[fields.size()]);
-	}
-
-	/**
-	 * if set to true this avoids any field to be newly created, only already existent fields are to be processed
-	 */
-	public boolean setLockFields(boolean lockFields)
-	{
-		boolean prev = this.lockFields;
-		this.lockFields = lockFields;
-		return prev;
-	}
+    private final Set<String> requestedFields = new TreeSet<String>();
+    private final Set<String> requestedFieldParents = new TreeSet<String>();
+    
+    // Here, a LinkedHashMap is used to ensure that fields can be iterated over
+    // in the order in which they were added to the map.
+    private final Map<String, MetaFieldImpl> fields = new LinkedHashMap<String, MetaFieldImpl>();
+
+    private boolean lockFields = false;
+
+    public MetaDataImpl()
+    {
+    }
+
+    /**
+     * Indicates whether metadata about this field is wanted.
+     * <p>
+     * If this object is not "locked", then this always returns true.
+     * <p>
+     * Even when locked, this returns true if:
+     * <ul>
+     * <li>The field is already added to this object, or
+     * <li>The field has explicitly been "requested", or
+     * <li>The name is of form "foo.bar", and "foo.bar.baz" has
+     *  been added to the "requested" fields. 
+     * </ul>
+     *
+     * @see #setLockFields(boolean)
+     */
+    public boolean isWantedField(String name)
+    {
+        return !lockFields 
+            || isParentOfWantedField(name)
+            || requestedFields.contains(name)
+            || fields.containsKey(name);
+    }
+
+    /**
+     * Is metadata about this field wanted because some child field of this
+     * field has explicitly been marked as requested?
+     *
+     * @return true if the given name is the parent of one of the requestedFields
+     * @see #processField(String)
+     * @see #setLockFields(boolean)
+     */
+    public boolean isParentOfWantedField(String name)
+    {
+        return requestedFieldParents.contains(name);
+    }
+
+    /**
+     * Allow a field to be added to this object even after this MetaData object is
+     * "locked" for field addition.
+     * <p>
+     * This is used when traversing the object graph for linked entities.
+     * <p>
+     * When a name like "foo.bar.baz" is passed to this method, the requestedFieldsParent
+     * list has "foo" and "foo.bar" added to it. 
+     */
+    public void requestField(String name)
+    {
+        int currIndex = name.indexOf('.');
+        while (currIndex > -1)
+        {
+            String key = name.substring(0, currIndex);
+            if (!requestedFieldParents.contains(key))
+            {
+                requestedFieldParents.add(key);
+            }
+            currIndex = name.indexOf('.', currIndex + 1);
+        }
+
+        requestedFields.add(name);
+    }
+
+    public Set<String> getRequestedFields()
+    {
+        return Collections.unmodifiableSet(requestedFields);
+    }
+
+    /**
+     * Add a new field to the metadata or return one if one already exists for
+     * the given name
+     */
+    public MetaFieldImpl getOrCreateField(String name)
+    {
+        if (!isWantedField(name))
+        {
+            throw new SecurityException("Current state do not allow to add the field: " + name);
+        }
+
+        MetaFieldImpl field = fields.get(name);
+        if (field == null)
+        {
+            field = new MetaFieldImpl(name);
+            fields.put(name, field);
+        }
+        return field;
+    }
+
+    public int getFieldCount()
+    {
+        return fields.size();
+    }
+
+    public Iterator<String> iterFieldNames()
+    {
+        return fields.keySet().iterator();
+    }
+
+    public MetaField getField(String name)
+    {
+        return fields.get(name);
+    }
+
+    public String[] getFieldNames()
+    {
+        return fields.keySet().toArray(new String[fields.size()]);
+    }
+
+    /**
+     * if set to true this avoids any field to be newly created, only already existent fields are to be processed
+     */
+    public boolean setLockFields(boolean lockFields)
+    {
+        boolean prev = this.lockFields;
+        this.lockFields = lockFields;
+        return prev;
+    }
 }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/MetaFieldImpl.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/MetaFieldImpl.java?rev=673822&r1=673821&r2=673822&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/MetaFieldImpl.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/MetaFieldImpl.java Thu Jul  3 14:34:56 2008
@@ -39,288 +39,288 @@
  */
 class MetaFieldImpl implements MetaFieldWritable, Serializable
 {
-	private final String name;
-	private final String baseName;
-	private String preferredExternalName;
-	private Class<?> type;
-	private boolean entityType;
+    private final String name;
+    private final String baseName;
+    private String preferredExternalName;
+    private Class<?> type;
+    private boolean entityType;
     private boolean id;
-	private Boolean canRead;
-	private Boolean canWrite;
-	private Boolean disabled;
-	private Boolean displayOnly;
-	private boolean required;
-	private RelationType relationType = RelationType.NONE;
-	private boolean embedded = true;
-	private Integer displaySize;
-	private Integer minSize;
-	private Integer maxSize;
-	private Double minValue;
-	private Double maxValue;
-	private TemporalType temporalType;
-
-	private Selection[] allowedSelection;
-	private boolean allowMultipleSelections;
-	private SelectionSourceEnum selectionSource;
-
-	// Note: JSF datatype here
-	private UIComponent wantedComponent;
-	private FieldRepresentation wantedComponentType = FieldRepresentation.Automatic;
-	private DynaFormComponentHandler componentHandler;
-
-	private String dataSource;
-	private String dataSourceDescription;
-
-	private String converterId;
-	private Class<Converter> converterClass;
-	private String converterBean;
-
-	private Map<String, Object> attributes;
-
-	protected MetaFieldImpl(String name)
-	{
-		this.name = name;
-		int pos = name.lastIndexOf('.');
-		if (pos > -1)
-		{
-			this.baseName = name.substring(pos + 1);
-		}
-		else
-		{
-			this.baseName = name;
-		}
-	}
-
-	public String getName()
-	{
-		return name;
-	}
-
-	public String getBaseName()
-	{
-		return baseName;
-	}
-
-	public String getExternalName()
-	{
-		if (getPreferredExternalName() != null)
-		{
-			return getPreferredExternalName();
-		}
-
-		return getName();
-	}
-
-	public String getPreferredExternalName()
-	{
-		return preferredExternalName;
-	}
-
-	public void setPreferredExternalName(String preferredExternalName)
-	{
-		this.preferredExternalName = preferredExternalName;
-	}
-
-	public Class<?> getType()
-	{
-		return type;
-	}
-
-	public void setType(Class<?> type)
-	{
-		if (this.type != null && this.type != type)
-		{
-			throw new IllegalArgumentException("" + name
-				+ ": reset with different type denied. curr:"
-				+ this.type.getName() + " new:" + type.getName());
-		}
-		this.type = type;
-	}
-
-	public Boolean getDisplayOnly()
-	{
-		return displayOnly;
-	}
-
-	public void setDisplayOnly(Boolean displayOnly)
-	{
-		this.displayOnly = displayOnly;
-	}
-
-	public boolean isCanRead()
-	{
-		return getCanRead() != null && getCanRead().booleanValue();
-	}
-
-	public void setCanRead(boolean canRead)
-	{
-		this.canRead = canRead;
-	}
-
-	public Boolean getCanRead()
-	{
-		return this.canRead;
-	}
-
-	public void setCanWrite(boolean canWrite)
-	{
-		this.canWrite = canWrite;
-	}
-
-	public Boolean getCanWrite()
-	{
-		return canWrite;
-	}
-
-	public void setDisabled(boolean disabled)
-	{
-		this.disabled = disabled;
-	}
-
-	public Boolean getDisabled()
-	{
-		return disabled;
-	}
-
-	public boolean getRequired()
-	{
-		return required;
-	}
-
-	public void setRequired(boolean nullable)
-	{
-		this.required = nullable;
-	}
-
-	public Selection[] getAllowedSelections()
-	{
-		return allowedSelection;
-	}
-
-	public void setAllowedSelections(Selection[] allowedSelections)
-	{
-		this.allowedSelection = allowedSelections;
-	}
-
-	public RelationType getRelationType()
-	{
-		return relationType;
-	}
-
-	public void setRelationType(RelationType relationType)
-	{
-		this.relationType = relationType;
-	}
-
-	public Integer getMaxSize()
-	{
-		return maxSize;
-	}
-
-	public void setMaxSize(Integer maxSize)
-	{
-		this.maxSize = maxSize;
-	}
-
-	public Double getMaxValue()
-	{
-		return maxValue;
-	}
-
-	public void setMaxValue(Double maxValue)
-	{
-		this.maxValue = maxValue;
-	}
-
-	public Integer getMinSize()
-	{
-		return minSize;
-	}
-
-	public void setMinSize(Integer minSize)
-	{
-		this.minSize = minSize;
-	}
-
-	public Double getMinValue()
-	{
-		return minValue;
-	}
-
-	public void setMinValue(Double minValue)
-	{
-		this.minValue = minValue;
-	}
-
-	public void setWantedComponent(UIComponent component)
-	{
-		this.wantedComponent = component;
-	}
-
-	public UIComponent getWantedComponent()
-	{
-		return wantedComponent;
-	}
-
-	public void setWantedComponentType(FieldRepresentation componentType)
-	{
-		this.wantedComponentType = componentType;
-	}
-
-	public FieldRepresentation getWantedComponentType()
-	{
-		return this.wantedComponentType;
-	}
-
-	public void setDisplaySize(int displaySize)
-	{
-		this.displaySize = displaySize;
-	}
-
-	public Integer getDisplaySize()
-	{
-		return displaySize;
-	}
-
-	public void setTemporalType(TemporalType temporalType)
-	{
-		this.temporalType = temporalType;
-	}
-
-	public TemporalType getTemporalType()
-	{
-		return temporalType;
-	}
-
-	public boolean getAllowMultipleSelections()
-	{
-		return allowMultipleSelections;
-	}
-
-	public void setAllowMultipleSelections(boolean allowMultipleSelections)
-	{
-		this.allowMultipleSelections = allowMultipleSelections;
-	}
-
-	public SelectionSourceEnum getSelectionSource()
-	{
-		return selectionSource;
-	}
-
-	public void setSelectionSource(SelectionSourceEnum selectionSource)
-	{
-		this.selectionSource = selectionSource;
-	}
-
-	public boolean isEntityType()
-	{
-		return entityType;
-	}
+    private Boolean canRead;
+    private Boolean canWrite;
+    private Boolean disabled;
+    private Boolean displayOnly;
+    private boolean required;
+    private RelationType relationType = RelationType.NONE;
+    private boolean embedded = true;
+    private Integer displaySize;
+    private Integer minSize;
+    private Integer maxSize;
+    private Double minValue;
+    private Double maxValue;
+    private TemporalType temporalType;
+
+    private Selection[] allowedSelection;
+    private boolean allowMultipleSelections;
+    private SelectionSourceEnum selectionSource;
+
+    // Note: JSF datatype here
+    private UIComponent wantedComponent;
+    private FieldRepresentation wantedComponentType = FieldRepresentation.Automatic;
+    private DynaFormComponentHandler componentHandler;
+
+    private String dataSource;
+    private String dataSourceDescription;
+
+    private String converterId;
+    private Class<Converter> converterClass;
+    private String converterBean;
+
+    private Map<String, Object> attributes;
+
+    protected MetaFieldImpl(String name)
+    {
+        this.name = name;
+        int pos = name.lastIndexOf('.');
+        if (pos > -1)
+        {
+            this.baseName = name.substring(pos + 1);
+        }
+        else
+        {
+            this.baseName = name;
+        }
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public String getBaseName()
+    {
+        return baseName;
+    }
+
+    public String getExternalName()
+    {
+        if (getPreferredExternalName() != null)
+        {
+            return getPreferredExternalName();
+        }
+
+        return getName();
+    }
+
+    public String getPreferredExternalName()
+    {
+        return preferredExternalName;
+    }
+
+    public void setPreferredExternalName(String preferredExternalName)
+    {
+        this.preferredExternalName = preferredExternalName;
+    }
+
+    public Class<?> getType()
+    {
+        return type;
+    }
+
+    public void setType(Class<?> type)
+    {
+        if (this.type != null && this.type != type)
+        {
+            throw new IllegalArgumentException("" + name
+                + ": reset with different type denied. curr:"
+                + this.type.getName() + " new:" + type.getName());
+        }
+        this.type = type;
+    }
+
+    public Boolean getDisplayOnly()
+    {
+        return displayOnly;
+    }
+
+    public void setDisplayOnly(Boolean displayOnly)
+    {
+        this.displayOnly = displayOnly;
+    }
+
+    public boolean isCanRead()
+    {
+        return getCanRead() != null && getCanRead().booleanValue();
+    }
+
+    public void setCanRead(boolean canRead)
+    {
+        this.canRead = canRead;
+    }
+
+    public Boolean getCanRead()
+    {
+        return this.canRead;
+    }
+
+    public void setCanWrite(boolean canWrite)
+    {
+        this.canWrite = canWrite;
+    }
+
+    public Boolean getCanWrite()
+    {
+        return canWrite;
+    }
+
+    public void setDisabled(boolean disabled)
+    {
+        this.disabled = disabled;
+    }
+
+    public Boolean getDisabled()
+    {
+        return disabled;
+    }
+
+    public boolean getRequired()
+    {
+        return required;
+    }
+
+    public void setRequired(boolean nullable)
+    {
+        this.required = nullable;
+    }
+
+    public Selection[] getAllowedSelections()
+    {
+        return allowedSelection;
+    }
+
+    public void setAllowedSelections(Selection[] allowedSelections)
+    {
+        this.allowedSelection = allowedSelections;
+    }
+
+    public RelationType getRelationType()
+    {
+        return relationType;
+    }
+
+    public void setRelationType(RelationType relationType)
+    {
+        this.relationType = relationType;
+    }
+
+    public Integer getMaxSize()
+    {
+        return maxSize;
+    }
+
+    public void setMaxSize(Integer maxSize)
+    {
+        this.maxSize = maxSize;
+    }
+
+    public Double getMaxValue()
+    {
+        return maxValue;
+    }
+
+    public void setMaxValue(Double maxValue)
+    {
+        this.maxValue = maxValue;
+    }
+
+    public Integer getMinSize()
+    {
+        return minSize;
+    }
+
+    public void setMinSize(Integer minSize)
+    {
+        this.minSize = minSize;
+    }
+
+    public Double getMinValue()
+    {
+        return minValue;
+    }
+
+    public void setMinValue(Double minValue)
+    {
+        this.minValue = minValue;
+    }
+
+    public void setWantedComponent(UIComponent component)
+    {
+        this.wantedComponent = component;
+    }
+
+    public UIComponent getWantedComponent()
+    {
+        return wantedComponent;
+    }
+
+    public void setWantedComponentType(FieldRepresentation componentType)
+    {
+        this.wantedComponentType = componentType;
+    }
+
+    public FieldRepresentation getWantedComponentType()
+    {
+        return this.wantedComponentType;
+    }
+
+    public void setDisplaySize(int displaySize)
+    {
+        this.displaySize = displaySize;
+    }
+
+    public Integer getDisplaySize()
+    {
+        return displaySize;
+    }
+
+    public void setTemporalType(TemporalType temporalType)
+    {
+        this.temporalType = temporalType;
+    }
+
+    public TemporalType getTemporalType()
+    {
+        return temporalType;
+    }
+
+    public boolean getAllowMultipleSelections()
+    {
+        return allowMultipleSelections;
+    }
+
+    public void setAllowMultipleSelections(boolean allowMultipleSelections)
+    {
+        this.allowMultipleSelections = allowMultipleSelections;
+    }
+
+    public SelectionSourceEnum getSelectionSource()
+    {
+        return selectionSource;
+    }
+
+    public void setSelectionSource(SelectionSourceEnum selectionSource)
+    {
+        this.selectionSource = selectionSource;
+    }
+
+    public boolean isEntityType()
+    {
+        return entityType;
+    }
 
     public void setEntityType(boolean entityType)
-	{
-		this.entityType = entityType;
-	}
+    {
+        this.entityType = entityType;
+    }
 
     public boolean isId()
     {
@@ -333,92 +333,92 @@
     }
 
     public boolean isEmbedded()
-	{
-		return embedded;
-	}
-
-	public void setEmbedded(boolean embedded)
-	{
-		this.embedded = embedded;
-	}
-
-	public String getDataSource()
-	{
-		return dataSource;
-	}
-
-	public void setDataSource(String dataSource)
-	{
-		this.dataSource = dataSource;
-	}
-
-	public String getDataSourceDescription()
-	{
-		return dataSourceDescription;
-	}
-
-	public void setDataSourceDescription(String dataSourceDescription)
-	{
-		this.dataSourceDescription = dataSourceDescription;
-	}
-
-	public String getConverterId()
-	{
-		return converterId;
-	}
-
-	public void setConverterId(String converterId)
-	{
-		this.converterId = converterId;
-	}
-
-	public Class<Converter> getConverterClass()
-	{
-		return converterClass;
-	}
-
-	public void setConverterClass(Class<Converter> converterClass)
-	{
-		this.converterClass = converterClass;
-	}
-
-	public String getConverterBean()
-	{
-		return converterBean;
-	}
-
-	public void setConverterBean(String converterBean)
-	{
-		this.converterBean = converterBean;
-	}
-
-	public DynaFormComponentHandler getComponentHandler()
-	{
-		return componentHandler;
-	}
-
-	public void setComponentHandler(DynaFormComponentHandler componentHandler)
-	{
-		this.componentHandler = componentHandler;
-	}
-
-	public void setAttribute(String name, Object value)
-	{
-		if (attributes == null)
-		{
-			 attributes = new HashMap<String, Object>();
-		}
-		attributes.put(name, value);
-	}
-
-	public Object getAttribute(String name)
-	{
-		if (attributes == null)
-		{
-			return null;
-		}
+    {
+        return embedded;
+    }
 
-		return attributes.get(name);
-	}
+    public void setEmbedded(boolean embedded)
+    {
+        this.embedded = embedded;
+    }
+
+    public String getDataSource()
+    {
+        return dataSource;
+    }
+
+    public void setDataSource(String dataSource)
+    {
+        this.dataSource = dataSource;
+    }
+
+    public String getDataSourceDescription()
+    {
+        return dataSourceDescription;
+    }
+
+    public void setDataSourceDescription(String dataSourceDescription)
+    {
+        this.dataSourceDescription = dataSourceDescription;
+    }
+
+    public String getConverterId()
+    {
+        return converterId;
+    }
+
+    public void setConverterId(String converterId)
+    {
+        this.converterId = converterId;
+    }
+
+    public Class<Converter> getConverterClass()
+    {
+        return converterClass;
+    }
+
+    public void setConverterClass(Class<Converter> converterClass)
+    {
+        this.converterClass = converterClass;
+    }
+
+    public String getConverterBean()
+    {
+        return converterBean;
+    }
+
+    public void setConverterBean(String converterBean)
+    {
+        this.converterBean = converterBean;
+    }
+
+    public DynaFormComponentHandler getComponentHandler()
+    {
+        return componentHandler;
+    }
+
+    public void setComponentHandler(DynaFormComponentHandler componentHandler)
+    {
+        this.componentHandler = componentHandler;
+    }
+
+    public void setAttribute(String name, Object value)
+    {
+        if (attributes == null)
+        {
+             attributes = new HashMap<String, Object>();
+        }
+        attributes.put(name, value);
+    }
+
+    public Object getAttribute(String name)
+    {
+        if (attributes == null)
+        {
+            return null;
+        }
+
+        return attributes.get(name);
+    }
 }