You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/02/26 13:16:43 UTC
svn commit: r631194 - in
/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm:
annot/ui/ jsf/guiBuilder/ metadata/
Author: skitching
Date: Tue Feb 26 04:16:41 2008
New Revision: 631194
URL: http://svn.apache.org/viewvc?rev=631194&view=rev
Log:
Rename the ComponentEnum class to remove jsf-specific terminology.
Added:
myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldRepresentation.java
- copied, changed from r631191, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/ComponentEnum.java
Removed:
myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/ComponentEnum.java
Modified:
myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/annot/ui/UIComponent.java
myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/GuiBuilder.java
myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java
myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java
Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/annot/ui/UIComponent.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/annot/ui/UIComponent.java?rev=631194&r1=631193&r2=631194&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/annot/ui/UIComponent.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/annot/ui/UIComponent.java Tue Feb 26 04:16:41 2008
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.orchestra.dynaForm.annot.ui;
-import org.apache.myfaces.orchestra.dynaForm.metadata.ComponentEnum;
+import org.apache.myfaces.orchestra.dynaForm.metadata.FieldRepresentation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -44,5 +44,5 @@
@Retention(value = RetentionPolicy.RUNTIME)
public @interface UIComponent
{
- ComponentEnum type() default ComponentEnum.OutputText;
+ FieldRepresentation type() default FieldRepresentation.OutputText;
}
Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/GuiBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/GuiBuilder.java?rev=631194&r1=631193&r2=631194&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/GuiBuilder.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/GuiBuilder.java Tue Feb 26 04:16:41 2008
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder;
-import org.apache.myfaces.orchestra.dynaForm.metadata.ComponentEnum;
+import org.apache.myfaces.orchestra.dynaForm.metadata.FieldRepresentation;
import org.apache.myfaces.orchestra.dynaForm.metadata.FieldInterface;
import org.apache.myfaces.orchestra.dynaForm.metadata.RelationType;
import org.apache.myfaces.orchestra.dynaForm.metadata.utils.TypeInfos;
@@ -158,7 +158,7 @@
return true;
}
- if (!field.getWantedComponentType().equals(ComponentEnum.Automatic))
+ if (!field.getWantedComponentType().equals(FieldRepresentation.Automatic))
{
switch (field.getWantedComponentType())
{
Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java?rev=631194&r1=631193&r2=631194&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java Tue Feb 26 04:16:41 2008
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.orchestra.dynaForm.metadata;
-import org.apache.myfaces.orchestra.dynaForm.metadata.ComponentEnum;
+import org.apache.myfaces.orchestra.dynaForm.metadata.FieldRepresentation;
import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.DynaFormComponentHandler;
import org.apache.myfaces.orchestra.dynaForm.lib.SelectionSourceEnum;
@@ -102,7 +102,7 @@
// represent this field.
public UIComponent getWantedComponent();
- public ComponentEnum getWantedComponentType();
+ public FieldRepresentation getWantedComponentType();
public TemporalType getTemporalType();
Copied: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldRepresentation.java (from r631191, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/ComponentEnum.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldRepresentation.java?p2=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldRepresentation.java&p1=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/ComponentEnum.java&r1=631191&r2=631194&rev=631194&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/ComponentEnum.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldRepresentation.java Tue Feb 26 04:16:41 2008
@@ -19,21 +19,17 @@
package org.apache.myfaces.orchestra.dynaForm.metadata;
/**
- * Lists all the renderer types for the standard JSF components.
+ * Lists all the possible ways to present a field to the end user.
* <p>
* See class org.apache.myfaces.orchestra.dynaForm.annot.ui.UIComponent.
- * <p>
- * TODO: Rename this class; perhaps "RendererType"? Or get rid of it
- * completely (see UIComponent)?
*/
-public enum ComponentEnum
+public enum FieldRepresentation
{
Automatic,
OutputText,
InputText,
InputDate,
- SelectOneMenu,
- // SelectSearchMenu,
InputNumber,
- InputBoolean
+ InputBoolean,
+ SelectOneMenu,
}
Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java?rev=631194&r1=631193&r2=631194&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java Tue Feb 26 04:16:41 2008
@@ -18,8 +18,7 @@
*/
package org.apache.myfaces.orchestra.dynaForm.metadata;
-//TODO: fix these imports; this class should not reference the jsf subpackage
-import org.apache.myfaces.orchestra.dynaForm.metadata.ComponentEnum;
+import org.apache.myfaces.orchestra.dynaForm.metadata.FieldRepresentation;
import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.DynaFormComponentHandler;
import org.apache.myfaces.orchestra.dynaForm.lib.SelectionSourceEnum;
@@ -84,7 +83,7 @@
// Note: JSF datatype here
private UIComponent wantedComponent;
- private ComponentEnum wantedComponentType = ComponentEnum.Automatic;
+ private FieldRepresentation wantedComponentType = FieldRepresentation.Automatic;
private DynaFormComponentHandler componentHandler;
private String dataSource;
@@ -281,12 +280,12 @@
return wantedComponent;
}
- public void setWantedComponentType(ComponentEnum componentType)
+ public void setWantedComponentType(FieldRepresentation componentType)
{
this.wantedComponentType = componentType;
}
- public ComponentEnum getWantedComponentType()
+ public FieldRepresentation getWantedComponentType()
{
return this.wantedComponentType;
}