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/11/15 16:59:32 UTC

svn commit: r595340 - in /myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf: DataSourceLabelConverter.java JsfGuiBuilder.java

Author: imario
Date: Thu Nov 15 07:59:31 2007
New Revision: 595340

URL: http://svn.apache.org/viewvc?rev=595340&view=rev
Log:
create a special output-only converter using the DataProvider for fields configured with the DataProvider and no other special converter to allow a nice human readable output

Added:
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/DataSourceLabelConverter.java   (with props)
Modified:
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java

Added: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/DataSourceLabelConverter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/DataSourceLabelConverter.java?rev=595340&view=auto
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/DataSourceLabelConverter.java (added)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/DataSourceLabelConverter.java Thu Nov 15 07:59:31 2007
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.jsf;
+
+import javax.faces.component.StateHolder;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIComponentBase;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+import javax.faces.el.MethodBinding;
+
+/**
+ * convert an object to a string using the label method binding of the DataProvider configuration
+ */
+public class DataSourceLabelConverter implements Converter, StateHolder
+{
+	private boolean _transient = false;
+	private MethodBinding mbLabel;
+
+	public DataSourceLabelConverter()
+	{
+	}
+	
+	public DataSourceLabelConverter(MethodBinding mbLabel)
+	{
+		this.mbLabel = mbLabel;
+	}
+
+	public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String s) throws ConverterException
+	{
+		throw new UnsupportedOperationException();
+	}
+
+	public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object o) throws ConverterException
+	{
+		return (String) mbLabel.invoke(facesContext, new Object[] {o});
+	}
+
+	public Object saveState(FacesContext facesContext)
+	{
+		return new Object[]
+			{
+				UIComponentBase.saveAttachedState(facesContext, mbLabel)
+			};
+	}
+
+	public void restoreState(FacesContext facesContext, Object o)
+	{
+		Object[] state = (Object[]) o;
+
+		mbLabel = (MethodBinding) UIComponentBase.restoreAttachedState(facesContext, state[0]);
+	}
+
+	public boolean isTransient()
+	{
+		return _transient;
+	}
+
+	public void setTransient(boolean b)
+	{
+		_transient = b;
+	}
+}

Propchange: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/DataSourceLabelConverter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/DataSourceLabelConverter.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/DataSourceLabelConverter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=595340&r1=595339&r2=595340&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 Thu Nov 15 07:59:31 2007
@@ -1065,10 +1065,28 @@
 		// For a map JSF cant determine the wanted value type
 		if (cmp.getConverter() == null)
 		{
-			Converter converter = doCreateConverter(field);
-			if (converter != null)
+			String dataSourceDescription = field.getDataSourceDescription();
+			if ((Boolean.TRUE.equals(field.getDisplayOnly()) || isFieldDisplayOnly(field))
+				&& dataSourceDescription != null)
 			{
-				cmp.setConverter(converter);
+				// create a special converter for display-only based on the dataSource
+
+				MethodBinding mbLabel = FacesContext.getCurrentInstance().getApplication().createMethodBinding(
+					dataSourceDescription,
+					new Class[]
+						{
+							field.getType()
+						});
+
+				cmp.setConverter(new DataSourceLabelConverter(mbLabel));
+			}
+			else
+			{
+				Converter converter = doCreateConverter(field);
+				if (converter != null)
+				{
+					cmp.setConverter(converter);
+				}
 			}
 		}
 	}