incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r425268 [1/7] - in /incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src: main/java-templates/org/apache/myfaces/adf/component/ main/java/org/apache/myfaces/adf/change/ main/java/org/apache/myfaces/adf/component...
Date Tue, 25 Jul 2006 03:54:52 GMT
Author: matzew
Date: Mon Jul 24 20:54:50 2006
New Revision: 425268

URL: http://svn.apache.org/viewvc?rev=425268&view=rev
Log:
mr property spam strikes again

Modified:
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXColumnTemplate.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXGoTemplate.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXIteratorTemplate.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXObjectTemplate.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildComponentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildDocumentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentDocumentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeComponentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeDocumentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/ChangeUtils.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/ComponentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/DocumentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/DocumentChangeFactory.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/RemoveFacetComponentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/ReorderChildrenComponentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/SetFacetChildComponentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/SetFacetChildDocumentChange.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/component/ChildLoop.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/component/ValueMap.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/component/WrapperEvent.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/config/ComponentConfig.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/config/RegionConfig.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/config/RegionManager.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/context/Agent.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/context/DialogService.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/event/PollEvent.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/event/RowDisclosureEvent.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/event/RowDisclosureListener.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/event/RowKeySetChangeEvent.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/event/SelectionEvent.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/event/SortEvent.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/logging/ADFLogRecord.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/model/BoundedRangeModel.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/model/ChildPropertyTreeModel.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/model/CollectionModel.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/model/PathHelper.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/model/ProcessMenuModel.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/model/RowKeyIndex.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/model/RowKeySet.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/model/RowKeySetTreeImpl.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/model/SortCriterion.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/model/ViewIdPropertyMenuModel.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/resource/AggregatingResourceLoader.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/resource/ClassLoaderResourceLoader.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/resource/DynamicResourceLoader.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/resource/StringContentResourceLoader.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/util/ErrorMessages.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/validator/ValidatorUtils.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/bean/FacesBeanImplTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/bean/PropertyKeyTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/bean/SillyStateHolder.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/bean/SubTypeBean.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/bean/TestBean.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/bean/TestValueBinding.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/bean/TypeTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/component/UIXComponentBean.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/component/UIXEditableValueBean.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/component/core/layout/CoreShowManyAccordionTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/component/core/layout/CoreShowOneAccordionTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/convert/JsfDateTimeConverterTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/model/ChildPropertyTreeModelTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetTreeImplTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/model/SortableModelTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/resource/AggregatingResourceLoaderTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/resource/CachingResourceLoaderTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/resource/ResourceLoaderTestCase.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/util/Base64InputStreamTest.java   (contents, props changed)
    incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/adf/util/Base64OutputStreamTest.java   (contents, props changed)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXColumnTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXColumnTemplate.java?rev=425268&r1=425267&r2=425268&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXColumnTemplate.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXColumnTemplate.java Mon Jul 24 20:54:50 2006
@@ -13,56 +13,56 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adf.component;
-import javax.faces.context.FacesContext;
-
-/**
- * Base class for UIXColumns.
- * The facets of this component are not processed during decode,validate and
- * update.
- * @author The Oracle ADF Faces Team
- */
-public abstract class UIXColumnTemplate extends UIXComponentBase
-{
-  /**
-   * Does not process the facets of this column. Only this column and
-   * its children are processed.
-   */
-  public void processDecodes(FacesContext context)
-  {
-    if (!isRendered())
-      return;
-
-    // Process all the children of this component:
-    new ChildLoop.Decode().runAlways(context, this);
-
-    // Process this component itself
-    decode(context);
-  }
-
-  /**
-   * Does not process the facets of this column. Only this column and
-   * its children are processed.
-   */
-  public void processValidators(FacesContext context)
-  {
-    if (!isRendered())
-      return;
-
-    // Process all the children of this component
-    new ChildLoop.Validate().runAlways(context, this);
-  }
-
-  /**
-   * Does not process the facets of this column. Only this column and
-   * its children are processed.
-   */
-  public void processUpdates(FacesContext context)
-  {
-    if (!isRendered())
-      return;
-
-    // Process all the children of this component
-    new ChildLoop.Update().runAlways(context, this);
-  }
-}
+package org.apache.myfaces.adf.component;
+import javax.faces.context.FacesContext;
+
+/**
+ * Base class for UIXColumns.
+ * The facets of this component are not processed during decode,validate and
+ * update.
+ * @author The Oracle ADF Faces Team
+ */
+public abstract class UIXColumnTemplate extends UIXComponentBase
+{
+  /**
+   * Does not process the facets of this column. Only this column and
+   * its children are processed.
+   */
+  public void processDecodes(FacesContext context)
+  {
+    if (!isRendered())
+      return;
+
+    // Process all the children of this component:
+    new ChildLoop.Decode().runAlways(context, this);
+
+    // Process this component itself
+    decode(context);
+  }
+
+  /**
+   * Does not process the facets of this column. Only this column and
+   * its children are processed.
+   */
+  public void processValidators(FacesContext context)
+  {
+    if (!isRendered())
+      return;
+
+    // Process all the children of this component
+    new ChildLoop.Validate().runAlways(context, this);
+  }
+
+  /**
+   * Does not process the facets of this column. Only this column and
+   * its children are processed.
+   */
+  public void processUpdates(FacesContext context)
+  {
+    if (!isRendered())
+      return;
+
+    // Process all the children of this component
+    new ChildLoop.Update().runAlways(context, this);
+  }
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXColumnTemplate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXGoTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXGoTemplate.java?rev=425268&r1=425267&r2=425268&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXGoTemplate.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXGoTemplate.java Mon Jul 24 20:54:50 2006
@@ -1,31 +1,31 @@
-/*
- * Copyright  2003-2006 The Apache Software Foundation.
- * 
- * Licensed 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.adf.component;
-import javax.faces.context.FacesContext;
-
-
-/**
- * Base class for the components with no decode behaviour.
- * <p>
- * @author The Oracle ADF Faces Team
- */
-abstract public class UIXGoTemplate extends UIXComponentBase
-{
-  void __rendererDecode(FacesContext context)
-  {
-    // do nothing. we have no behaviour
-  }
+/*
+ * Copyright  2003-2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.adf.component;
+import javax.faces.context.FacesContext;
+
+
+/**
+ * Base class for the components with no decode behaviour.
+ * <p>
+ * @author The Oracle ADF Faces Team
+ */
+abstract public class UIXGoTemplate extends UIXComponentBase
+{
+  void __rendererDecode(FacesContext context)
+  {
+    // do nothing. we have no behaviour
+  }
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXGoTemplate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXIteratorTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXIteratorTemplate.java?rev=425268&r1=425267&r2=425268&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXIteratorTemplate.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXIteratorTemplate.java Mon Jul 24 20:54:50 2006
@@ -13,253 +13,253 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adf.component;
-import java.io.IOException;
-
-import java.util.AbstractMap;
-import java.util.Iterator;
-import java.util.List;
-
-import java.util.Map;
-import java.util.Set;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseId;
-
-import javax.faces.render.Renderer;
-import org.apache.myfaces.adf.model.CollectionModel;
-import org.apache.myfaces.adf.model.ModelUtils;
-
-/**
- * This component iterates over some given data.
- * Each child is repeatedly stamped as many times as necessary.
- * Iteration is done starting at the index given by {@link #getFirst()}
- * for as many indices as specified by {@link #getRows()}.
- * If {@link #getRows()} returns 0, then the iteration continues until 
- * there are no more elements in the underlying data.
- * @author The Oracle ADF Faces Team
- */
-public abstract class UIXIteratorTemplate extends UIXCollection
-{
-
-/**/  abstract public int getFirst();
-/**/  abstract public void setFirst(int first);
-/**/  abstract public int getRows();
-
-  /**
-   * Override to return true.
-   */
-  public boolean getRendersChildren()
-  {
-    return true;
-  }
-
-  /**
-   * Repeatedly render the children as many times as needed.
-   */
-  public void encodeChildren(final FacesContext context)
-    throws IOException
-  {
-    if (!isRendered())
-      return;
-
-    // if this is the table there will be a rendererType:
-    if (getRendererType() != null)
-    {
-      Renderer renderer = getRenderer(context);
-      if (renderer != null)
-      {
-        renderer.encodeChildren(context, this);
-      }
-    }
-    else // this is not the table. it must be the iterator
-    {
-      Runner runner = new Runner()
-      {
-        protected void process(UIComponent kid) throws IOException
-        {
-          __encodeRecursive(context, kid);
-        }
-      };
-      runner.run();
-      Exception exp = runner.exception;
-      if (exp != null)
-      {
-        if (exp instanceof RuntimeException)
-          throw (RuntimeException) exp;
-
-        throw (IOException) exp;
-      }
-    }
-  }
-
-  /**
-   * Enhances the varStatusMap created by the super class to include:<ul>
-   * <li>begin - the index of the first row being rendered
-   * <li>first - true if the current row is the first row
-   * <li>count - indicates which iteration this is. This always starts at one,
-   * and increases (by one) as the loop progresses.
-   * <li>step - this is always one.
-   * </ul>
-   */
-  protected Map createVarStatusMap()
-  {
-    final Map map = super.createVarStatusMap();
-    return new AbstractMap()
-    {
-      public Object get(Object key)
-      {
-        // some of these keys are from <c:forEach>, ie:
-        // javax.servlet.jsp.jstl.core.LoopTagStatus 
-        if ("begin".equals(key)) // from jstl
-        {
-          return new Integer(getFirst());
-        }
-        if ("first".equals(key)) // from jstl
-        {
-          boolean isFirst = (getFirst() == getRowIndex());
-          return Boolean.valueOf(isFirst);
-        }
-        if ("count".equals(key)) // from jstl
-        {
-          int count = getRowIndex() - getFirst() + 1;
-          return new Integer(count);
-        }
-        if ("step".equals(key)) // from jstl
-        {
-          return new Integer(1);
-        }
-        return map.get(key);
-      }
-    
-      public Set entrySet()
-      {
-        return map.entrySet();
-      }
-    };
-  }
-
-  protected CollectionModel createCollectionModel(
-    CollectionModel current,
-    Object value)
-  {
-    CollectionModel model = ModelUtils.toCollectionModel(value); 
-    // initialize to -1. we need to do this incase some application logic
-    // changed this index. Also, some JSF1.0 RI classes were initially starting
-    // with a rowIndex of 0.
-    // we need this to be -1 because of name-transformation.
-    model.setRowIndex(-1);
-    assert model.getRowIndex() == -1 : "RowIndex did not reset to -1";
-    return model;
-  }
-
-  protected void processFacetsAndChildren(
-    final FacesContext context,
-    final PhaseId phaseId)
-  {
-    Runner runner = new Runner()
-    {
-      protected void process(UIComponent kid)
-      {
-        processComponent(context, kid, phaseId);
-      }
-    };
-    runner.run();
-  }
-
-  private abstract class Runner
-  {
-    public final void run()
-    {
-      List stamps = getStamps();
-      int oldIndex = getRowIndex();
-      int first = getFirst();
-      int rows = getRows();
-      int end = (rows <= 0) //show everything
-        ? Integer.MAX_VALUE
-        : first + rows;
-      try
-      {
-        for(int i=first; i<end; i++)
-        {
-          setRowIndex(i);
-          if (isRowAvailable())
-          {
-            Iterator kids = stamps.iterator();
-            while(kids.hasNext())
-            {
-              process((UIComponent) kids.next());
-            }
-          }
-          else
-            break;
-        }
-      }
-      catch (Exception e)
-      {
-        exception = e;
-      }
-      finally
-      {
-        setRowIndex(oldIndex);
-      }
-    }
-    
-    public Exception exception = null;
-    protected abstract void process(UIComponent comp) throws Exception;
-  }
-
-  void __encodeBegin(FacesContext context) throws IOException
-  {
-    _fixupFirst();
-    super.__encodeBegin(context);
-  }
-
-  // make sure the current range exists on the model:
-  // see bug 4143852:
-  private void _fixupFirst()
-  {
-    int first = getFirst();
-    // if we are starting from row zero then there is no problem:
-    if (first == 0)
-      return;
-    CollectionModel model = getCollectionModel();
-    int oldIndex = model.getRowIndex();
-    try
-    {
-      model.setRowIndex(first);
-      // if the starting row doesn't exist then we need to scroll back:
-      if (!model.isRowAvailable())
-      {
-        int size = model.getRowCount();
-        int rows = getRows();
-        // if the rowCount is unknown OR
-        //    the blockSize is show all OR
-        //    there are fewer rows than the blockSize on the table
-        // then start from the beginning:
-        if ((size <= 0) || (rows <= 0) || (size <= rows))
-          first = 0;
-        else
-        {
-          // scroll to the last page: 
-          first = size - rows;
-          model.setRowIndex(first);
-          // make sure the row is indeed available:
-          if (!model.isRowAvailable())
-          {
-            // row is not available. this happens when getRowCount() lies.
-            // Some DataModel implementations seem to have rowCount methods which
-            // lie. see bug 4157186
-            first = 0;
-          }
-        }
-        setFirst(first);
-      }
-    }
-    finally
-    {
-      model.setRowIndex(oldIndex);
-    }
-  }
-
-}
+package org.apache.myfaces.adf.component;
+import java.io.IOException;
+
+import java.util.AbstractMap;
+import java.util.Iterator;
+import java.util.List;
+
+import java.util.Map;
+import java.util.Set;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+
+import javax.faces.render.Renderer;
+import org.apache.myfaces.adf.model.CollectionModel;
+import org.apache.myfaces.adf.model.ModelUtils;
+
+/**
+ * This component iterates over some given data.
+ * Each child is repeatedly stamped as many times as necessary.
+ * Iteration is done starting at the index given by {@link #getFirst()}
+ * for as many indices as specified by {@link #getRows()}.
+ * If {@link #getRows()} returns 0, then the iteration continues until 
+ * there are no more elements in the underlying data.
+ * @author The Oracle ADF Faces Team
+ */
+public abstract class UIXIteratorTemplate extends UIXCollection
+{
+
+/**/  abstract public int getFirst();
+/**/  abstract public void setFirst(int first);
+/**/  abstract public int getRows();
+
+  /**
+   * Override to return true.
+   */
+  public boolean getRendersChildren()
+  {
+    return true;
+  }
+
+  /**
+   * Repeatedly render the children as many times as needed.
+   */
+  public void encodeChildren(final FacesContext context)
+    throws IOException
+  {
+    if (!isRendered())
+      return;
+
+    // if this is the table there will be a rendererType:
+    if (getRendererType() != null)
+    {
+      Renderer renderer = getRenderer(context);
+      if (renderer != null)
+      {
+        renderer.encodeChildren(context, this);
+      }
+    }
+    else // this is not the table. it must be the iterator
+    {
+      Runner runner = new Runner()
+      {
+        protected void process(UIComponent kid) throws IOException
+        {
+          __encodeRecursive(context, kid);
+        }
+      };
+      runner.run();
+      Exception exp = runner.exception;
+      if (exp != null)
+      {
+        if (exp instanceof RuntimeException)
+          throw (RuntimeException) exp;
+
+        throw (IOException) exp;
+      }
+    }
+  }
+
+  /**
+   * Enhances the varStatusMap created by the super class to include:<ul>
+   * <li>begin - the index of the first row being rendered
+   * <li>first - true if the current row is the first row
+   * <li>count - indicates which iteration this is. This always starts at one,
+   * and increases (by one) as the loop progresses.
+   * <li>step - this is always one.
+   * </ul>
+   */
+  protected Map createVarStatusMap()
+  {
+    final Map map = super.createVarStatusMap();
+    return new AbstractMap()
+    {
+      public Object get(Object key)
+      {
+        // some of these keys are from <c:forEach>, ie:
+        // javax.servlet.jsp.jstl.core.LoopTagStatus 
+        if ("begin".equals(key)) // from jstl
+        {
+          return new Integer(getFirst());
+        }
+        if ("first".equals(key)) // from jstl
+        {
+          boolean isFirst = (getFirst() == getRowIndex());
+          return Boolean.valueOf(isFirst);
+        }
+        if ("count".equals(key)) // from jstl
+        {
+          int count = getRowIndex() - getFirst() + 1;
+          return new Integer(count);
+        }
+        if ("step".equals(key)) // from jstl
+        {
+          return new Integer(1);
+        }
+        return map.get(key);
+      }
+    
+      public Set entrySet()
+      {
+        return map.entrySet();
+      }
+    };
+  }
+
+  protected CollectionModel createCollectionModel(
+    CollectionModel current,
+    Object value)
+  {
+    CollectionModel model = ModelUtils.toCollectionModel(value); 
+    // initialize to -1. we need to do this incase some application logic
+    // changed this index. Also, some JSF1.0 RI classes were initially starting
+    // with a rowIndex of 0.
+    // we need this to be -1 because of name-transformation.
+    model.setRowIndex(-1);
+    assert model.getRowIndex() == -1 : "RowIndex did not reset to -1";
+    return model;
+  }
+
+  protected void processFacetsAndChildren(
+    final FacesContext context,
+    final PhaseId phaseId)
+  {
+    Runner runner = new Runner()
+    {
+      protected void process(UIComponent kid)
+      {
+        processComponent(context, kid, phaseId);
+      }
+    };
+    runner.run();
+  }
+
+  private abstract class Runner
+  {
+    public final void run()
+    {
+      List stamps = getStamps();
+      int oldIndex = getRowIndex();
+      int first = getFirst();
+      int rows = getRows();
+      int end = (rows <= 0) //show everything
+        ? Integer.MAX_VALUE
+        : first + rows;
+      try
+      {
+        for(int i=first; i<end; i++)
+        {
+          setRowIndex(i);
+          if (isRowAvailable())
+          {
+            Iterator kids = stamps.iterator();
+            while(kids.hasNext())
+            {
+              process((UIComponent) kids.next());
+            }
+          }
+          else
+            break;
+        }
+      }
+      catch (Exception e)
+      {
+        exception = e;
+      }
+      finally
+      {
+        setRowIndex(oldIndex);
+      }
+    }
+    
+    public Exception exception = null;
+    protected abstract void process(UIComponent comp) throws Exception;
+  }
+
+  void __encodeBegin(FacesContext context) throws IOException
+  {
+    _fixupFirst();
+    super.__encodeBegin(context);
+  }
+
+  // make sure the current range exists on the model:
+  // see bug 4143852:
+  private void _fixupFirst()
+  {
+    int first = getFirst();
+    // if we are starting from row zero then there is no problem:
+    if (first == 0)
+      return;
+    CollectionModel model = getCollectionModel();
+    int oldIndex = model.getRowIndex();
+    try
+    {
+      model.setRowIndex(first);
+      // if the starting row doesn't exist then we need to scroll back:
+      if (!model.isRowAvailable())
+      {
+        int size = model.getRowCount();
+        int rows = getRows();
+        // if the rowCount is unknown OR
+        //    the blockSize is show all OR
+        //    there are fewer rows than the blockSize on the table
+        // then start from the beginning:
+        if ((size <= 0) || (rows <= 0) || (size <= rows))
+          first = 0;
+        else
+        {
+          // scroll to the last page: 
+          first = size - rows;
+          model.setRowIndex(first);
+          // make sure the row is indeed available:
+          if (!model.isRowAvailable())
+          {
+            // row is not available. this happens when getRowCount() lies.
+            // Some DataModel implementations seem to have rowCount methods which
+            // lie. see bug 4157186
+            first = 0;
+          }
+        }
+        setFirst(first);
+      }
+    }
+    finally
+    {
+      model.setRowIndex(oldIndex);
+    }
+  }
+
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXIteratorTemplate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXObjectTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXObjectTemplate.java?rev=425268&r1=425267&r2=425268&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXObjectTemplate.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXObjectTemplate.java Mon Jul 24 20:54:50 2006
@@ -1,31 +1,31 @@
-/*
- * Copyright  2003-2006 The Apache Software Foundation.
- * 
- * Licensed 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.adf.component;
-import javax.faces.context.FacesContext;
-
-
-/**
- * Base class for the components with no decode behaviour.
- * <p>
- * @author The Oracle ADF Faces Team
- */
-abstract public class UIXObjectTemplate extends UIXComponentBase
-{
-  void __rendererDecode(FacesContext context)
-  {
-    // do nothing. we have no behaviour
-  }
+/*
+ * Copyright  2003-2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.adf.component;
+import javax.faces.context.FacesContext;
+
+
+/**
+ * Base class for the components with no decode behaviour.
+ * <p>
+ * @author The Oracle ADF Faces Team
+ */
+abstract public class UIXObjectTemplate extends UIXComponentBase
+{
+  void __rendererDecode(FacesContext context)
+  {
+    // do nothing. we have no behaviour
+  }
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/adf/component/UIXObjectTemplate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildComponentChange.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildComponentChange.java?rev=425268&r1=425267&r2=425268&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildComponentChange.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildComponentChange.java Mon Jul 24 20:54:50 2006
@@ -1,119 +1,119 @@
-/*
- * Copyright  2005,2006 The Apache Software Foundation.
- * 
- * Licensed 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.adf.change;
-
-import java.util.List;
-
-import javax.faces.component.UIComponent;
-
-/**
- * Change specialization for adding a child component.
- * While applying this Change, the child component is re-created and added to
- *  the list of children.
- * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-api/src/main/java/oracle/adf/view/faces/change/AddChildComponentChange.java#0 $) $Date: 10-nov-2005.19:09:54 $
- * @author The Oracle ADF Faces Team
- */
-public class AddChildComponentChange extends AddComponentChange 
-{
-  /**
-   * Constructs an AddChildChange that appends the specified child component.
-   * @param childComponent The child component that is to be appended.
-   * @throws IllegalArgumentException if specified childComponent is null.
-   */
-  public AddChildComponentChange(UIComponent childComponent)
-  {
-    this(null,childComponent);
-  }
-  
-  /**
-   * Constructs an AddChildChange with the specified child component and the
-   *  the identifier of the neighbour. If the neighbour is not found
-   *  when applying this Change, or is <code>null<code>< the child is
-   *  appended to the end of the list of children.
-  *  @param insertBeforeId The identifier of the sibling before which this new 
-  *         child is to be inserted.
-   * @param childComponent The child component that is to be added.
-   * @throws IllegalArgumentException if specified childComponent is null
-   */
-  public AddChildComponentChange(
-    String insertBeforeId,
-    UIComponent childComponent)
-  {
-    super(childComponent);
-   
-    _insertBeforeId = insertBeforeId;
-  }
-  
-  /**
-   * Returns the identifier of the sibling before which this new child needs to
-   *  be inserted.
-   */
-  public String getInsertBeforeId()
-  {
-    return _insertBeforeId;
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public void changeComponent(UIComponent uiComponent)
-  {
-    UIComponent child = getComponent();
-    
-    if (child == null)
-      return;
-      
-    String newChildId = child.getId();
-    List children = uiComponent.getChildren();
-    
-    //pu: If there were to be a child already with the ID same as the
-    //  to-be-added child, remove it and get the new one added.
-    UIComponent removableChild = ChangeUtils.getChildForId(uiComponent, newChildId);
-  
-    if (removableChild != null)
-      children.remove(removableChild);
-    
-    if (_insertBeforeId == null)
-    {
-      // append the child
-      children.add(child); 
-    }
-    else
-    {
-      int index = _getChildIndex(uiComponent, _insertBeforeId);
-      children.add(index, child);
-    }
-  }
-  
-  private static int _getChildIndex(UIComponent parent, String childId)
-  {
-    int numChildren = parent.getChildCount();
-    if (childId == null)
-      return numChildren;
-    UIComponent child = ChangeUtils.getChildForId(parent, childId);
-    if (child == null)
-    {
-      return numChildren;
-    }
-    else
-    {
-      return parent.getChildren().indexOf(child);
-    }
-  }
-
-  private final String _insertBeforeId;
+/*
+ * Copyright  2005,2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.adf.change;
+
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * Change specialization for adding a child component.
+ * While applying this Change, the child component is re-created and added to
+ *  the list of children.
+ * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-api/src/main/java/oracle/adf/view/faces/change/AddChildComponentChange.java#0 $) $Date: 10-nov-2005.19:09:54 $
+ * @author The Oracle ADF Faces Team
+ */
+public class AddChildComponentChange extends AddComponentChange 
+{
+  /**
+   * Constructs an AddChildChange that appends the specified child component.
+   * @param childComponent The child component that is to be appended.
+   * @throws IllegalArgumentException if specified childComponent is null.
+   */
+  public AddChildComponentChange(UIComponent childComponent)
+  {
+    this(null,childComponent);
+  }
+  
+  /**
+   * Constructs an AddChildChange with the specified child component and the
+   *  the identifier of the neighbour. If the neighbour is not found
+   *  when applying this Change, or is <code>null<code>< the child is
+   *  appended to the end of the list of children.
+  *  @param insertBeforeId The identifier of the sibling before which this new 
+  *         child is to be inserted.
+   * @param childComponent The child component that is to be added.
+   * @throws IllegalArgumentException if specified childComponent is null
+   */
+  public AddChildComponentChange(
+    String insertBeforeId,
+    UIComponent childComponent)
+  {
+    super(childComponent);
+   
+    _insertBeforeId = insertBeforeId;
+  }
+  
+  /**
+   * Returns the identifier of the sibling before which this new child needs to
+   *  be inserted.
+   */
+  public String getInsertBeforeId()
+  {
+    return _insertBeforeId;
+  }
+  
+  /**
+   * {@inheritDoc}
+   */
+  public void changeComponent(UIComponent uiComponent)
+  {
+    UIComponent child = getComponent();
+    
+    if (child == null)
+      return;
+      
+    String newChildId = child.getId();
+    List children = uiComponent.getChildren();
+    
+    //pu: If there were to be a child already with the ID same as the
+    //  to-be-added child, remove it and get the new one added.
+    UIComponent removableChild = ChangeUtils.getChildForId(uiComponent, newChildId);
+  
+    if (removableChild != null)
+      children.remove(removableChild);
+    
+    if (_insertBeforeId == null)
+    {
+      // append the child
+      children.add(child); 
+    }
+    else
+    {
+      int index = _getChildIndex(uiComponent, _insertBeforeId);
+      children.add(index, child);
+    }
+  }
+  
+  private static int _getChildIndex(UIComponent parent, String childId)
+  {
+    int numChildren = parent.getChildCount();
+    if (childId == null)
+      return numChildren;
+    UIComponent child = ChangeUtils.getChildForId(parent, childId);
+    if (child == null)
+    {
+      return numChildren;
+    }
+    else
+    {
+      return parent.getChildren().indexOf(child);
+    }
+  }
+
+  private final String _insertBeforeId;
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildComponentChange.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildDocumentChange.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildDocumentChange.java?rev=425268&r1=425267&r2=425268&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildDocumentChange.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildDocumentChange.java Mon Jul 24 20:54:50 2006
@@ -1,116 +1,116 @@
-/*
- * Copyright  2005,2006 The Apache Software Foundation.
- * 
- * Licensed 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.adf.change;
-
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * Change specialization for adding a child component using document mark up.
- * While applying this Change, the child component is created and added to
- * the document.
- * @author The Oracle ADF Faces Team
- */
-public class AddChildDocumentChange extends AddComponentDocumentChange 
-{
-  /**
-   * Constructs an AddChildDocumentChange with the specified child component 
-   *  mark up.
-   * @param componentFragment DOM mark up for child component to be appended.
-   * @throws IllegalArgumentException if componentFragment is <code>null</code>
-   */
-  public AddChildDocumentChange(DocumentFragment componentFragment)
-  {
-    this(null, componentFragment);
-  }
-  
-  /**
-   * Constructs an AddChildDocumentChange with the specified child component 
-   *  mark up and the identifier of the neighbour. If the neighbour were not to 
-   *  be found while applying this Change, the child is appended to the end of 
-   *  the list of children.
-   * @param insertBeforeId The identifier of the sibling before which this new 
-   *         child is to be inserted or <code>null</code> to append the child
-   * @param componentFragment DOM mark up for child component to be inserted.
-   * @throws IllegalArgumentException if componentFragment is <code>null</code>
-   */
-  public AddChildDocumentChange(
-    String insertBeforeId,
-    DocumentFragment componentFragment)
-  {
-    super(componentFragment);
-    
-    _insertBeforeId = insertBeforeId;
-  }
-  
-  /**
-   * Returns the identifier of the sibling before which this new child needs to
-   *  be inserted.
-   */
-  public String getInsertBeforeId()
-  {
-    return _insertBeforeId;
-  }
-  
-  /**
-   * Given the DOM Node representing a Component, apply any necessary
-   * DOM changes.
-   */
-  public void changeDocument(Node componentNode)
-  {
-    if (componentNode == null)
-      throw new IllegalArgumentException("No node specified");
-    
-    // get the fragement, imported into the target document
-    DocumentFragment targetFragment = 
-      getImportedComponentFragment(componentNode);
-    
-    // assume that we'll be appending
-    Node insertBeforeNode = null;
-    
-    // search children for the _insertBefore id
-    if (_insertBeforeId != null)
-    {
-      String insertBeforeID = _insertBeforeId;
-      
-      Node currChild = componentNode.getFirstChild();
-      Node idAttr;
-      
-      while (currChild != null)
-      {
-        NamedNodeMap attributes = currChild.getAttributes();
-        
-        if (attributes != null)
-        {
-          idAttr = attributes.getNamedItem("id");
-          if (idAttr != null && insertBeforeID.equals(idAttr.getNodeValue()))
-          {
-            insertBeforeNode = currChild;
-            break;
-          }
-        }
-        currChild = currChild.getNextSibling();
-      }
-    }    
-    
-    // insert our DocumentFragment in the correct position
-    componentNode.insertBefore(targetFragment, insertBeforeNode);
-  }
-  
-  private final String _insertBeforeId;
+/*
+ * Copyright  2005,2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.adf.change;
+
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * Change specialization for adding a child component using document mark up.
+ * While applying this Change, the child component is created and added to
+ * the document.
+ * @author The Oracle ADF Faces Team
+ */
+public class AddChildDocumentChange extends AddComponentDocumentChange 
+{
+  /**
+   * Constructs an AddChildDocumentChange with the specified child component 
+   *  mark up.
+   * @param componentFragment DOM mark up for child component to be appended.
+   * @throws IllegalArgumentException if componentFragment is <code>null</code>
+   */
+  public AddChildDocumentChange(DocumentFragment componentFragment)
+  {
+    this(null, componentFragment);
+  }
+  
+  /**
+   * Constructs an AddChildDocumentChange with the specified child component 
+   *  mark up and the identifier of the neighbour. If the neighbour were not to 
+   *  be found while applying this Change, the child is appended to the end of 
+   *  the list of children.
+   * @param insertBeforeId The identifier of the sibling before which this new 
+   *         child is to be inserted or <code>null</code> to append the child
+   * @param componentFragment DOM mark up for child component to be inserted.
+   * @throws IllegalArgumentException if componentFragment is <code>null</code>
+   */
+  public AddChildDocumentChange(
+    String insertBeforeId,
+    DocumentFragment componentFragment)
+  {
+    super(componentFragment);
+    
+    _insertBeforeId = insertBeforeId;
+  }
+  
+  /**
+   * Returns the identifier of the sibling before which this new child needs to
+   *  be inserted.
+   */
+  public String getInsertBeforeId()
+  {
+    return _insertBeforeId;
+  }
+  
+  /**
+   * Given the DOM Node representing a Component, apply any necessary
+   * DOM changes.
+   */
+  public void changeDocument(Node componentNode)
+  {
+    if (componentNode == null)
+      throw new IllegalArgumentException("No node specified");
+    
+    // get the fragement, imported into the target document
+    DocumentFragment targetFragment = 
+      getImportedComponentFragment(componentNode);
+    
+    // assume that we'll be appending
+    Node insertBeforeNode = null;
+    
+    // search children for the _insertBefore id
+    if (_insertBeforeId != null)
+    {
+      String insertBeforeID = _insertBeforeId;
+      
+      Node currChild = componentNode.getFirstChild();
+      Node idAttr;
+      
+      while (currChild != null)
+      {
+        NamedNodeMap attributes = currChild.getAttributes();
+        
+        if (attributes != null)
+        {
+          idAttr = attributes.getNamedItem("id");
+          if (idAttr != null && insertBeforeID.equals(idAttr.getNodeValue()))
+          {
+            insertBeforeNode = currChild;
+            break;
+          }
+        }
+        currChild = currChild.getNextSibling();
+      }
+    }    
+    
+    // insert our DocumentFragment in the correct position
+    componentNode.insertBefore(targetFragment, insertBeforeNode);
+  }
+  
+  private final String _insertBeforeId;
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddChildDocumentChange.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentChange.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentChange.java?rev=425268&r1=425267&r2=425268&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentChange.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentChange.java Mon Jul 24 20:54:50 2006
@@ -1,51 +1,51 @@
-/*
- * Copyright  2005,2006 The Apache Software Foundation.
- * 
- * Licensed 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.adf.change;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
-/**
- * Base class for specialized Change that when applied will add a component
- *  instance to the component tree.
- * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-api/src/main/java/oracle/adf/view/faces/change/AddComponentChange.java#0 $) $Date: 10-nov-2005.19:09:55 $
- * @author The Oracle ADF Faces Team
- */
-abstract public class AddComponentChange extends ComponentChange
-{
-  protected AddComponentChange(
-    UIComponent component)
-  {
-    if (component == null)
-      throw new IllegalArgumentException("component required");
-    
-    _proxy = new ChangeComponentProxy(FacesContext.getCurrentInstance(), 
-                                      component);
-  }
-  
-  /**
-   * Returns the component that is to be added either as a child or a facet 
-   *  while applying this Change. Returns <code>null</code> if the component cannot be 
-   *  successfully re-constructed.
-   */
-  public UIComponent getComponent()
-  {
-    return _proxy.createComponent();
-  }
-
-  private final ChangeComponentProxy _proxy;
+/*
+ * Copyright  2005,2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.adf.change;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+/**
+ * Base class for specialized Change that when applied will add a component
+ *  instance to the component tree.
+ * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-api/src/main/java/oracle/adf/view/faces/change/AddComponentChange.java#0 $) $Date: 10-nov-2005.19:09:55 $
+ * @author The Oracle ADF Faces Team
+ */
+abstract public class AddComponentChange extends ComponentChange
+{
+  protected AddComponentChange(
+    UIComponent component)
+  {
+    if (component == null)
+      throw new IllegalArgumentException("component required");
+    
+    _proxy = new ChangeComponentProxy(FacesContext.getCurrentInstance(), 
+                                      component);
+  }
+  
+  /**
+   * Returns the component that is to be added either as a child or a facet 
+   *  while applying this Change. Returns <code>null</code> if the component cannot be 
+   *  successfully re-constructed.
+   */
+  public UIComponent getComponent()
+  {
+    return _proxy.createComponent();
+  }
+
+  private final ChangeComponentProxy _proxy;
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentChange.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentDocumentChange.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentDocumentChange.java?rev=425268&r1=425267&r2=425268&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentDocumentChange.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentDocumentChange.java Mon Jul 24 20:54:50 2006
@@ -1,75 +1,75 @@
-/*
- * Copyright  2005,2006 The Apache Software Foundation.
- * 
- * Licensed 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.adf.change;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Node;
-
-/**
- * Base class for specialized DocumentChanges that when applied will add a component
- * instance to the component tree.
- * @author The Oracle ADF Faces Team
- */
-abstract public class AddComponentDocumentChange implements DocumentChange
-{
-  protected AddComponentDocumentChange(
-    DocumentFragment fragment)
-  {
-    if (fragment == null)
-      throw new IllegalArgumentException("DocumentFragment required");
-      
-    _fragment = fragment;
-  }
-  
-  
-  /** 
-   * Returns true if adding the DocumentChange should force the JSP Document
-   * to reload
-   */
-  public boolean getForcesDocumentReload()
-  {
-    // adding components should force the document to reload
-    return true;
-  }
-
-  /**
-   * Returns the component that is to be added either as a child or a facet 
-   *  while applying this Change. Returns null if the component cannot be 
-   *  successfully re-constructed.
-   */
-  protected final DocumentFragment getComponentFragment()
-  {
-    return _fragment;
-  }
-  
-  /**
-   * Given the target Node, return the DocumentFragment, imported into the
-   * target Document
-   * @param targetNode 
-   * @return 
-   */
-  protected final DocumentFragment getImportedComponentFragment(Node targetNode)
-  {
-    Document targetDocument = targetNode.getOwnerDocument();
-    
-    // return a deep import
-    return (DocumentFragment)targetDocument.importNode(_fragment, true);
-  }
-  
-  private final DocumentFragment _fragment;
+/*
+ * Copyright  2005,2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.adf.change;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+
+/**
+ * Base class for specialized DocumentChanges that when applied will add a component
+ * instance to the component tree.
+ * @author The Oracle ADF Faces Team
+ */
+abstract public class AddComponentDocumentChange implements DocumentChange
+{
+  protected AddComponentDocumentChange(
+    DocumentFragment fragment)
+  {
+    if (fragment == null)
+      throw new IllegalArgumentException("DocumentFragment required");
+      
+    _fragment = fragment;
+  }
+  
+  
+  /** 
+   * Returns true if adding the DocumentChange should force the JSP Document
+   * to reload
+   */
+  public boolean getForcesDocumentReload()
+  {
+    // adding components should force the document to reload
+    return true;
+  }
+
+  /**
+   * Returns the component that is to be added either as a child or a facet 
+   *  while applying this Change. Returns null if the component cannot be 
+   *  successfully re-constructed.
+   */
+  protected final DocumentFragment getComponentFragment()
+  {
+    return _fragment;
+  }
+  
+  /**
+   * Given the target Node, return the DocumentFragment, imported into the
+   * target Document
+   * @param targetNode 
+   * @return 
+   */
+  protected final DocumentFragment getImportedComponentFragment(Node targetNode)
+  {
+    Document targetDocument = targetNode.getOwnerDocument();
+    
+    // return a deep import
+    return (DocumentFragment)targetDocument.importNode(_fragment, true);
+  }
+  
+  private final DocumentFragment _fragment;
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AddComponentDocumentChange.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeComponentChange.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeComponentChange.java?rev=425268&r1=425267&r2=425268&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeComponentChange.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeComponentChange.java Mon Jul 24 20:54:50 2006
@@ -1,87 +1,87 @@
-/*
- * Copyright  2005,2006 The Apache Software Foundation.
- * 
- * Licensed 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.adf.change;
-
-import javax.faces.component.UIComponent;
-
-/**
- * Change specialization for change in attributes.
- * While applying this Change, the specified attribute state is  restored.
- * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-api/src/main/java/oracle/adf/view/faces/change/AttributeComponentChange.java#0 $) $Date: 10-nov-2005.19:09:56 $
- * @author The Oracle ADF Faces Team
- */
-public class AttributeComponentChange extends ComponentChange
-{
-  /**
-   * Constructs an AttributeChange with the given attributeName and 
-   *  attributeValue.
-   * @param attributeName The name of the attribute for which the value needs
-   *         to be restored.
-   * @param attributeValue The value of the attribute that needs to be restored.
-   *         This value should be of type java.io.Serializable in order to be 
-   *         persisted.
-   * @throws IllegalArgumentException if specified attributeName were to be null.
-   */
-  public AttributeComponentChange(
-    String attributeName,
-    Object attributeValue
-    )
-  {
-    if ((attributeName == null) || (attributeName.length() == 0))
-      throw new IllegalArgumentException(
-        "Cannot construct an AttributeChange with null attribute name.");
-    _attributeName = attributeName;
-    _attributeValue = attributeValue;
-  }
-  
-  /**
-   * Returns the name of the attribute that represents this Change.
-   */
-  public String getAttributeName()
-  {
-    return _attributeName;
-  }
-
-  /**
-   * Returns the value of the attribute corresponding to this AttributeChange.
-   */
-  public Object getAttributeValue()
-  {
-    return _attributeValue;
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public void changeComponent(UIComponent uiComponent)
-  {
-    uiComponent.getAttributes().put(_attributeName, _attributeValue);
-  }
-
-  private final String _attributeName;
-  
-  //=-=pu: Should we disallow non-serializable values during construction itself
-  //      and throw IllegalArgumentException ?
-  // Current known cases:
-  //  The focusPath attribute of a tree, which is considered as a persistible
-  //    Change takes a value that is a java.util.List. (-ve)
-  //  treeState of a tree is a org.apache.myfaces.adf.model.PathSet that
-  //    implements serializable. (+ve)
-  //  selectionState of a table is org.apache.myfaces.adf.model.RowKeySet that
-  //    implements externalizable. (+ve)
-  private final Object _attributeValue;
+/*
+ * Copyright  2005,2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.adf.change;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * Change specialization for change in attributes.
+ * While applying this Change, the specified attribute state is  restored.
+ * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-api/src/main/java/oracle/adf/view/faces/change/AttributeComponentChange.java#0 $) $Date: 10-nov-2005.19:09:56 $
+ * @author The Oracle ADF Faces Team
+ */
+public class AttributeComponentChange extends ComponentChange
+{
+  /**
+   * Constructs an AttributeChange with the given attributeName and 
+   *  attributeValue.
+   * @param attributeName The name of the attribute for which the value needs
+   *         to be restored.
+   * @param attributeValue The value of the attribute that needs to be restored.
+   *         This value should be of type java.io.Serializable in order to be 
+   *         persisted.
+   * @throws IllegalArgumentException if specified attributeName were to be null.
+   */
+  public AttributeComponentChange(
+    String attributeName,
+    Object attributeValue
+    )
+  {
+    if ((attributeName == null) || (attributeName.length() == 0))
+      throw new IllegalArgumentException(
+        "Cannot construct an AttributeChange with null attribute name.");
+    _attributeName = attributeName;
+    _attributeValue = attributeValue;
+  }
+  
+  /**
+   * Returns the name of the attribute that represents this Change.
+   */
+  public String getAttributeName()
+  {
+    return _attributeName;
+  }
+
+  /**
+   * Returns the value of the attribute corresponding to this AttributeChange.
+   */
+  public Object getAttributeValue()
+  {
+    return _attributeValue;
+  }
+  
+  /**
+   * {@inheritDoc}
+   */
+  public void changeComponent(UIComponent uiComponent)
+  {
+    uiComponent.getAttributes().put(_attributeName, _attributeValue);
+  }
+
+  private final String _attributeName;
+  
+  //=-=pu: Should we disallow non-serializable values during construction itself
+  //      and throw IllegalArgumentException ?
+  // Current known cases:
+  //  The focusPath attribute of a tree, which is considered as a persistible
+  //    Change takes a value that is a java.util.List. (-ve)
+  //  treeState of a tree is a org.apache.myfaces.adf.model.PathSet that
+  //    implements serializable. (+ve)
+  //  selectionState of a table is org.apache.myfaces.adf.model.RowKeySet that
+  //    implements externalizable. (+ve)
+  private final Object _attributeValue;
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeComponentChange.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeDocumentChange.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeDocumentChange.java?rev=425268&r1=425267&r2=425268&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeDocumentChange.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeDocumentChange.java Mon Jul 24 20:54:50 2006
@@ -1,99 +1,99 @@
-/*
- * Copyright  2005,2006 The Apache Software Foundation.
- * 
- * Licensed 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.adf.change;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * Change specialization for change in attributes.
- * While applying this Change, the specified attribute state is  restored.
- * @author The Oracle ADF Faces Team
- */
-public class AttributeDocumentChange implements DocumentChange 
-{
-  /**
-   * Constructs an AttributeChange with the given attributeName and 
-   *  attributeValue.
-   * @param attributeName The name of the attribute for which the value needs
-   *         to be restored.
-   * @param attributeValueString The value of the attribute that needs to be restored.
-    * @throws IllegalArgumentException if specified attributeName were to be null.
-   * =-= bts TODO Figure out what to do about non String values
-   */
-  public AttributeDocumentChange(
-    String attributeName,
-    String attributeValueString)
-  {
-    if ((attributeName == null) || (attributeName.length() == 0))
-      throw new IllegalArgumentException(
-        "Cannot construct an AttributeChange with null attribute name.");
-        
-    _attributeName = attributeName;
-    _attributeValueString = attributeValueString;
-  }
-  
-  /**
-   * Returns the name of the attribute that represents this Change.
-   */
-  public String getAttributeName()
-  {
-    return _attributeName;
-  }
-
-  /**
-   * Returns the value of the attribute corresponding to this AttributeChange.
-   */
-  public Object getAttributeStringValue()
-  {
-    return _attributeValueString;
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public void changeDocument(Node componentNode)
-  {
-    NamedNodeMap attributes = componentNode.getAttributes();
-    
-    if (attributes != null)
-    {
-      // remove the attribute
-      if (_attributeValueString == null)
-        attributes.removeNamedItem(_attributeName);
-      else
-      {
-        ((Element)componentNode).setAttribute(_attributeName,
-                                              _attributeValueString);
-      }
-    }
-  }
-
-  /** 
-   * Returns true if adding the DocumentChange should force the JSP Document
-   * to reload
-   */
-  public boolean getForcesDocumentReload()
-  {
-    return false;
-  }
-
-    
-  private final String _attributeName;  
-  private final  String _attributeValueString;
+/*
+ * Copyright  2005,2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.adf.change;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * Change specialization for change in attributes.
+ * While applying this Change, the specified attribute state is  restored.
+ * @author The Oracle ADF Faces Team
+ */
+public class AttributeDocumentChange implements DocumentChange 
+{
+  /**
+   * Constructs an AttributeChange with the given attributeName and 
+   *  attributeValue.
+   * @param attributeName The name of the attribute for which the value needs
+   *         to be restored.
+   * @param attributeValueString The value of the attribute that needs to be restored.
+    * @throws IllegalArgumentException if specified attributeName were to be null.
+   * =-= bts TODO Figure out what to do about non String values
+   */
+  public AttributeDocumentChange(
+    String attributeName,
+    String attributeValueString)
+  {
+    if ((attributeName == null) || (attributeName.length() == 0))
+      throw new IllegalArgumentException(
+        "Cannot construct an AttributeChange with null attribute name.");
+        
+    _attributeName = attributeName;
+    _attributeValueString = attributeValueString;
+  }
+  
+  /**
+   * Returns the name of the attribute that represents this Change.
+   */
+  public String getAttributeName()
+  {
+    return _attributeName;
+  }
+
+  /**
+   * Returns the value of the attribute corresponding to this AttributeChange.
+   */
+  public Object getAttributeStringValue()
+  {
+    return _attributeValueString;
+  }
+  
+  /**
+   * {@inheritDoc}
+   */
+  public void changeDocument(Node componentNode)
+  {
+    NamedNodeMap attributes = componentNode.getAttributes();
+    
+    if (attributes != null)
+    {
+      // remove the attribute
+      if (_attributeValueString == null)
+        attributes.removeNamedItem(_attributeName);
+      else
+      {
+        ((Element)componentNode).setAttribute(_attributeName,
+                                              _attributeValueString);
+      }
+    }
+  }
+
+  /** 
+   * Returns true if adding the DocumentChange should force the JSP Document
+   * to reload
+   */
+  public boolean getForcesDocumentReload()
+  {
+    return false;
+  }
+
+    
+  private final String _attributeName;  
+  private final  String _attributeValueString;
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/AttributeDocumentChange.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/ChangeUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/ChangeUtils.java?rev=425268&r1=425267&r2=425268&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/ChangeUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/ChangeUtils.java Mon Jul 24 20:54:50 2006
@@ -1,116 +1,116 @@
-/*
- * Copyright  2005,2006 The Apache Software Foundation.
- * 
- * Licensed 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.adf.change;
-
-import java.util.List;
-
-import javax.faces.component.UIComponent;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-
-/**
- * Utility functions for use by Changes.
- * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-api/src/main/java/oracle/adf/view/faces/change/ChangeUtils.java#0 $) $Date: 10-nov-2005.19:09:58 $
- * @author The Oracle ADF Faces Team
- */
-class ChangeUtils 
-{
-  private ChangeUtils()
-  {
-  }
-
-  /**
-   * Given a parent component and the identifier for the child, looks up among
-   *  the children for a child with the specified identifier and returns.
-   * Returns null if there were to be no such child
-   */
-  public static UIComponent getChildForId(UIComponent parent, String childId)
-  {
-    if (parent == null)
-      return null;
-    List children = parent.getChildren();
-    int numChildren = parent.getChildCount();
-    if (numChildren == 0)
-      return null;
-    UIComponent child;
-    for (int i=0; i<numChildren; i++)
-    {
-      child = (UIComponent) children.get(i);
-      if ( childId.equals(child.getId()) )
-        return child;
-    }
-    return null;
-  }
-  
-  /**
-   * Given a node representing a component, returns the named facet's Element.
-   * @param componentNode The node to search for a facet contained in it.
-   * @param facetName The name of the facet to search for.
-   * @return
-   */
-  static Element __getFacetElement(
-    Node componentNode,
-    String facetName)
-  {
-    assert componentNode != null;
-    assert (facetName != null) && (facetName.length() > 0);
-    
-    Node currChild = componentNode.getFirstChild();
-    
-    while (currChild != null)
-    {
-      // check for local name match
-      if ("facet".equals(currChild.getLocalName()))
-      {
-        // check for namespace match
-        if (__JSF_CORE_NAMESPACE.equals(currChild.getNamespaceURI()))
-        {
-          NamedNodeMap attributes = currChild.getAttributes();
-
-          if (facetName.equals(attributes.getNamedItem("name").getNodeValue()))
-          {
-            return (Element)currChild;
-          }
-        }
-      }
-
-      currChild = currChild.getNextSibling();
-    }
-    
-    return null;
-  }
-
-  /**
-   * Removes all of the children from the parent Node.
-   * @param parentNode 
-   */
-  static void __removeAllChildren(Node parentNode)
-  {
-    Node nukeChild = parentNode.getFirstChild();
-    
-    while (nukeChild != null)
-    {
-      parentNode.removeChild(nukeChild);
-      nukeChild = parentNode.getFirstChild();
-    }
-  }
-
-  static final String __JSF_CORE_NAMESPACE = "http://java.sun.com/jsf/core";
+/*
+ * Copyright  2005,2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.adf.change;
+
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+
+/**
+ * Utility functions for use by Changes.
+ * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-api/src/main/java/oracle/adf/view/faces/change/ChangeUtils.java#0 $) $Date: 10-nov-2005.19:09:58 $
+ * @author The Oracle ADF Faces Team
+ */
+class ChangeUtils 
+{
+  private ChangeUtils()
+  {
+  }
+
+  /**
+   * Given a parent component and the identifier for the child, looks up among
+   *  the children for a child with the specified identifier and returns.
+   * Returns null if there were to be no such child
+   */
+  public static UIComponent getChildForId(UIComponent parent, String childId)
+  {
+    if (parent == null)
+      return null;
+    List children = parent.getChildren();
+    int numChildren = parent.getChildCount();
+    if (numChildren == 0)
+      return null;
+    UIComponent child;
+    for (int i=0; i<numChildren; i++)
+    {
+      child = (UIComponent) children.get(i);
+      if ( childId.equals(child.getId()) )
+        return child;
+    }
+    return null;
+  }
+  
+  /**
+   * Given a node representing a component, returns the named facet's Element.
+   * @param componentNode The node to search for a facet contained in it.
+   * @param facetName The name of the facet to search for.
+   * @return
+   */
+  static Element __getFacetElement(
+    Node componentNode,
+    String facetName)
+  {
+    assert componentNode != null;
+    assert (facetName != null) && (facetName.length() > 0);
+    
+    Node currChild = componentNode.getFirstChild();
+    
+    while (currChild != null)
+    {
+      // check for local name match
+      if ("facet".equals(currChild.getLocalName()))
+      {
+        // check for namespace match
+        if (__JSF_CORE_NAMESPACE.equals(currChild.getNamespaceURI()))
+        {
+          NamedNodeMap attributes = currChild.getAttributes();
+
+          if (facetName.equals(attributes.getNamedItem("name").getNodeValue()))
+          {
+            return (Element)currChild;
+          }
+        }
+      }
+
+      currChild = currChild.getNextSibling();
+    }
+    
+    return null;
+  }
+
+  /**
+   * Removes all of the children from the parent Node.
+   * @param parentNode 
+   */
+  static void __removeAllChildren(Node parentNode)
+  {
+    Node nukeChild = parentNode.getFirstChild();
+    
+    while (nukeChild != null)
+    {
+      parentNode.removeChild(nukeChild);
+      nukeChild = parentNode.getFirstChild();
+    }
+  }
+
+  static final String __JSF_CORE_NAMESPACE = "http://java.sun.com/jsf/core";
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/adf/change/ChangeUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message