incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r425942 [8/15] - in /incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/agent/ main/java/org/apache/myfaces/trinidadinternal/agent/parse/ main/java/org/apache/my...
Date Thu, 27 Jul 2006 03:39:51 GMT
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java Wed Jul 26 20:39:26 2006
@@ -15,11 +15,13 @@
  */
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table;
 import java.io.IOException;
+
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
+
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.core.data.CoreColumn;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
 
@@ -28,7 +30,7 @@
 {
 
   protected void renderKids(FacesContext          context,
-                            AdfRenderingContext   arc,
+                            RenderingContext   arc,
                             TableRenderingContext trc,
                             UIComponent           column) throws IOException
   {
@@ -43,7 +45,7 @@
 
   protected String getHeaderText(FacesBean bean)
   {
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     TableRenderingContext tContext =
       TableRenderingContext.getCurrentInstance();
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,9 +16,10 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table;
 
 import javax.faces.component.UIComponent;
+
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.core.data.CoreColumn;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ColumnRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
 
@@ -53,7 +54,7 @@
     return null;
   }
 
-  protected String getHeaderInlineStyle(AdfRenderingContext arc)
+  protected String getHeaderInlineStyle(RenderingContext arc)
   {
     if (XhtmlRenderer.isIE(arc))
       return "word-break:keep-all"; // bugs 2342291, 1999842

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java Wed Jul 26 20:39:26 2006
@@ -28,8 +28,7 @@
 import org.apache.myfaces.trinidad.component.UIXTable;
 import org.apache.myfaces.trinidad.component.core.data.CoreTable;
 import org.apache.myfaces.trinidad.model.RowKeySet;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
@@ -46,7 +45,7 @@
 
   public TableRenderingContext(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component)
   {
     CollectionComponent collectionComponent =
@@ -172,7 +171,7 @@
   public final void setExplicitHeaderIDMode(boolean isEnabled)
   {
     if (!XhtmlRenderer.isInaccessibleMode(
-           AdfRenderingContext.getCurrentInstance()))
+           RenderingContext.getCurrentInstance()))
       _explicitHeaderIDMode = isEnabled;
   }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table;
 
 import java.io.IOException;
-
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -27,16 +26,14 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.event.FacesEvent;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.UIXCollection;
 import org.apache.myfaces.trinidad.component.UIXTable;
 import org.apache.myfaces.trinidad.component.UIXTree;
 import org.apache.myfaces.trinidad.event.SelectionEvent;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.model.RowKeySet;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
 
@@ -176,7 +173,7 @@
 
   public static void renderScripts(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TableRenderingContext trc) throws IOException
   {
     if (arc.getProperties().put(_JS_RENDERED_KEY, Boolean.TRUE) == null)
@@ -207,7 +204,7 @@
 
   protected void renderCellContent(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext,
     UIComponent           component,
     FacesBean             bean) throws IOException

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table;
 
 import java.io.IOException;
-
 import java.util.Map;
 
 import javax.faces.component.NamingContainer;
@@ -25,16 +24,15 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.event.FacesEvent;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.UIXCollection;
 import org.apache.myfaces.trinidad.component.UIXTable;
 import org.apache.myfaces.trinidad.component.UIXTree;
 import org.apache.myfaces.trinidad.component.core.data.CoreTable;
 import org.apache.myfaces.trinidad.event.SelectionEvent;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.model.RowKeySet;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SimpleSelectBooleanCheckboxRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
@@ -116,7 +114,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -159,7 +157,7 @@
 
   protected void renderCellContent(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext,
     UIComponent           component,
     FacesBean             bean) throws IOException
@@ -239,7 +237,7 @@
     }
 
 
-    protected Object getValueAttr(AdfRenderingContext arc)
+    protected Object getValueAttr(RenderingContext arc)
     {
       TableRenderingContext tContext =
         TableRenderingContext.getCurrentInstance();
@@ -251,7 +249,7 @@
     protected String getShortDesc(FacesBean bean)
     {
       String key = getDefaultShortDescKey();
-      AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+      RenderingContext arc = RenderingContext.getCurrentInstance();
       return arc.getTranslatedString(key);
     }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java Wed Jul 26 20:39:26 2006
@@ -24,8 +24,7 @@
 
 import org.apache.myfaces.trinidad.component.UIXTreeTable;
 import org.apache.myfaces.trinidad.model.RowKeySet;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ColumnRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
@@ -36,7 +35,7 @@
 {
 
   protected void renderKids(FacesContext          context,
-                            AdfRenderingContext   arc,
+                            RenderingContext   arc,
                             TableRenderingContext tContext,
                             UIComponent           column) throws IOException
   {
@@ -143,7 +142,7 @@
   // Renders the expansion Icon
   private void _renderExpansionIcon(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     boolean          disclosed,
     Object           onclick) throws IOException
   {
@@ -174,7 +173,7 @@
 
   private void _renderNodeStampBasedOnAccessibilty(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TreeTableRenderingContext ttrc,
     UIComponent           column) throws IOException
   {      

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java Wed Jul 26 20:39:26 2006
@@ -24,8 +24,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.UIXTreeTable;
 import org.apache.myfaces.trinidad.component.core.data.CoreTreeTable;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
@@ -49,7 +48,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -67,7 +66,7 @@
 
   private void _renderViewNavBar(
      FacesContext        context,
-     AdfRenderingContext arc,
+     RenderingContext arc,
      TreeTableRenderingContext ttrc,
      UIXTreeTable        hgrid,
      int                   rangeStart,
@@ -163,7 +162,7 @@
 
   private void _writeCellContents(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TreeTableRenderingContext ttrc,
     UIXTreeTable        hgrid,
     String text,
@@ -247,7 +246,7 @@
   }
 
   private Icon _getIcon(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean          isTop,
     boolean          isDisabled
    )

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java Wed Jul 26 20:39:26 2006
@@ -18,13 +18,12 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.component.UIXColumn;
 import org.apache.myfaces.trinidad.component.UIXTree;
 import org.apache.myfaces.trinidad.component.UIXTreeTable;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.model.RowKeySet;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
 
 /**
@@ -50,7 +49,7 @@
 
   public TreeTableRenderingContext(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         hGrid)
   {
     super(context, arc, hGrid);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java Wed Jul 26 20:39:26 2006
@@ -23,18 +23,16 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.event.FacesEvent;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 import org.apache.myfaces.trinidad.component.UIXNavigationTree;
 import org.apache.myfaces.trinidad.component.UIXPage;
 import org.apache.myfaces.trinidad.component.UIXTree;
 import org.apache.myfaces.trinidad.component.UIXTreeTable;
-import org.apache.myfaces.trinidad.event.RowDisclosureEvent;
 import org.apache.myfaces.trinidad.event.FocusEvent;
-
+import org.apache.myfaces.trinidad.event.RowDisclosureEvent;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.model.RowKeySet;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.HiddenLabelUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.TableRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
@@ -65,7 +63,7 @@
    */
   public static void writeNodeLevel(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     int              depth,
     String           nodeLevelTextKey
     ) throws IOException

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.html.layout;
 
 import java.io.IOException;
-
 import java.util.List;
 import java.util.ListIterator;
 
@@ -24,13 +23,11 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.component.UIXShowDetail;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.desktop.HideShowUtils;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafConstants;
@@ -152,10 +149,10 @@
     out.startElement("div", component);
     out.writeAttribute("id", compId, null);
 
-    RenderingContext rCtx = getRenderingContext(context, component);
+    org.apache.myfaces.trinidadinternal.ui.RenderingContext rCtx = getRenderingContext(context, component);
 
     String styleClass = (String) component.getAttributes().get("styleClass");
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     if (styleClass != null)
     {
       XhtmlRenderer.renderStyleClasses(context, arc, new String [] {
@@ -423,7 +420,7 @@
     out.writeAttribute("cellPadding", "0", null);
     out.writeAttribute("summary", "", null);
 
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     XhtmlRenderer.renderStyleClass(context, arc, getContentStyleClass());
 
     out.startElement("tr", component);
@@ -449,7 +446,7 @@
    * @param isImmediate the value of immediate attribute on child component
    */
   private String _getFormSubmitScript(UIComponent component,
-                                      RenderingContext rCtx,
+                                      org.apache.myfaces.trinidadinternal.ui.RenderingContext rCtx,
                                       String event,
                                       String detailItemId,
                                       String formName,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.html.layout;
 
 import java.io.IOException;
-
 import java.util.ListIterator;
 
 import javax.faces.component.UIComponent;
@@ -24,14 +23,11 @@
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.trinidad.component.UIXShowDetail;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
-
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafRenderer;
 
 /**
@@ -49,7 +45,7 @@
                                    UIComponent component)
     throws IOException
   {
-    RenderingContext rCtx = getRenderingContext(context, component);
+    org.apache.myfaces.trinidadinternal.ui.RenderingContext rCtx = getRenderingContext(context, component);
     String formName = RenderUtils.getFormId(context, component);
 
     boolean jsRendered =
@@ -59,7 +55,7 @@
     if ((formName != null) && (! jsRendered) )
     {
       String getSelectedScript = null;
-      if (AdfFacesContext.getCurrentInstance().isDebugOutput())
+      if (RequestContext.getCurrentInstance().isDebugOutput())
       {
         getSelectedScript =
           "function _socGetSelection(elem)" +
@@ -114,7 +110,7 @@
     throws IOException
   {
     // This renders the select controls alongwith javascript onchange handler.
-    RenderingContext rCtx =
+    org.apache.myfaces.trinidadinternal.ui.RenderingContext rCtx =
       getRenderingContext(context, component);
 
     String compId = component.getClientId(context);
@@ -169,7 +165,7 @@
   {
     String compId = component.getClientId(context);
     ResponseWriter out = context.getResponseWriter();
-    RenderingContext rCtx = getRenderingContext(context, component);
+    org.apache.myfaces.trinidadinternal.ui.RenderingContext rCtx = getRenderingContext(context, component);
 
     out.startElement("td", component);
     out.writeAttribute("valign", "top", null);
@@ -246,7 +242,7 @@
    *  for this case else returns a script where PPR is not required.
    */
   private String _getChoiceOnchangeJS(FacesContext context,
-                                      RenderingContext rCtx,
+                                      org.apache.myfaces.trinidadinternal.ui.RenderingContext rCtx,
                                       UIComponent component,
                                       String compId)
   {
@@ -299,7 +295,7 @@
                             String js)
     throws IOException
   {
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
 
     ResponseWriter writer = context.getResponseWriter();
     

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneRadioRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneRadioRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneRadioRenderer.java Wed Jul 26 20:39:26 2006
@@ -28,6 +28,7 @@
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
+ 
 import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.html.layout;
 
 import java.io.IOException;
-
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -27,14 +26,12 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.component.UIXShowDetail;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafConstants;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafRenderer;
@@ -168,13 +165,13 @@
     out.writeAttribute("cellpadding", "0", null);
 
     String styleClass = (String) component.getAttributes().get("styleClass");
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     if (styleClass != null)
     {
       XhtmlRenderer.renderStyleClass(context, arc, styleClass);
     }
 
-    RenderingContext rCtx = getRenderingContext(context, component);
+    org.apache.myfaces.trinidadinternal.ui.RenderingContext rCtx = getRenderingContext(context, component);
     ShowOneUtils.renderGenericAttributes(rCtx, component, out);
 
     out.startElement("tr", component);
@@ -290,7 +287,7 @@
    * Returns true if the showOneChoice element has an id
    * and the browser supports PPR
    */
-  protected boolean elementSupportsPartial(RenderingContext context,
+  protected boolean elementSupportsPartial(org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
                                            String           id)
   {
     return ((id != null) &&
@@ -304,7 +301,7 @@
    *  Takes care of encoding for label text and the accessKey.
    *
    */
-  protected void renderSelectLabel(RenderingContext rCtx,
+  protected void renderSelectLabel(org.apache.myfaces.trinidadinternal.ui.RenderingContext rCtx,
                                    UIComponent component,
                                    ResponseWriter out,
                                    URLEncoder encoder,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java Wed Jul 26 20:39:26 2006
@@ -22,6 +22,7 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.ResponseWriter;
 
+ 
 import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafRenderer;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafRenderer;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java Wed Jul 26 20:39:26 2006
@@ -23,7 +23,6 @@
 import javax.faces.render.Renderer;
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
-
 import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.CommandLinkRenderer;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.htmlBasic;
 
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.Map;
 
 import javax.faces.component.UIComponent;
@@ -24,8 +23,6 @@
 import javax.faces.render.Renderer;
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
-
-import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/UINodeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/UINodeRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/UINodeRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/UINodeRenderer.java Wed Jul 26 20:39:26 2006
@@ -20,10 +20,11 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
 import org.apache.myfaces.trinidadinternal.ui.Renderer;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+ 
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.PreAndPostRenderer;
 
@@ -45,7 +46,7 @@
   {
     if (!getRendersChildren())
     {
-      RenderingContext rContext = getRenderingContext(context, component);
+      org.apache.myfaces.trinidadinternal.ui.RenderingContext rContext = getRenderingContext(context, component);
       UINode node = createUINode(context, component);
       Renderer renderer = _getRenderer(rContext, node);
       assert(renderer instanceof PreAndPostRenderer);
@@ -63,7 +64,7 @@
                         UIComponent component)
     throws IOException
   {
-    RenderingContext rContext = getRenderingContext(context, component);
+    org.apache.myfaces.trinidadinternal.ui.RenderingContext rContext = getRenderingContext(context, component);
     if (getRendersChildren())
     {
       createUINode(context, component).render(rContext);
@@ -82,7 +83,7 @@
     FacesContext context,
     UIComponent  component);
 
-  protected RenderingContext getRenderingContext(
+  protected org.apache.myfaces.trinidadinternal.ui.RenderingContext getRenderingContext(
     FacesContext context,
     UIComponent  component) throws IOException
   {
@@ -109,7 +110,7 @@
     return true;
   }
 
-  private Renderer _getRenderer(RenderingContext rContext, UINode node)
+  private Renderer _getRenderer(org.apache.myfaces.trinidadinternal.ui.RenderingContext rContext, UINode node)
   {
     return rContext.getRendererManager().getRenderer(node);
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java Wed Jul 26 20:39:26 2006
@@ -21,9 +21,8 @@
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.event.ReturnEvent;
-
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PartialPageUtils;
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;
 
@@ -37,7 +36,7 @@
 {
   public void decode(FacesContext context, UIComponent component)
   {
-    AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+    RequestContext afContext = RequestContext.getCurrentInstance();
     ReturnEvent returnEvent =
       afContext.getDialogService().getReturnEvent(component);
     if (returnEvent != null)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,12 +16,12 @@
 package org.apache.myfaces.trinidadinternal.renderkit.uix;
 
 import java.util.Map;
+
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
-
 import org.apache.myfaces.trinidadinternal.uinode.DecodingUINodeRenderer;
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java Wed Jul 26 20:39:26 2006
@@ -20,8 +20,7 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;
 
 public class MessageBoxRenderer extends UINodeRendererBase
@@ -32,7 +31,7 @@
   {
     // Force MessageBox to be re-rendered via PPR, since the set
     // of messages may have changed.
-    AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+    RequestContext afContext = RequestContext.getCurrentInstance();
     if (afContext != null)
       afContext.addPartialTarget(component);
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java Wed Jul 26 20:39:26 2006
@@ -22,8 +22,7 @@
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.trinidad.component.UIXPage;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TreeUtils;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;
@@ -54,7 +53,7 @@
     if ( treeId.equals(source))
     {          
       TreeUtils.decodeExpandEvents(parameters, page, Collections.EMPTY_LIST);
-      AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+      RequestContext afContext = RequestContext.getCurrentInstance();
       if (afContext != null)
         afContext.addPartialTarget(component);
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PollRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PollRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PollRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PollRenderer.java Wed Jul 26 20:39:26 2006
@@ -22,7 +22,6 @@
 
 import org.apache.myfaces.trinidad.component.UIXPoll;
 import org.apache.myfaces.trinidad.event.PollEvent;
-
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProcessRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProcessRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProcessRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProcessRenderer.java Wed Jul 26 20:39:26 2006
@@ -22,9 +22,8 @@
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.component.UIXProcess;
-
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.ProcessUtils;
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProgressRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProgressRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProgressRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,17 +17,15 @@
 
 
 import java.io.IOException;
-
 import java.util.Map;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.component.UIXProgress;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.model.BoundedRangeModel;
-
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java Wed Jul 26 20:39:26 2006
@@ -30,6 +30,7 @@
 import javax.faces.convert.Converter;
 import javax.faces.el.ValueBinding;
 import javax.faces.model.SelectItem;
+
 import org.apache.myfaces.trinidad.component.UIXSelectItem;
 import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,9 +16,8 @@
 package org.apache.myfaces.trinidadinternal.renderkit.uix;
 
 import java.lang.reflect.Array;
-
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.faces.component.UIComponent;
@@ -27,8 +26,8 @@
 import javax.faces.convert.ConverterException;
 import javax.faces.el.ValueBinding;
 import javax.faces.model.SelectItem;
-import org.apache.myfaces.trinidad.component.UIXSelectMany;
 
+import org.apache.myfaces.trinidad.component.UIXSelectMany;
 import org.apache.myfaces.trinidad.util.MessageFactory;
 import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java Wed Jul 26 20:39:26 2006
@@ -29,11 +29,10 @@
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.component.UIXSelectMany;
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectItem;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.util.ArrayMap;
-
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 import org.apache.myfaces.trinidadinternal.agent.AgentUtil;
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ShowOneTabRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ShowOneTabRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ShowOneTabRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ShowOneTabRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,14 +16,12 @@
 package org.apache.myfaces.trinidadinternal.renderkit.uix;
 
 import java.io.IOException;
-
 import java.util.List;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.trinidad.component.UIXShowDetail;
-
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SingleStepRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SingleStepRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SingleStepRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SingleStepRenderer.java Wed Jul 26 20:39:26 2006
@@ -21,10 +21,9 @@
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.component.UIXSingleStep;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
-
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;
 
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java Wed Jul 26 20:39:26 2006
@@ -23,7 +23,6 @@
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.trinidad.component.UIXTree;
-
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TreeUtils;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java Wed Jul 26 20:39:26 2006
@@ -17,6 +17,7 @@
 package org.apache.myfaces.trinidadinternal.resource;
 
 import java.net.URLConnection;
+
 import org.apache.myfaces.trinidad.resource.AggregatingResourceLoader;
 import org.apache.myfaces.trinidad.resource.ClassLoaderResourceLoader;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java Wed Jul 26 20:39:26 2006
@@ -20,13 +20,11 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-
 import java.net.URL;
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.resource.RegexResourceLoader;
 import org.apache.myfaces.trinidad.resource.ResourceLoader;
-
 import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java Wed Jul 26 20:39:26 2006
@@ -18,7 +18,6 @@
 
 
 import java.io.File;
-
 import java.util.Hashtable;
 
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java Wed Jul 26 20:39:26 2006
@@ -16,11 +16,12 @@
 package org.apache.myfaces.trinidadinternal.share.config;
 
 import javax.faces.context.FacesContext;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidadinternal.image.cache.FileSystemImageCache;
 
 /**
- * Configuration class that works off of a AdfFacesContext.
+ * Configuration class that works off of a RequestContext.
  *
  * @author The Oracle ADF Faces Team
  * @todo Support context-relative and server-relative URLs
@@ -31,7 +32,7 @@
   static public final String CONFIGURATION_NAME = "_CBC";
 
   public ContextBasedConfiguration(FacesContext fContext,
-                                   AdfFacesContext context)
+                                   RequestContext context)
   {
     super(CONFIGURATION_NAME);
     putProperty(SKIN_FAMILY,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/ServletRequestParameters.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/ServletRequestParameters.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/ServletRequestParameters.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/ServletRequestParameters.java Wed Jul 26 20:39:26 2006
@@ -15,10 +15,10 @@
  */
 package org.apache.myfaces.trinidadinternal.share.data;
 
-import java.util.Map;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.NoSuchElementException;
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java Wed Jul 26 20:39:26 2006
@@ -20,22 +20,17 @@
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-
 import java.util.Date;
 import java.util.List;
 
 import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
-
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
 import org.apache.myfaces.trinidadinternal.share.text.ColorFormat;
 import org.apache.myfaces.trinidadinternal.share.text.RGBColorFormat;
-
 import org.apache.myfaces.trinidadinternal.share.xml.NamespaceURI;
 import org.apache.myfaces.trinidadinternal.share.xml.XMLUtils;
-
 import org.apache.myfaces.trinidadinternal.style.Style;
 import org.apache.myfaces.trinidadinternal.style.util.CSSUtils;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 /**
  * Coercions is a utility class to coerce values to their target type.

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingNameResolver.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingNameResolver.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingNameResolver.java Wed Jul 26 20:39:26 2006
@@ -17,9 +17,9 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Map;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.Map;
 
 
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/DefaultNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/DefaultNameResolver.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/DefaultNameResolver.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/DefaultNameResolver.java Wed Jul 26 20:39:26 2006
@@ -18,9 +18,8 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-
-import java.net.URL;
 import java.net.MalformedURLException;
+import java.net.URL;
 
 /**
  * Default implementation of NameResolver.  This class

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/FileInputStreamProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/FileInputStreamProvider.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/FileInputStreamProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/FileInputStreamProvider.java Wed Jul 26 20:39:26 2006
@@ -18,8 +18,8 @@
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProvider.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProvider.java Wed Jul 26 20:39:26 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.myfaces.trinidadinternal.share.io;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * InputStreamProviders encapsulate a single target file.

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProviderProxy.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProviderProxy.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProviderProxy.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProviderProxy.java Wed Jul 26 20:39:26 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.myfaces.trinidadinternal.share.io;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Proxying class for InputStreamProviders.  Subclassers

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ServletNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ServletNameResolver.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ServletNameResolver.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ServletNameResolver.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.share.io;
 
 import java.io.File;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java Wed Jul 26 20:39:26 2006
@@ -16,9 +16,8 @@
 package org.apache.myfaces.trinidadinternal.share.io;
 
 import java.io.BufferedInputStream;
-import java.io.InputStream;
 import java.io.IOException;
-
+import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContext.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContext.java Wed Jul 26 20:39:26 2006
@@ -22,7 +22,6 @@
 import java.util.TimeZone;
 
 import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
-
 import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/ColorFormat.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/ColorFormat.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/ColorFormat.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/ColorFormat.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.share.text;
 
 import java.awt.Color;
-
 import java.text.FieldPosition;
 import java.text.Format;
 import java.text.ParseException;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/RGBColorFormat.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/RGBColorFormat.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/RGBColorFormat.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/RGBColorFormat.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.share.text;
 
 import java.awt.Color;
-
 import java.text.FieldPosition;
 import java.text.ParsePosition;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/EncoderUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/EncoderUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/EncoderUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/EncoderUtils.java Wed Jul 26 20:39:26 2006
@@ -16,12 +16,11 @@
 package org.apache.myfaces.trinidadinternal.share.url;
 
 import java.io.ByteArrayOutputStream;
-import java.io.OutputStreamWriter;
 import java.io.IOException;
-import java.io.Writer;
+import java.io.OutputStreamWriter;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
-
+import java.io.Writer;
 import java.util.BitSet;
 
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.share.util;
 
 import java.io.UnsupportedEncodingException;
-
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java Wed Jul 26 20:39:26 2006
@@ -20,7 +20,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-
 import java.util.StringTokenizer;
 
 import javax.servlet.ServletRequest;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/BaseNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/BaseNodeParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/BaseNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/BaseNodeParser.java Wed Jul 26 20:39:26 2006
@@ -15,10 +15,9 @@
  */
 package org.apache.myfaces.trinidadinternal.share.xml;
 
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXParseException;
-
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 
 /**
  * A base implementation of NodeParser that performs

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ClassParserFactory.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ClassParserFactory.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ClassParserFactory.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ClassParserFactory.java Wed Jul 26 20:39:26 2006
@@ -17,8 +17,6 @@
 package org.apache.myfaces.trinidadinternal.share.xml;
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
-
-
 import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/JaxpXMLProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/JaxpXMLProvider.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/JaxpXMLProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/JaxpXMLProvider.java Wed Jul 26 20:39:26 2006
@@ -16,20 +16,17 @@
 package org.apache.myfaces.trinidadinternal.share.xml;
 
 import java.io.IOException;
-
 import java.lang.reflect.UndeclaredThrowableException;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
 
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.w3c.dom.Document;
-
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
 
 /**
  * Implementation of XMLProvider that uses JAXP to access a parser.

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceSupport.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceSupport.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceSupport.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceSupport.java Wed Jul 26 20:39:26 2006
@@ -15,11 +15,10 @@
  */
 package org.apache.myfaces.trinidadinternal.share.xml;
 
+import java.util.ArrayList;
 import java.util.EmptyStackException;
 import java.util.Hashtable;
 import java.util.Iterator;
-import java.util.ArrayList;
-
 
 import org.apache.myfaces.trinidad.util.ArrayMap;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceURI.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceURI.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceURI.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceURI.java Wed Jul 26 20:39:26 2006
@@ -16,9 +16,8 @@
 package org.apache.myfaces.trinidadinternal.share.xml;
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
-
-import org.apache.myfaces.trinidadinternal.share.expl.PrefixMapper;
 import org.apache.myfaces.trinidadinternal.share.expl.ExpressionContext;
+import org.apache.myfaces.trinidadinternal.share.expl.PrefixMapper;
 
 /**
  * Utility class to parse a string of the form

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContext.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContext.java Wed Jul 26 20:39:26 2006
@@ -15,9 +15,8 @@
  */
 package org.apache.myfaces.trinidadinternal.share.xml;
 
-import org.xml.sax.Locator;
-
 import org.apache.myfaces.trinidadinternal.share.expl.ExpressionContext;
+import org.xml.sax.Locator;
 
 /**
  * An interface providing contextual information for the current

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContextImpl.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContextImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContextImpl.java Wed Jul 26 20:39:26 2006
@@ -15,13 +15,11 @@
  */
 package org.apache.myfaces.trinidadinternal.share.xml;
 
-import org.xml.sax.Locator;
-
 import org.apache.myfaces.trinidadinternal.share.expl.ExpressionContext;
-import org.apache.myfaces.trinidadinternal.share.expl.PrefixMapper;
 import org.apache.myfaces.trinidadinternal.share.expl.NSFunctionMapper;
-
+import org.apache.myfaces.trinidadinternal.share.expl.PrefixMapper;
 import org.apache.myfaces.trinidadinternal.share.util.NamespaceMap;
+import org.xml.sax.Locator;
 
 /**
  * The base implementation of ParseContext.  Clients can subclass

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContextWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContextWrapper.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContextWrapper.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ParseContextWrapper.java Wed Jul 26 20:39:26 2006
@@ -15,12 +15,11 @@
  */
 package org.apache.myfaces.trinidadinternal.share.xml;
 
-import org.xml.sax.Locator;
-
 import org.apache.myfaces.trinidadinternal.share.expl.ExpressionContext;
 import org.apache.myfaces.trinidadinternal.share.expl.Function;
-import org.apache.myfaces.trinidadinternal.share.expl.PrefixMapper;
 import org.apache.myfaces.trinidadinternal.share.expl.NSFunctionMapper;
+import org.apache.myfaces.trinidadinternal.share.expl.PrefixMapper;
+import org.xml.sax.Locator;
 
 /**
  * Wrapper class that turns a client-created ParseContext into



Mime
View raw message