You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/07/25 02:17:33 UTC
svn commit: r425260 [3/7] - in
/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins:
maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/io/
maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin...
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/MethodSignatureBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/MethodSignatureBean.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/MethodSignatureBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/MethodSignatureBean.java Mon Jul 24 19:17:31 2006
@@ -13,66 +13,66 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * MethodSignatureBean is a Java representation of the faces-config component
- * property-extension method-signature XML element.
- */
-public class MethodSignatureBean extends ObjectBean
-{
- /**
- * Creates a new MethodSignatureBean.
- */
- public MethodSignatureBean()
- {
- _parameterTypes = new LinkedList();
- }
-
- /**
- * Adds a new parameter type to this method signature.
- *
- * @param parameterType the parameter type
- */
- public void addParameterType(
- String parameterType)
- {
- _parameterTypes.add(parameterType);
- }
-
- /**
- * Returns the list of parameter types as an array.
- *
- * @return the parameter type list
- */
- public String[] getParameterTypes()
- {
- return (String[])_parameterTypes.toArray(new String[0]);
- }
-
- /**
- * Sets the return type of this method signature.
- *
- * @param returnType the method signature return type
- */
- public void setReturnType(
- String returnType)
- {
- _returnType = returnType;
- }
-
- /**
- * Returns the return type of this method signature.
- *
- * @return the method signature return type
- */
- public String getReturnType()
- {
- return _returnType;
- }
-
- private String _returnType;
- private List _parameterTypes;
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * MethodSignatureBean is a Java representation of the faces-config component
+ * property-extension method-signature XML element.
+ */
+public class MethodSignatureBean extends ObjectBean
+{
+ /**
+ * Creates a new MethodSignatureBean.
+ */
+ public MethodSignatureBean()
+ {
+ _parameterTypes = new LinkedList();
+ }
+
+ /**
+ * Adds a new parameter type to this method signature.
+ *
+ * @param parameterType the parameter type
+ */
+ public void addParameterType(
+ String parameterType)
+ {
+ _parameterTypes.add(parameterType);
+ }
+
+ /**
+ * Returns the list of parameter types as an array.
+ *
+ * @return the parameter type list
+ */
+ public String[] getParameterTypes()
+ {
+ return (String[])_parameterTypes.toArray(new String[0]);
+ }
+
+ /**
+ * Sets the return type of this method signature.
+ *
+ * @param returnType the method signature return type
+ */
+ public void setReturnType(
+ String returnType)
+ {
+ _returnType = returnType;
+ }
+
+ /**
+ * Returns the return type of this method signature.
+ *
+ * @return the method signature return type
+ */
+ public String getReturnType()
+ {
+ return _returnType;
+ }
+
+ private String _returnType;
+ private List _parameterTypes;
}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/MethodSignatureBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ObjectBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ObjectBean.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ObjectBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ObjectBean.java Mon Jul 24 19:17:31 2006
@@ -13,65 +13,65 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
-
-/**
- * ObjectBean is the base class for all parsed beans.
- */
-public class ObjectBean
-{
- /**
- * Creates a new ObjectBean.
- */
- public ObjectBean()
- {
- }
-
- /**
- * Returns true if this faces config document has been modified since
- * the specified timestamp.
- *
- * @param timestamp the timestamp in UTC millis
- *
- * @return true if this faces config document has been modified,
- * otherwise false
- */
- public boolean isModifiedSince(
- long timestamp)
- {
- return (_lastModified > timestamp);
- }
-
- protected FacesConfigBean getOwner()
- {
- return _owner;
- }
-
- /**
- * Attaches the object.
- *
- * @param owner the faces config owner
- */
- protected void attach(
- FacesConfigBean owner)
- {
- _owner = owner;
- ObjectBean object = owner;
- touch(object._lastModified);
- }
-
- /**
- * Sets the last modified timestamp for the parsed faces config document
- * if it is newer than the existing last modified timestamp.
- *
- * @param lastModified the last modified time in UTC millis
- */
- void touch(
- long lastModified)
- {
- _lastModified = Math.max(_lastModified, lastModified);
- }
-
- private long _lastModified;
- private FacesConfigBean _owner;
-}
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+
+/**
+ * ObjectBean is the base class for all parsed beans.
+ */
+public class ObjectBean
+{
+ /**
+ * Creates a new ObjectBean.
+ */
+ public ObjectBean()
+ {
+ }
+
+ /**
+ * Returns true if this faces config document has been modified since
+ * the specified timestamp.
+ *
+ * @param timestamp the timestamp in UTC millis
+ *
+ * @return true if this faces config document has been modified,
+ * otherwise false
+ */
+ public boolean isModifiedSince(
+ long timestamp)
+ {
+ return (_lastModified > timestamp);
+ }
+
+ protected FacesConfigBean getOwner()
+ {
+ return _owner;
+ }
+
+ /**
+ * Attaches the object.
+ *
+ * @param owner the faces config owner
+ */
+ protected void attach(
+ FacesConfigBean owner)
+ {
+ _owner = owner;
+ ObjectBean object = owner;
+ touch(object._lastModified);
+ }
+
+ /**
+ * Sets the last modified timestamp for the parsed faces config document
+ * if it is newer than the existing last modified timestamp.
+ *
+ * @param lastModified the last modified time in UTC millis
+ */
+ void touch(
+ long lastModified)
+ {
+ _lastModified = Math.max(_lastModified, lastModified);
+ }
+
+ private long _lastModified;
+ private FacesConfigBean _owner;
+}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ObjectBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java Mon Jul 24 19:17:31 2006
@@ -13,307 +13,307 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
-
-/**
- * PropertyBean is a Java representation of the faces-config component property
- * XML element.
- */
-public class PropertyBean extends AttributeBean
-{
- /**
- * Sets the name of this property.
- *
- * @param propertyName the property name
- */
- public void setPropertyName(
- String propertyName)
- {
- setAttributeName(propertyName);
- }
-
- /**
- * Returns the name of this property.
- *
- * @return the property name
- */
- public String getPropertyName()
- {
- return getAttributeName();
- }
-
- /**
- * Sets the property class for this property.
- *
- * @param propertyClass the property class
- */
- public void setPropertyClass(
- String propertyClass)
- {
- setAttributeClass(propertyClass);
- }
-
- /**
- * Returns the property class for this property.
- *
- * @return the property class
- */
- public String getPropertyClass()
- {
- return getAttributeClass();
- }
-
- /**
- * Returns the array of parameterized types for this property
- * if it uses generics.
- *
- * @return the array of parameterized types for this property
- */
- public String[] getPropertyClassParameters()
- {
- return getAttributeClassParameters();
- }
-
- /**
- * Sets the possible values for this property.
- *
- * @param propertyValues the property values
- */
- public void setPropertyValues(
- String[] propertyValues)
- {
- _propertyValues = propertyValues;
- }
-
- /**
- * Returns possible values for this property.
- *
- * @return the property values
- */
- public String[] getPropertyValues()
- {
- return _propertyValues;
- }
-
- /**
- * Sets the stateHolder flag of this property.
- *
- * @param stateHolder the property stateHolder flag
- */
- public void setStateHolder(
- boolean stateHolder)
- {
- _stateHolder = stateHolder;
- }
-
- /**
- * Returns stateHolder flag of this property.
- *
- * @return the property stateHolder flag
- */
- public boolean isStateHolder()
- {
- return _stateHolder;
- }
-
- /**
- * Sets the transient flag of this property.
- *
- * @param transient the property transient flag
- */
- public void setTransient(
- boolean transient_)
- {
- _transient = transient_;
- }
-
- /**
- * Returns transient flag of this property.
- *
- * @return the property transient flag
- */
- public boolean isTransient()
- {
- return _transient;
- }
-
-
- /**
- * Sets the list flag of this property.
- *
- * @param list the property list flag
- */
- public void setList(
- boolean list_)
- {
- _list = list_;
- }
-
- /**
- * Returns list flag of this property.
- *
- * @return the property list flag
- */
- public boolean isList()
- {
- return _list;
- }
-
- /**
- * Sets the required flag of this property.
- *
- * @param required the property required flag
- */
- public void setRequired(
- boolean required)
- {
- _required = required;
- }
-
- /**
- * Returns required flag of this property.
- *
- * @return the property required flag
- */
- public boolean isRequired()
- {
- return _required;
- }
-
- /**
- * Sets the literalOnly flag of this property.
- *
- * @param literalOnly the property literalOnly flag
- */
- public void setLiteralOnly(
- boolean literalOnly)
- {
- _literalOnly = literalOnly;
- }
-
- /**
- * Returns literalOnly flag of this property.
- *
- * @return the property literalOnly flag
- */
- public boolean isLiteralOnly()
- {
- return _literalOnly;
- }
-
- /**
- * Sets the alias of this property.
- *
- * @param aliasOf the property alias
- */
- public void setAliasOf(
- String aliasOf)
- {
- _aliasOf = aliasOf;
- }
-
- /**
- * Returns the alias of this property.
- *
- * @return the property alias
- */
- public String getAliasOf()
- {
- return _aliasOf;
- }
-
- /**
- * Sets the unsupported agents for this property.
- *
- * @param unsupportedAgents the unsupported agents
- */
- public void setUnsupportedAgents(
- String[] unsupportedAgents)
- {
- if (unsupportedAgents == null)
- throw new NullPointerException("unsupportedAgents");
-
- _unsupportedAgents = unsupportedAgents;
- }
-
- /**
- * Returns unsupported agents for this property.
- *
- * @return the unsupported agents
- */
- public String[] getUnsupportedAgents()
- {
- return _unsupportedAgents;
- }
-
- /**
- * Sets the tag attribute excluded flag for this property.
- *
- * @param excluded true, if the tag attribute should be excluded;
- * false, otherwise
- */
- public void setTagAttributeExcluded(
- boolean excluded)
- {
- _tagAttributeExcluded = excluded;
- }
-
- /**
- * Returns the tag attribute excluded flag for this property.
- *
- * @return true, if the tag attribute should be excluded;
- * false, otherwise
- */
- public boolean isTagAttributeExcluded()
- {
- return _tagAttributeExcluded;
- }
-
- /**
- * Returns true if this property is a method binding.
- *
- * @return true if this property is a method binding,
- * otherwise false
- */
- public boolean isMethodBinding()
- {
- return ("javax.faces.el.MethodBinding".equals(getPropertyClass()));
- }
-
- /**
- * Parses the possible values for this property into a String array
- * using space as the separator between values.
- *
- * @param propertyValues the property values
- */
- public void parsePropertyValues(
- String propertyValues)
- {
- setPropertyValues(propertyValues.split(" "));
- }
-
- /**
- * Parses the unsupported agents for this property into a String array
- * using space as the separator between values.
- *
- * @param unsupportedAgents the unsupported agents
- */
- public void parseUnsupportedAgents(
- String unsupportedAgents)
- {
- setUnsupportedAgents(unsupportedAgents.split(" "));
- }
-
-
- private String _aliasOf;
- private boolean _required;
- private boolean _literalOnly;
- private boolean _stateHolder;
- private boolean _transient;
- private boolean _list;
- private boolean _tagAttributeExcluded;
- private String[] _propertyValues;
- private String[] _unsupportedAgents = _EMPTY_ARRAY;
-
- static private String[] _EMPTY_ARRAY = new String[0];
-}
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+
+/**
+ * PropertyBean is a Java representation of the faces-config component property
+ * XML element.
+ */
+public class PropertyBean extends AttributeBean
+{
+ /**
+ * Sets the name of this property.
+ *
+ * @param propertyName the property name
+ */
+ public void setPropertyName(
+ String propertyName)
+ {
+ setAttributeName(propertyName);
+ }
+
+ /**
+ * Returns the name of this property.
+ *
+ * @return the property name
+ */
+ public String getPropertyName()
+ {
+ return getAttributeName();
+ }
+
+ /**
+ * Sets the property class for this property.
+ *
+ * @param propertyClass the property class
+ */
+ public void setPropertyClass(
+ String propertyClass)
+ {
+ setAttributeClass(propertyClass);
+ }
+
+ /**
+ * Returns the property class for this property.
+ *
+ * @return the property class
+ */
+ public String getPropertyClass()
+ {
+ return getAttributeClass();
+ }
+
+ /**
+ * Returns the array of parameterized types for this property
+ * if it uses generics.
+ *
+ * @return the array of parameterized types for this property
+ */
+ public String[] getPropertyClassParameters()
+ {
+ return getAttributeClassParameters();
+ }
+
+ /**
+ * Sets the possible values for this property.
+ *
+ * @param propertyValues the property values
+ */
+ public void setPropertyValues(
+ String[] propertyValues)
+ {
+ _propertyValues = propertyValues;
+ }
+
+ /**
+ * Returns possible values for this property.
+ *
+ * @return the property values
+ */
+ public String[] getPropertyValues()
+ {
+ return _propertyValues;
+ }
+
+ /**
+ * Sets the stateHolder flag of this property.
+ *
+ * @param stateHolder the property stateHolder flag
+ */
+ public void setStateHolder(
+ boolean stateHolder)
+ {
+ _stateHolder = stateHolder;
+ }
+
+ /**
+ * Returns stateHolder flag of this property.
+ *
+ * @return the property stateHolder flag
+ */
+ public boolean isStateHolder()
+ {
+ return _stateHolder;
+ }
+
+ /**
+ * Sets the transient flag of this property.
+ *
+ * @param transient the property transient flag
+ */
+ public void setTransient(
+ boolean transient_)
+ {
+ _transient = transient_;
+ }
+
+ /**
+ * Returns transient flag of this property.
+ *
+ * @return the property transient flag
+ */
+ public boolean isTransient()
+ {
+ return _transient;
+ }
+
+
+ /**
+ * Sets the list flag of this property.
+ *
+ * @param list the property list flag
+ */
+ public void setList(
+ boolean list_)
+ {
+ _list = list_;
+ }
+
+ /**
+ * Returns list flag of this property.
+ *
+ * @return the property list flag
+ */
+ public boolean isList()
+ {
+ return _list;
+ }
+
+ /**
+ * Sets the required flag of this property.
+ *
+ * @param required the property required flag
+ */
+ public void setRequired(
+ boolean required)
+ {
+ _required = required;
+ }
+
+ /**
+ * Returns required flag of this property.
+ *
+ * @return the property required flag
+ */
+ public boolean isRequired()
+ {
+ return _required;
+ }
+
+ /**
+ * Sets the literalOnly flag of this property.
+ *
+ * @param literalOnly the property literalOnly flag
+ */
+ public void setLiteralOnly(
+ boolean literalOnly)
+ {
+ _literalOnly = literalOnly;
+ }
+
+ /**
+ * Returns literalOnly flag of this property.
+ *
+ * @return the property literalOnly flag
+ */
+ public boolean isLiteralOnly()
+ {
+ return _literalOnly;
+ }
+
+ /**
+ * Sets the alias of this property.
+ *
+ * @param aliasOf the property alias
+ */
+ public void setAliasOf(
+ String aliasOf)
+ {
+ _aliasOf = aliasOf;
+ }
+
+ /**
+ * Returns the alias of this property.
+ *
+ * @return the property alias
+ */
+ public String getAliasOf()
+ {
+ return _aliasOf;
+ }
+
+ /**
+ * Sets the unsupported agents for this property.
+ *
+ * @param unsupportedAgents the unsupported agents
+ */
+ public void setUnsupportedAgents(
+ String[] unsupportedAgents)
+ {
+ if (unsupportedAgents == null)
+ throw new NullPointerException("unsupportedAgents");
+
+ _unsupportedAgents = unsupportedAgents;
+ }
+
+ /**
+ * Returns unsupported agents for this property.
+ *
+ * @return the unsupported agents
+ */
+ public String[] getUnsupportedAgents()
+ {
+ return _unsupportedAgents;
+ }
+
+ /**
+ * Sets the tag attribute excluded flag for this property.
+ *
+ * @param excluded true, if the tag attribute should be excluded;
+ * false, otherwise
+ */
+ public void setTagAttributeExcluded(
+ boolean excluded)
+ {
+ _tagAttributeExcluded = excluded;
+ }
+
+ /**
+ * Returns the tag attribute excluded flag for this property.
+ *
+ * @return true, if the tag attribute should be excluded;
+ * false, otherwise
+ */
+ public boolean isTagAttributeExcluded()
+ {
+ return _tagAttributeExcluded;
+ }
+
+ /**
+ * Returns true if this property is a method binding.
+ *
+ * @return true if this property is a method binding,
+ * otherwise false
+ */
+ public boolean isMethodBinding()
+ {
+ return ("javax.faces.el.MethodBinding".equals(getPropertyClass()));
+ }
+
+ /**
+ * Parses the possible values for this property into a String array
+ * using space as the separator between values.
+ *
+ * @param propertyValues the property values
+ */
+ public void parsePropertyValues(
+ String propertyValues)
+ {
+ setPropertyValues(propertyValues.split(" "));
+ }
+
+ /**
+ * Parses the unsupported agents for this property into a String array
+ * using space as the separator between values.
+ *
+ * @param unsupportedAgents the unsupported agents
+ */
+ public void parseUnsupportedAgents(
+ String unsupportedAgents)
+ {
+ setUnsupportedAgents(unsupportedAgents.split(" "));
+ }
+
+
+ private String _aliasOf;
+ private boolean _required;
+ private boolean _literalOnly;
+ private boolean _stateHolder;
+ private boolean _transient;
+ private boolean _list;
+ private boolean _tagAttributeExcluded;
+ private String[] _propertyValues;
+ private String[] _unsupportedAgents = _EMPTY_ARRAY;
+
+ static private String[] _EMPTY_ARRAY = new String[0];
+}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RenderKitBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RenderKitBean.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RenderKitBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RenderKitBean.java Mon Jul 24 19:17:31 2006
@@ -13,128 +13,128 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.logging.Logger;
-
-/**
- * RenderKitBean is a Java representation of the faces-config render-kit
- * XML element.
- */
-public class RenderKitBean extends ObjectBean
-{
- /**
- * Creates a new RenderKitBean.
- */
- public RenderKitBean()
- {
- _renderers = new TreeMap();
- }
-
- /**
- * Sets the render kit id for this component.
- *
- * @param renderKitId the render kit id
- */
- public void setRenderKitId(
- String renderKitId)
- {
- _renderKitId = renderKitId;
- }
-
- /**
- * Returns the render kit id type for this component.
- *
- * @return the render kit id
- */
- public String getRenderKitId()
- {
- return _renderKitId;
- }
-
- /**
- * Adds a renderer to this render kit.
- *
- * @param renderer the renderer to add
- */
- public void addRenderer(
- RendererBean renderer)
- {
- String componentFamily = renderer.getComponentFamily();
- String rendererType = renderer.getRendererType();
- String compositeKey = componentFamily + "|" + rendererType;
- _renderers.put(compositeKey, renderer);
-
- FacesConfigBean owner = getOwner();
- if (owner != null)
- renderer.attach(owner);
- }
-
- /**
- * Returns the renderer for this component family and renderer type.
- *
- * @param componentFamily the component family
- * @param rendererType the renderer type
- */
- public RendererBean findRenderer(
- String componentFamily,
- String rendererType)
- {
- String compositeKey = componentFamily + "|" + rendererType;
- return (RendererBean) _renderers.get(compositeKey);
- }
-
- /**
- * Returns true if this render kit has any renderers.
- *
- * @return true if this render kit has any renderers,
- * false otherwise
- */
- public boolean hasRenderers()
- {
- return !_renderers.isEmpty();
- }
-
- /**
- * Returns an iterator for all renderers in this render kit.
- *
- * @return the renderer iterator
- */
- public Iterator renderers()
- {
- return _renderers.values().iterator();
- }
-
- /**
- * Attaches the component and all event references.
- *
- * @param owner the faces config owner
- */
- protected void attach(
- FacesConfigBean owner)
- {
- super.attach(owner);
- Iterator renderers = renderers();
- while (renderers.hasNext())
- {
- RendererBean renderer = (RendererBean)renderers.next();
- renderer.attach(owner);
- }
- }
-
- void addAllRenderers(
- RenderKitBean renderKit)
- {
- for (Iterator i = renderKit._renderers.values().iterator(); i.hasNext();)
- {
- // use addRenderer to establish owner
- addRenderer((RendererBean)i.next());
- }
- }
-
- private String _renderKitId = "";
- private Map _renderers;
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.logging.Logger;
+
+/**
+ * RenderKitBean is a Java representation of the faces-config render-kit
+ * XML element.
+ */
+public class RenderKitBean extends ObjectBean
+{
+ /**
+ * Creates a new RenderKitBean.
+ */
+ public RenderKitBean()
+ {
+ _renderers = new TreeMap();
+ }
+
+ /**
+ * Sets the render kit id for this component.
+ *
+ * @param renderKitId the render kit id
+ */
+ public void setRenderKitId(
+ String renderKitId)
+ {
+ _renderKitId = renderKitId;
+ }
+
+ /**
+ * Returns the render kit id type for this component.
+ *
+ * @return the render kit id
+ */
+ public String getRenderKitId()
+ {
+ return _renderKitId;
+ }
+
+ /**
+ * Adds a renderer to this render kit.
+ *
+ * @param renderer the renderer to add
+ */
+ public void addRenderer(
+ RendererBean renderer)
+ {
+ String componentFamily = renderer.getComponentFamily();
+ String rendererType = renderer.getRendererType();
+ String compositeKey = componentFamily + "|" + rendererType;
+ _renderers.put(compositeKey, renderer);
+
+ FacesConfigBean owner = getOwner();
+ if (owner != null)
+ renderer.attach(owner);
+ }
+
+ /**
+ * Returns the renderer for this component family and renderer type.
+ *
+ * @param componentFamily the component family
+ * @param rendererType the renderer type
+ */
+ public RendererBean findRenderer(
+ String componentFamily,
+ String rendererType)
+ {
+ String compositeKey = componentFamily + "|" + rendererType;
+ return (RendererBean) _renderers.get(compositeKey);
+ }
+
+ /**
+ * Returns true if this render kit has any renderers.
+ *
+ * @return true if this render kit has any renderers,
+ * false otherwise
+ */
+ public boolean hasRenderers()
+ {
+ return !_renderers.isEmpty();
+ }
+
+ /**
+ * Returns an iterator for all renderers in this render kit.
+ *
+ * @return the renderer iterator
+ */
+ public Iterator renderers()
+ {
+ return _renderers.values().iterator();
+ }
+
+ /**
+ * Attaches the component and all event references.
+ *
+ * @param owner the faces config owner
+ */
+ protected void attach(
+ FacesConfigBean owner)
+ {
+ super.attach(owner);
+ Iterator renderers = renderers();
+ while (renderers.hasNext())
+ {
+ RendererBean renderer = (RendererBean)renderers.next();
+ renderer.attach(owner);
+ }
+ }
+
+ void addAllRenderers(
+ RenderKitBean renderKit)
+ {
+ for (Iterator i = renderKit._renderers.values().iterator(); i.hasNext();)
+ {
+ // use addRenderer to establish owner
+ addRenderer((RendererBean)i.next());
+ }
+ }
+
+ private String _renderKitId = "";
+ private Map _renderers;
}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RenderKitBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RendererBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RendererBean.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RendererBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RendererBean.java Mon Jul 24 19:17:31 2006
@@ -13,428 +13,428 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+
import org.apache.myfaces.trinidadbuild.plugin.faces.util.CompoundIterator;
-
-/**
- * RenderKitBean is a Java representation of the faces-config render-kit
- * XML element.
- */
-public class RendererBean extends ObjectBean
-{
- /**
- * Creates a new RendererBean.
- */
- public RendererBean()
- {
- _attributes = new TreeMap();
- _facets = new TreeMap();
- }
-
- /**
- * Sets the component family for this component.
- *
- * @param componentFamily the component family
- */
- public void setComponentFamily(
- String componentFamily)
- {
- _componentFamily = componentFamily;
- }
-
- /**
- * Returns the component family for this component.
- *
- * @return the component family
- */
- public String getComponentFamily()
- {
- return _componentFamily;
- }
-
- /**
- * Sets the renderer type for this component.
- *
- * @param rendererType the renderer type
- */
- public void setRendererType(
- String rendererType)
- {
- _rendererType = rendererType;
- }
-
- /**
- * Returns the renderer type for this component.
- *
- * @return the renderer type
- */
- public String getRendererType()
- {
- return _rendererType;
- }
-
- /**
- * Sets the renderer class for this renderer.
- *
- * @param rendererClass the renderer class
- */
- public void setRendererClass(
- String rendererClass)
- {
- _rendererClass = rendererClass;
- }
-
- /**
- * Returns the renderer class for this renderer.
- *
- * @return the renderer class
- */
- public String getRendererClass()
- {
- return _rendererClass;
- }
-
- /**
- * Sets the description of this attribute.
- *
- * @param description the attribute description
- */
- public void setDescription(
- String description)
- {
- _description = description;
- }
-
- /**
- * Returns the description of this attribute.
- *
- * @return the attribute description
- */
- public String getDescription()
- {
- return _description;
- }
-
- /**
- * Sets the component type for this component.
- *
- * @param componentType the component type
- */
- public void setComponentType(
- String componentType)
- {
- _componentType = componentType;
- }
-
- /**
- * Returns the component type for this component.
- *
- * @return the component type
- */
- public String getComponentType()
- {
- return _componentType;
- }
-
- /**
- * Sets the renderer superclass for this renderer.
- *
- * @param rendererSuperclass the renderer superclass
- */
- public void setRendererSuperclass(
- String rendererSuperclass)
- {
- _rendererSuperclass = rendererSuperclass;
- }
-
- /**
- * Returns the renderer superclass for this component.
- *
- * @return the renderer superclass
- */
- public String getRendererSuperclass()
- {
- return _rendererSuperclass;
- }
-
- /**
- * Finds the renderer-specific component class for this renderer.
- *
- * @return the renderer-specifc component class
- */
- public String findComponentClass()
- {
- ComponentBean component = resolveComponentType();
- return (component != null) ? component.getComponentClass()
- : "org.apache.myfaces.adf.component.UIXComponent";
- }
-
- /**
- * Finds the behavioral component class for this renderer.
- *
- * @return the behavioral component class
- */
- public String findComponentFamilyClass()
- {
- ComponentBean component = resolveComponentType();
- ComponentBean behavioral = (component != null)
- ? component.findBehavioralComponent()
- : null;
- return (behavioral != null) ? behavioral.getComponentClass()
- : "org.apache.myfaces.adf.component.UIXComponent";
- }
-
- /**
- * Adds a attribute to this component.
- *
- * @param attribute the attribute to add
- */
- public void addAttribute(
- AttributeBean attribute)
- {
- _attributes.put(attribute.getAttributeName(), attribute);
- }
-
- /**
- * Returns the attribute for this attribute name.
- *
- * @param attributeName the attribute name to find
- */
- public AttributeBean findAttribute(
- String attributeName)
- {
- AttributeBean attribute = (AttributeBean)_attributes.get(attributeName);
-
- if (attribute == null)
- {
- ComponentBean component = resolveComponentType();
- if (component != null)
- attribute = component.findProperty(attributeName);
- }
-
- return attribute;
- }
-
- /**
- * Returns true if this component has any attributes.
- *
- * @return true if this component has any attributes,
- * false otherwise
- */
- public boolean hasAttributes()
- {
- boolean hasAttributes = !_attributes.isEmpty();
-
- if (!hasAttributes)
- {
- ComponentBean component = resolveComponentType();
- if (component != null)
- hasAttributes |= component.hasProperties();
- }
-
- return hasAttributes;
- }
-
- /**
- * Returns true if this component or any component supertype
- * has any attributes.
- *
- * @return true if this component or any supertype has any attributes,
- * false otherwise
- */
- public boolean hasAttributes(
- boolean flatten)
- {
- boolean hasAttributes = hasAttributes();
-
- if (!hasAttributes && flatten)
- {
- ComponentBean component = resolveComponentType();
- if (component != null)
- {
- ComponentBean parent = component.resolveSupertype();
- if (parent != null)
- hasAttributes |= parent.hasProperties(true);
- }
- }
-
- return hasAttributes;
- }
-
- /**
- * Returns an iterator for all attributes on this component only.
- *
- * @return the attribute iterator
- */
- public Iterator attributes()
- {
- Iterator attributes = _attributes.values().iterator();
-
- ComponentBean component = resolveComponentType();
- if (component != null)
- attributes = new CompoundIterator(attributes, component.properties());
-
- return attributes;
- }
-
- /**
- * Returns an iterator for attributes on this component.
- *
- * @param flatten true if the iterator should be a combined list of
- * attributes of this component and its supertype,
- * false otherwise
- *
- * @return the attribute iterator
- */
- public Iterator attributes(
- boolean flatten)
- {
- Iterator attributes = attributes();
- if (flatten)
- {
- ComponentBean component = resolveComponentType();
- if (component != null)
- {
- ComponentBean parent = component.resolveSupertype();
- if (parent != null)
- attributes = new CompoundIterator(attributes, parent.properties(true));
- }
- }
- return attributes;
- }
-
- /**
- * Adds a facet to this component.
- *
- * @param facet the facet to add
- */
- public void addFacet(
- FacetBean facet)
- {
- _facets.put(facet.getFacetName(), facet);
- }
-
- /**
- * Returns the facet for this facet name.
- *
- * @param facetName the facet name to find
- */
- public FacetBean findFacet(
- String facetName)
- {
- return (FacetBean)_facets.get(facetName);
- }
-
- /**
- * Returns true if this component has any facets.
- *
- * @return true if this component has any facets,
- * false otherwise
- */
- public boolean hasFacets()
- {
- boolean hasFacets = !_facets.isEmpty();
-
- ComponentBean component = resolveComponentType();
- if (component != null)
- hasFacets |= component.hasFacets();
-
- return hasFacets;
- }
-
- /**
- * Returns true if this component or any component supertype
- * has any facets.
- *
- * @return true if this component or any supertype has any facets,
- * false otherwise
- */
- public boolean hasFacets(
- boolean flatten)
- {
- boolean hasFacets = hasFacets();
-
- if (!hasFacets && flatten)
- {
- ComponentBean component = resolveComponentType();
- if (component != null)
- {
- ComponentBean parent = component.resolveSupertype();
- if (parent != null)
- hasFacets |= parent.hasFacets(true);
- }
- }
-
- return hasFacets;
- }
-
- /**
- * Returns an iterator for all facets on this component only.
- *
- * @return the facet iterator
- */
- public Iterator facets()
- {
- Iterator facets = _facets.values().iterator();
-
- ComponentBean component = resolveComponentType();
- if (component != null)
- facets = new CompoundIterator(facets, component.facets());
-
- return facets;
- }
-
- /**
- * Returns an iterator for facets on this component.
- *
- * @param flatten true if the iterator should be a combined list of
- * facets of this component and its supertype,
- * false otherwise
- *
- * @return the facet iterator
- */
- public Iterator facets(
- boolean flatten)
- {
- Iterator facets = facets();
- if (flatten)
- {
- ComponentBean component = resolveComponentType();
- if (component != null)
- {
- ComponentBean parent = component.resolveSupertype();
- if (parent != null)
- facets = new CompoundIterator(facets, parent.facets(true));
- }
- }
- return facets;
- }
-
- /**
- * Returns the component type instance.
- *
- * @return the component type instance
- */
- public ComponentBean resolveComponentType()
- {
- if (_componentType == null)
- return null;
-
- FacesConfigBean owner = getOwner();
- return (owner != null) ? owner.findComponent(_componentType) : null;
- }
-
- private String _description;
- private String _componentFamily;
- private String _rendererType;
- private String _rendererClass;
- private String _rendererSuperclass;
- private String _componentType;
- private Map _attributes;
- private Map _facets;
+
+/**
+ * RenderKitBean is a Java representation of the faces-config render-kit
+ * XML element.
+ */
+public class RendererBean extends ObjectBean
+{
+ /**
+ * Creates a new RendererBean.
+ */
+ public RendererBean()
+ {
+ _attributes = new TreeMap();
+ _facets = new TreeMap();
+ }
+
+ /**
+ * Sets the component family for this component.
+ *
+ * @param componentFamily the component family
+ */
+ public void setComponentFamily(
+ String componentFamily)
+ {
+ _componentFamily = componentFamily;
+ }
+
+ /**
+ * Returns the component family for this component.
+ *
+ * @return the component family
+ */
+ public String getComponentFamily()
+ {
+ return _componentFamily;
+ }
+
+ /**
+ * Sets the renderer type for this component.
+ *
+ * @param rendererType the renderer type
+ */
+ public void setRendererType(
+ String rendererType)
+ {
+ _rendererType = rendererType;
+ }
+
+ /**
+ * Returns the renderer type for this component.
+ *
+ * @return the renderer type
+ */
+ public String getRendererType()
+ {
+ return _rendererType;
+ }
+
+ /**
+ * Sets the renderer class for this renderer.
+ *
+ * @param rendererClass the renderer class
+ */
+ public void setRendererClass(
+ String rendererClass)
+ {
+ _rendererClass = rendererClass;
+ }
+
+ /**
+ * Returns the renderer class for this renderer.
+ *
+ * @return the renderer class
+ */
+ public String getRendererClass()
+ {
+ return _rendererClass;
+ }
+
+ /**
+ * Sets the description of this attribute.
+ *
+ * @param description the attribute description
+ */
+ public void setDescription(
+ String description)
+ {
+ _description = description;
+ }
+
+ /**
+ * Returns the description of this attribute.
+ *
+ * @return the attribute description
+ */
+ public String getDescription()
+ {
+ return _description;
+ }
+
+ /**
+ * Sets the component type for this component.
+ *
+ * @param componentType the component type
+ */
+ public void setComponentType(
+ String componentType)
+ {
+ _componentType = componentType;
+ }
+
+ /**
+ * Returns the component type for this component.
+ *
+ * @return the component type
+ */
+ public String getComponentType()
+ {
+ return _componentType;
+ }
+
+ /**
+ * Sets the renderer superclass for this renderer.
+ *
+ * @param rendererSuperclass the renderer superclass
+ */
+ public void setRendererSuperclass(
+ String rendererSuperclass)
+ {
+ _rendererSuperclass = rendererSuperclass;
+ }
+
+ /**
+ * Returns the renderer superclass for this component.
+ *
+ * @return the renderer superclass
+ */
+ public String getRendererSuperclass()
+ {
+ return _rendererSuperclass;
+ }
+
+ /**
+ * Finds the renderer-specific component class for this renderer.
+ *
+ * @return the renderer-specifc component class
+ */
+ public String findComponentClass()
+ {
+ ComponentBean component = resolveComponentType();
+ return (component != null) ? component.getComponentClass()
+ : "org.apache.myfaces.adf.component.UIXComponent";
+ }
+
+ /**
+ * Finds the behavioral component class for this renderer.
+ *
+ * @return the behavioral component class
+ */
+ public String findComponentFamilyClass()
+ {
+ ComponentBean component = resolveComponentType();
+ ComponentBean behavioral = (component != null)
+ ? component.findBehavioralComponent()
+ : null;
+ return (behavioral != null) ? behavioral.getComponentClass()
+ : "org.apache.myfaces.adf.component.UIXComponent";
+ }
+
+ /**
+ * Adds a attribute to this component.
+ *
+ * @param attribute the attribute to add
+ */
+ public void addAttribute(
+ AttributeBean attribute)
+ {
+ _attributes.put(attribute.getAttributeName(), attribute);
+ }
+
+ /**
+ * Returns the attribute for this attribute name.
+ *
+ * @param attributeName the attribute name to find
+ */
+ public AttributeBean findAttribute(
+ String attributeName)
+ {
+ AttributeBean attribute = (AttributeBean)_attributes.get(attributeName);
+
+ if (attribute == null)
+ {
+ ComponentBean component = resolveComponentType();
+ if (component != null)
+ attribute = component.findProperty(attributeName);
+ }
+
+ return attribute;
+ }
+
+ /**
+ * Returns true if this component has any attributes.
+ *
+ * @return true if this component has any attributes,
+ * false otherwise
+ */
+ public boolean hasAttributes()
+ {
+ boolean hasAttributes = !_attributes.isEmpty();
+
+ if (!hasAttributes)
+ {
+ ComponentBean component = resolveComponentType();
+ if (component != null)
+ hasAttributes |= component.hasProperties();
+ }
+
+ return hasAttributes;
+ }
+
+ /**
+ * Returns true if this component or any component supertype
+ * has any attributes.
+ *
+ * @return true if this component or any supertype has any attributes,
+ * false otherwise
+ */
+ public boolean hasAttributes(
+ boolean flatten)
+ {
+ boolean hasAttributes = hasAttributes();
+
+ if (!hasAttributes && flatten)
+ {
+ ComponentBean component = resolveComponentType();
+ if (component != null)
+ {
+ ComponentBean parent = component.resolveSupertype();
+ if (parent != null)
+ hasAttributes |= parent.hasProperties(true);
+ }
+ }
+
+ return hasAttributes;
+ }
+
+ /**
+ * Returns an iterator for all attributes on this component only.
+ *
+ * @return the attribute iterator
+ */
+ public Iterator attributes()
+ {
+ Iterator attributes = _attributes.values().iterator();
+
+ ComponentBean component = resolveComponentType();
+ if (component != null)
+ attributes = new CompoundIterator(attributes, component.properties());
+
+ return attributes;
+ }
+
+ /**
+ * Returns an iterator for attributes on this component.
+ *
+ * @param flatten true if the iterator should be a combined list of
+ * attributes of this component and its supertype,
+ * false otherwise
+ *
+ * @return the attribute iterator
+ */
+ public Iterator attributes(
+ boolean flatten)
+ {
+ Iterator attributes = attributes();
+ if (flatten)
+ {
+ ComponentBean component = resolveComponentType();
+ if (component != null)
+ {
+ ComponentBean parent = component.resolveSupertype();
+ if (parent != null)
+ attributes = new CompoundIterator(attributes, parent.properties(true));
+ }
+ }
+ return attributes;
+ }
+
+ /**
+ * Adds a facet to this component.
+ *
+ * @param facet the facet to add
+ */
+ public void addFacet(
+ FacetBean facet)
+ {
+ _facets.put(facet.getFacetName(), facet);
+ }
+
+ /**
+ * Returns the facet for this facet name.
+ *
+ * @param facetName the facet name to find
+ */
+ public FacetBean findFacet(
+ String facetName)
+ {
+ return (FacetBean)_facets.get(facetName);
+ }
+
+ /**
+ * Returns true if this component has any facets.
+ *
+ * @return true if this component has any facets,
+ * false otherwise
+ */
+ public boolean hasFacets()
+ {
+ boolean hasFacets = !_facets.isEmpty();
+
+ ComponentBean component = resolveComponentType();
+ if (component != null)
+ hasFacets |= component.hasFacets();
+
+ return hasFacets;
+ }
+
+ /**
+ * Returns true if this component or any component supertype
+ * has any facets.
+ *
+ * @return true if this component or any supertype has any facets,
+ * false otherwise
+ */
+ public boolean hasFacets(
+ boolean flatten)
+ {
+ boolean hasFacets = hasFacets();
+
+ if (!hasFacets && flatten)
+ {
+ ComponentBean component = resolveComponentType();
+ if (component != null)
+ {
+ ComponentBean parent = component.resolveSupertype();
+ if (parent != null)
+ hasFacets |= parent.hasFacets(true);
+ }
+ }
+
+ return hasFacets;
+ }
+
+ /**
+ * Returns an iterator for all facets on this component only.
+ *
+ * @return the facet iterator
+ */
+ public Iterator facets()
+ {
+ Iterator facets = _facets.values().iterator();
+
+ ComponentBean component = resolveComponentType();
+ if (component != null)
+ facets = new CompoundIterator(facets, component.facets());
+
+ return facets;
+ }
+
+ /**
+ * Returns an iterator for facets on this component.
+ *
+ * @param flatten true if the iterator should be a combined list of
+ * facets of this component and its supertype,
+ * false otherwise
+ *
+ * @return the facet iterator
+ */
+ public Iterator facets(
+ boolean flatten)
+ {
+ Iterator facets = facets();
+ if (flatten)
+ {
+ ComponentBean component = resolveComponentType();
+ if (component != null)
+ {
+ ComponentBean parent = component.resolveSupertype();
+ if (parent != null)
+ facets = new CompoundIterator(facets, parent.facets(true));
+ }
+ }
+ return facets;
+ }
+
+ /**
+ * Returns the component type instance.
+ *
+ * @return the component type instance
+ */
+ public ComponentBean resolveComponentType()
+ {
+ if (_componentType == null)
+ return null;
+
+ FacesConfigBean owner = getOwner();
+ return (owner != null) ? owner.findComponent(_componentType) : null;
+ }
+
+ private String _description;
+ private String _componentFamily;
+ private String _rendererType;
+ private String _rendererClass;
+ private String _rendererSuperclass;
+ private String _componentType;
+ private Map _attributes;
+ private Map _facets;
}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RendererBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ValidatorBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ValidatorBean.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ValidatorBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ValidatorBean.java Mon Jul 24 19:17:31 2006
@@ -13,333 +13,333 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
-
-import java.lang.reflect.Modifier;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-/**
- * ValidatorBean is a Java representation of the faces-config validator
- * XML element.
- */
-public class ValidatorBean extends ObjectBean
-{
- /**
- * Creates a new ValidatorBean.
- */
- public ValidatorBean()
- {
- _properties = new LinkedHashMap();
- }
-
- /**
- * Sets the validator identifer for this component.
- *
- * @param validatorId validator identifer
- */
- public void setValidatorId(
- String validatorId)
- {
- _validatorId = validatorId;
- }
-
- /**
- * Returns true if the validator identifier is specified, otherwise false.
- *
- * @return true if the validator identifier is specified,
- * otherwise false.
- */
- public boolean hasValidatorId()
- {
- return (_validatorId != null);
- }
-
- /**
- * Returns the validator identifier for this component.
- *
- * @return the validator identifier
- */
- public String getValidatorId()
- {
- return _validatorId;
- }
-
- /**
- * Sets the validator class for this component.
- *
- * @param validatorClass the validator class
- */
- public void setValidatorClass(
- String validatorClass)
- {
- _validatorClass = validatorClass;
- }
-
- /**
- * Returns the validator class for this component.
- *
- * @return the validator class
- */
- public String getValidatorClass()
- {
- return _validatorClass;
- }
-
- /**
- * Sets the description of this property.
- *
- * @param description the property description
- */
- public void setDescription(
- String description)
- {
- _description = description;
- }
-
- /**
- * Returns the description of this property.
- *
- * @return the property description
- */
- public String getDescription()
- {
- return _description;
- }
-
- /**
- * Sets the long description of this property.
- *
- * @param longDescription the long property description
- */
- public void setLongDescription(
- String longDescription)
- {
- _longDescription = longDescription;
- }
-
- /**
- * Returns the long description of this property.
- *
- * @return the long property description
- */
- public String getLongDescription()
- {
- return _longDescription;
- }
-
- /**
- * Sets the JSP tag handler class for this component.
- *
- * @param tagClass the JSP tag handler class
- */
- public void setTagClass(
- String tagClass)
- {
- _tagClass = tagClass;
- }
-
- /**
- * Returns the JSP tag handler class for this component.
- *
- * @return the JSP tag handler class
- */
- public String getTagClass()
- {
- return _tagClass;
- }
-
- /**
- * Returns the JSP tag name for this component.
- *
- * @return the JSP tag name
- */
- public QName getTagName()
- {
- return _tagName;
- }
-
- /**
- * Sets the JSP tag name for this component.
- *
- * @param tagClass the JSP tag name
- */
- public void setTagName(
- QName tagName)
- {
- _tagName = tagName;
- }
-
- /**
- * Sets the validator super class for this component.
- *
- * @param validatorSuperClass the validator super class
- */
- public void setValidatorSuperClass(
- String validatorSuperClass)
- {
- _validatorSuperClass = validatorSuperClass;
- }
-
- /**
- * Returns the validator super class for this component.
- *
- * @return the validator super class
- */
- public String getValidatorSuperClass()
- {
- return _validatorSuperClass;
- }
-
- /**
- * Adds a property to this component.
- *
- * @param property the property to add
- */
- public void addProperty(
- PropertyBean property)
- {
- _properties.put(property.getPropertyName(), property);
- }
-
- /**
- * Returns the property for this property name.
- *
- * @param propertyName the property name to find
- */
- public PropertyBean findProperty(
- String propertyName)
- {
- return (PropertyBean)_properties.get(propertyName);
- }
-
- /**
- * Returns true if this component has any properties.
- *
- * @return true if this component has any properties,
- * false otherwise
- */
- public boolean hasProperties()
- {
- return !_properties.isEmpty();
- }
-
- /**
- * Returns an iterator for all properties on this component only.
- *
- * @return the property iterator
- */
- public Iterator properties()
- {
- return _properties.values().iterator();
- }
-
- /**
- * Adds a Java Language class modifier to the validator class.
- *
- * @param modifier the modifier to be added
- */
- public void addValidatorClassModifier(
- int modifier)
- {
- _validatorClassModifiers |= modifier;
- }
-
- /**
- * Returns the Java Language class modifiers for the validator class.
- * By default, these modifiers include Modifier.PUBLIC.
- *
- * @return the Java Language class modifiers for the validator class
- */
- public int getValidatorClassModifiers()
- {
- int modifiers = _validatorClassModifiers;
-
- if (!Modifier.isPrivate(modifiers) &&
- !Modifier.isProtected(modifiers) &&
- !Modifier.isPublic(modifiers))
- {
- modifiers |= Modifier.PUBLIC;
- }
-
- return modifiers;
- }
-
- public void parseValidatorClassModifier(
- String modifier)
- {
- addValidatorClassModifier(_parseModifier(modifier));
- }
-
- public void parseTagClassModifier(
- String modifier)
- {
- addTagClassModifier(_parseModifier(modifier));
- }
-
- private int _parseModifier(
- String text)
- {
- if ("public".equals(text))
- return Modifier.PUBLIC;
- else if ("protected".equals(text))
- return Modifier.PROTECTED;
- else if ("private".equals(text))
- return Modifier.PRIVATE;
- else if ("abstract".equals(text))
- return Modifier.ABSTRACT;
- else if ("final".equals(text))
- return Modifier.FINAL;
-
- throw new IllegalArgumentException("Unrecognized modifier: " + text);
- }
-
- /**
- * Adds a Java Language class modifier to the tag class.
- *
- * @param modifier the modifier to be added
- */
- public void addTagClassModifier(
- int modifier)
- {
- _tagClassModifiers |= modifier;
- }
-
- /**
- * Returns the Java Language class modifiers for the tag class.
- * By default, these modifiers include Modifier.PUBLIC.
- *
- * @return the Java Language class modifiers for the tag class
- */
- public int getTagClassModifiers()
- {
- int modifiers = _tagClassModifiers;
-
- if (!Modifier.isPrivate(modifiers) &&
- !Modifier.isProtected(modifiers) &&
- !Modifier.isPublic(modifiers))
- {
- modifiers |= Modifier.PUBLIC;
- }
-
- return modifiers;
- }
-
- private String _description;
- private String _longDescription;
- private String _validatorId;
- private String _validatorClass;
- private String _validatorSuperClass;
- private QName _tagName;
- private String _tagClass;
- private Map _properties;
- private int _validatorClassModifiers;
- private int _tagClassModifiers;
-
-
- static private final Logger _LOG = Logger.getLogger(ValidatorBean.class.getName());
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+
+import java.lang.reflect.Modifier;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import javax.xml.namespace.QName;
+
+/**
+ * ValidatorBean is a Java representation of the faces-config validator
+ * XML element.
+ */
+public class ValidatorBean extends ObjectBean
+{
+ /**
+ * Creates a new ValidatorBean.
+ */
+ public ValidatorBean()
+ {
+ _properties = new LinkedHashMap();
+ }
+
+ /**
+ * Sets the validator identifer for this component.
+ *
+ * @param validatorId validator identifer
+ */
+ public void setValidatorId(
+ String validatorId)
+ {
+ _validatorId = validatorId;
+ }
+
+ /**
+ * Returns true if the validator identifier is specified, otherwise false.
+ *
+ * @return true if the validator identifier is specified,
+ * otherwise false.
+ */
+ public boolean hasValidatorId()
+ {
+ return (_validatorId != null);
+ }
+
+ /**
+ * Returns the validator identifier for this component.
+ *
+ * @return the validator identifier
+ */
+ public String getValidatorId()
+ {
+ return _validatorId;
+ }
+
+ /**
+ * Sets the validator class for this component.
+ *
+ * @param validatorClass the validator class
+ */
+ public void setValidatorClass(
+ String validatorClass)
+ {
+ _validatorClass = validatorClass;
+ }
+
+ /**
+ * Returns the validator class for this component.
+ *
+ * @return the validator class
+ */
+ public String getValidatorClass()
+ {
+ return _validatorClass;
+ }
+
+ /**
+ * Sets the description of this property.
+ *
+ * @param description the property description
+ */
+ public void setDescription(
+ String description)
+ {
+ _description = description;
+ }
+
+ /**
+ * Returns the description of this property.
+ *
+ * @return the property description
+ */
+ public String getDescription()
+ {
+ return _description;
+ }
+
+ /**
+ * Sets the long description of this property.
+ *
+ * @param longDescription the long property description
+ */
+ public void setLongDescription(
+ String longDescription)
+ {
+ _longDescription = longDescription;
+ }
+
+ /**
+ * Returns the long description of this property.
+ *
+ * @return the long property description
+ */
+ public String getLongDescription()
+ {
+ return _longDescription;
+ }
+
+ /**
+ * Sets the JSP tag handler class for this component.
+ *
+ * @param tagClass the JSP tag handler class
+ */
+ public void setTagClass(
+ String tagClass)
+ {
+ _tagClass = tagClass;
+ }
+
+ /**
+ * Returns the JSP tag handler class for this component.
+ *
+ * @return the JSP tag handler class
+ */
+ public String getTagClass()
+ {
+ return _tagClass;
+ }
+
+ /**
+ * Returns the JSP tag name for this component.
+ *
+ * @return the JSP tag name
+ */
+ public QName getTagName()
+ {
+ return _tagName;
+ }
+
+ /**
+ * Sets the JSP tag name for this component.
+ *
+ * @param tagClass the JSP tag name
+ */
+ public void setTagName(
+ QName tagName)
+ {
+ _tagName = tagName;
+ }
+
+ /**
+ * Sets the validator super class for this component.
+ *
+ * @param validatorSuperClass the validator super class
+ */
+ public void setValidatorSuperClass(
+ String validatorSuperClass)
+ {
+ _validatorSuperClass = validatorSuperClass;
+ }
+
+ /**
+ * Returns the validator super class for this component.
+ *
+ * @return the validator super class
+ */
+ public String getValidatorSuperClass()
+ {
+ return _validatorSuperClass;
+ }
+
+ /**
+ * Adds a property to this component.
+ *
+ * @param property the property to add
+ */
+ public void addProperty(
+ PropertyBean property)
+ {
+ _properties.put(property.getPropertyName(), property);
+ }
+
+ /**
+ * Returns the property for this property name.
+ *
+ * @param propertyName the property name to find
+ */
+ public PropertyBean findProperty(
+ String propertyName)
+ {
+ return (PropertyBean)_properties.get(propertyName);
+ }
+
+ /**
+ * Returns true if this component has any properties.
+ *
+ * @return true if this component has any properties,
+ * false otherwise
+ */
+ public boolean hasProperties()
+ {
+ return !_properties.isEmpty();
+ }
+
+ /**
+ * Returns an iterator for all properties on this component only.
+ *
+ * @return the property iterator
+ */
+ public Iterator properties()
+ {
+ return _properties.values().iterator();
+ }
+
+ /**
+ * Adds a Java Language class modifier to the validator class.
+ *
+ * @param modifier the modifier to be added
+ */
+ public void addValidatorClassModifier(
+ int modifier)
+ {
+ _validatorClassModifiers |= modifier;
+ }
+
+ /**
+ * Returns the Java Language class modifiers for the validator class.
+ * By default, these modifiers include Modifier.PUBLIC.
+ *
+ * @return the Java Language class modifiers for the validator class
+ */
+ public int getValidatorClassModifiers()
+ {
+ int modifiers = _validatorClassModifiers;
+
+ if (!Modifier.isPrivate(modifiers) &&
+ !Modifier.isProtected(modifiers) &&
+ !Modifier.isPublic(modifiers))
+ {
+ modifiers |= Modifier.PUBLIC;
+ }
+
+ return modifiers;
+ }
+
+ public void parseValidatorClassModifier(
+ String modifier)
+ {
+ addValidatorClassModifier(_parseModifier(modifier));
+ }
+
+ public void parseTagClassModifier(
+ String modifier)
+ {
+ addTagClassModifier(_parseModifier(modifier));
+ }
+
+ private int _parseModifier(
+ String text)
+ {
+ if ("public".equals(text))
+ return Modifier.PUBLIC;
+ else if ("protected".equals(text))
+ return Modifier.PROTECTED;
+ else if ("private".equals(text))
+ return Modifier.PRIVATE;
+ else if ("abstract".equals(text))
+ return Modifier.ABSTRACT;
+ else if ("final".equals(text))
+ return Modifier.FINAL;
+
+ throw new IllegalArgumentException("Unrecognized modifier: " + text);
+ }
+
+ /**
+ * Adds a Java Language class modifier to the tag class.
+ *
+ * @param modifier the modifier to be added
+ */
+ public void addTagClassModifier(
+ int modifier)
+ {
+ _tagClassModifiers |= modifier;
+ }
+
+ /**
+ * Returns the Java Language class modifiers for the tag class.
+ * By default, these modifiers include Modifier.PUBLIC.
+ *
+ * @return the Java Language class modifiers for the tag class
+ */
+ public int getTagClassModifiers()
+ {
+ int modifiers = _tagClassModifiers;
+
+ if (!Modifier.isPrivate(modifiers) &&
+ !Modifier.isProtected(modifiers) &&
+ !Modifier.isPublic(modifiers))
+ {
+ modifiers |= Modifier.PUBLIC;
+ }
+
+ return modifiers;
+ }
+
+ private String _description;
+ private String _longDescription;
+ private String _validatorId;
+ private String _validatorClass;
+ private String _validatorSuperClass;
+ private QName _tagName;
+ private String _tagClass;
+ private Map _properties;
+ private int _validatorClassModifiers;
+ private int _tagClassModifiers;
+
+
+ static private final Logger _LOG = Logger.getLogger(ValidatorBean.class.getName());
}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ValidatorBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/converters/QNameConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/converters/QNameConverter.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/converters/QNameConverter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/converters/QNameConverter.java Mon Jul 24 19:17:31 2006
@@ -13,38 +13,38 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse.converters;
-
-import javax.xml.namespace.QName;
-
-import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.beanutils.Converter;
-
-public final class QNameConverter implements Converter
-{
- public Object convert(
- Class type,
- Object value)
- {
- if (value == null)
- throw new ConversionException("Missing value");
-
- if (value instanceof QName)
- return value;
-
- try
- {
- return QName.valueOf(value.toString());
- }
- catch (Exception e)
- {
- throw new ConversionException(e);
- }
- }
-
- static public void register()
- {
- ConvertUtils.register(new QNameConverter(), QName.class);
- }
-}
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse.converters;
+
+import javax.xml.namespace.QName;
+
+import org.apache.commons.beanutils.ConversionException;
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.Converter;
+
+public final class QNameConverter implements Converter
+{
+ public Object convert(
+ Class type,
+ Object value)
+ {
+ if (value == null)
+ throw new ConversionException("Missing value");
+
+ if (value instanceof QName)
+ return value;
+
+ try
+ {
+ return QName.valueOf(value.toString());
+ }
+ catch (Exception e)
+ {
+ throw new ConversionException(e);
+ }
+ }
+
+ static public void register()
+ {
+ ConvertUtils.register(new QNameConverter(), QName.class);
+ }
+}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/converters/QNameConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/rules/BeanPropertySetterRule.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/rules/BeanPropertySetterRule.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/rules/BeanPropertySetterRule.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/rules/BeanPropertySetterRule.java Mon Jul 24 19:17:31 2006
@@ -13,72 +13,72 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse.rules;
-
-import java.beans.PropertyDescriptor;
-
-import javax.xml.namespace.QName;
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse.rules;
+
+import java.beans.PropertyDescriptor;
+
+import javax.xml.namespace.QName;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.converters.QNameConverter;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.PropertyUtils;
-
-
-/**
- * Extends Apache Commons Digester BeanPropertySetterRule to add QName support.
- *
- * A QName conveter is not sufficient because it requires contextual
- * knowledge of the current prefix-to-namespace mappings.
- */
-public class BeanPropertySetterRule
- extends org.apache.commons.digester.BeanPropertySetterRule
-{
- public BeanPropertySetterRule(
- String propertyName)
- {
- super(propertyName);
- }
-
- public void end(
- String namespace,
- String name) throws Exception
- {
- Object top = digester.peek();
-
- PropertyDescriptor descriptor =
- PropertyUtils.getPropertyDescriptor(top, propertyName);
-
- if (descriptor == null)
- {
- throw new NoSuchMethodException("Missing bean property \"" +
- propertyName + "\"");
- }
-
- Class propertyType = descriptor.getPropertyType();
-
- if (QName.class.equals(propertyType))
- {
- int colon = bodyText.indexOf(':');
- if (colon != -1)
- {
- String namespaceURI = digester.findNamespaceURI(bodyText.substring(0, colon));
- bodyText = "{" + namespaceURI + "}" + bodyText.substring(colon + 1);
- }
- else if (bodyText.indexOf('{') == -1)
- {
- String namespaceURI = digester.findNamespaceURI("");
- bodyText = "{" + namespaceURI + "}" + bodyText.substring(colon + 1);
- }
- BeanUtils.setProperty(top, propertyName, bodyText);
- }
- else
- {
- super.end(namespace, name);
- }
- }
-
- static
- {
- QNameConverter.register();
- }
-}
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.PropertyUtils;
+
+
+/**
+ * Extends Apache Commons Digester BeanPropertySetterRule to add QName support.
+ *
+ * A QName conveter is not sufficient because it requires contextual
+ * knowledge of the current prefix-to-namespace mappings.
+ */
+public class BeanPropertySetterRule
+ extends org.apache.commons.digester.BeanPropertySetterRule
+{
+ public BeanPropertySetterRule(
+ String propertyName)
+ {
+ super(propertyName);
+ }
+
+ public void end(
+ String namespace,
+ String name) throws Exception
+ {
+ Object top = digester.peek();
+
+ PropertyDescriptor descriptor =
+ PropertyUtils.getPropertyDescriptor(top, propertyName);
+
+ if (descriptor == null)
+ {
+ throw new NoSuchMethodException("Missing bean property \"" +
+ propertyName + "\"");
+ }
+
+ Class propertyType = descriptor.getPropertyType();
+
+ if (QName.class.equals(propertyType))
+ {
+ int colon = bodyText.indexOf(':');
+ if (colon != -1)
+ {
+ String namespaceURI = digester.findNamespaceURI(bodyText.substring(0, colon));
+ bodyText = "{" + namespaceURI + "}" + bodyText.substring(colon + 1);
+ }
+ else if (bodyText.indexOf('{') == -1)
+ {
+ String namespaceURI = digester.findNamespaceURI("");
+ bodyText = "{" + namespaceURI + "}" + bodyText.substring(colon + 1);
+ }
+ BeanUtils.setProperty(top, propertyName, bodyText);
+ }
+ else
+ {
+ super.end(namespace, name);
+ }
+ }
+
+ static
+ {
+ QNameConverter.register();
+ }
+}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/rules/BeanPropertySetterRule.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/AttributeFilter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/AttributeFilter.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/AttributeFilter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/AttributeFilter.java Mon Jul 24 19:17:31 2006
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.util;
-
+package org.apache.myfaces.trinidadbuild.plugin.faces.util;
+
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.AttributeBean;
-
-abstract public class AttributeFilter implements Filter
-{
- final public boolean accept(
- Object obj)
- {
- return accept((AttributeBean)obj);
- }
-
- abstract protected boolean accept(
- AttributeBean attribute);
-}
+
+abstract public class AttributeFilter implements Filter
+{
+ final public boolean accept(
+ Object obj)
+ {
+ return accept((AttributeBean)obj);
+ }
+
+ abstract protected boolean accept(
+ AttributeBean attribute);
+}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/AttributeFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/ComponentFilter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/ComponentFilter.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/ComponentFilter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/ComponentFilter.java Mon Jul 24 19:17:31 2006
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.util;
-
+package org.apache.myfaces.trinidadbuild.plugin.faces.util;
+
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.ComponentBean;
-
-abstract public class ComponentFilter implements Filter
-{
- final public boolean accept(
- Object obj)
- {
- return accept((ComponentBean)obj);
- }
-
- abstract protected boolean accept(
- ComponentBean component);
-}
+
+abstract public class ComponentFilter implements Filter
+{
+ final public boolean accept(
+ Object obj)
+ {
+ return accept((ComponentBean)obj);
+ }
+
+ abstract protected boolean accept(
+ ComponentBean component);
+}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/ComponentFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/CompoundIterator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/CompoundIterator.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/CompoundIterator.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/CompoundIterator.java Mon Jul 24 19:17:31 2006
@@ -13,64 +13,64 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.util;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-/**
- * CompoundIterator consumes the initial iterator before
- * observing the next iterator.
- */
-public class CompoundIterator implements Iterator
-{
- public CompoundIterator(
- Iterator primary,
- Iterator secondary)
- {
- this(new Iterator[] {primary, secondary});
- }
-
- public CompoundIterator(
- Iterator[] iterators)
- {
- _iterators = iterators;
- _index = 0;
- _advance();
- }
-
- public boolean hasNext()
- {
- return (_next != null);
- }
-
- public Object next()
- {
- if (_next == null)
- throw new NoSuchElementException();
-
- Object obj = _next;
- _advance();
- return obj;
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
-
- private void _advance()
- {
- Iterator current = _iterators[_index];
- if (current != null && !current.hasNext())
- {
- _index ++;
- current = (_index < _iterators.length) ? _iterators[_index] : null;
- }
-
- _next = (current != null && current.hasNext()) ? current.next() : null;
- }
-
- private Object _next;
- private Iterator[] _iterators;
- private int _index;
-}
+package org.apache.myfaces.trinidadbuild.plugin.faces.util;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * CompoundIterator consumes the initial iterator before
+ * observing the next iterator.
+ */
+public class CompoundIterator implements Iterator
+{
+ public CompoundIterator(
+ Iterator primary,
+ Iterator secondary)
+ {
+ this(new Iterator[] {primary, secondary});
+ }
+
+ public CompoundIterator(
+ Iterator[] iterators)
+ {
+ _iterators = iterators;
+ _index = 0;
+ _advance();
+ }
+
+ public boolean hasNext()
+ {
+ return (_next != null);
+ }
+
+ public Object next()
+ {
+ if (_next == null)
+ throw new NoSuchElementException();
+
+ Object obj = _next;
+ _advance();
+ return obj;
+ }
+
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ private void _advance()
+ {
+ Iterator current = _iterators[_index];
+ if (current != null && !current.hasNext())
+ {
+ _index ++;
+ current = (_index < _iterators.length) ? _iterators[_index] : null;
+ }
+
+ _next = (current != null && current.hasNext()) ? current.next() : null;
+ }
+
+ private Object _next;
+ private Iterator[] _iterators;
+ private int _index;
+}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/CompoundIterator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/ConverterFilter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/ConverterFilter.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/ConverterFilter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/ConverterFilter.java Mon Jul 24 19:17:31 2006
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.util;
-
+package org.apache.myfaces.trinidadbuild.plugin.faces.util;
+
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.ConverterBean;
-
-abstract public class ConverterFilter implements Filter
-{
- final public boolean accept(
- Object obj)
- {
- return accept((ConverterBean)obj);
- }
-
- abstract protected boolean accept(
- ConverterBean converter);
-}
+
+abstract public class ConverterFilter implements Filter
+{
+ final public boolean accept(
+ Object obj)
+ {
+ return accept((ConverterBean)obj);
+ }
+
+ abstract protected boolean accept(
+ ConverterBean converter);
+}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/ConverterFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/FacetFilter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/FacetFilter.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/FacetFilter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/FacetFilter.java Mon Jul 24 19:17:31 2006
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.util;
-
+package org.apache.myfaces.trinidadbuild.plugin.faces.util;
+
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.FacetBean;
-
-abstract public class FacetFilter implements Filter
-{
- final public boolean accept(
- Object obj)
- {
- return accept((FacetBean)obj);
- }
-
- abstract protected boolean accept(
- FacetBean facet);
-}
+
+abstract public class FacetFilter implements Filter
+{
+ final public boolean accept(
+ Object obj)
+ {
+ return accept((FacetBean)obj);
+ }
+
+ abstract protected boolean accept(
+ FacetBean facet);
+}
Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/FacetFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/Filter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/Filter.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/Filter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/Filter.java Mon Jul 24 19:17:31 2006
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.trinidadbuild.plugin.faces.util;
-
-public interface Filter
-{
- abstract public boolean accept(
- Object obj);
-}
+package org.apache.myfaces.trinidadbuild.plugin.faces.util;
+
+public interface Filter
+{
+ abstract public boolean accept(
+ Object obj);
+}