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 [2/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/agent/AdfFacesAgentImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgentImpl.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/agent/AdfFacesAgentImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgentImpl.java Wed Jul 26 20:39:26 2006
@@ -15,16 +15,14 @@
 */
 package org.apache.myfaces.trinidadinternal.agent;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidad.context.Agent;
-
 import java.net.URL;
-
 import java.util.List;
 import java.util.Map;
 
 import javax.faces.context.FacesContext;
 
+import org.apache.myfaces.trinidad.context.Agent;
+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/agent/AgentFactory.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactory.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/agent/AgentFactory.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactory.java Wed Jul 26 20:39:26 2006
@@ -15,14 +15,14 @@
 */
 package org.apache.myfaces.trinidadinternal.agent;
 
-import org.apache.myfaces.trinidad.context.Agent;
-
 import javax.faces.context.FacesContext;
 
+import org.apache.myfaces.trinidad.context.Agent;
+
 
 /**
  * Factory to create Agent. Allows implementations to plug in their own agent
- * detection, without having to override AdfFacesContext.
+ * detection, without having to override RequestContext.
  * //@todo: Right now this not public API, but will be when adf faces cofiguration is sorted out
  */
 public interface AgentFactory

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.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/agent/AgentFactoryImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java Wed Jul 26 20:39:26 2006
@@ -18,10 +18,9 @@
 import java.util.Collections;
 import java.util.Map;
 
-import org.apache.myfaces.trinidad.context.Agent;
-
 import javax.faces.context.FacesContext;
 
+import org.apache.myfaces.trinidad.context.Agent;
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.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/agent/AgentUtil.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java Wed Jul 26 20:39:26 2006
@@ -17,11 +17,11 @@
 
 import java.util.Map;
 
-import org.apache.myfaces.trinidad.context.Agent;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-
 import javax.faces.context.FacesContext;
 
+import org.apache.myfaces.trinidad.context.Agent;
+import org.apache.myfaces.trinidad.context.RequestContext;
+
 /**
  * agent util class
  */
@@ -87,7 +87,7 @@
    */
   public static AdfFacesAgent getAgent(FacesContext context)
   {
-    Agent agent = AdfFacesContext.getCurrentInstance().getAgent();
+    Agent agent = RequestContext.getCurrentInstance().getAgent();
     if (agent instanceof AdfFacesAgent)
       return (AdfFacesAgent) agent;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilitiesProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilitiesProvider.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/agent/CapabilitiesProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilitiesProvider.java Wed Jul 26 20:39:26 2006
@@ -15,14 +15,14 @@
 */
 package org.apache.myfaces.trinidadinternal.agent;
 
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.myfaces.trinidad.context.Agent;
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidadinternal.agent.parse.CapabilitiesDocument;
 import org.apache.myfaces.trinidadinternal.agent.parse.CapabilitiesDocumentParser;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.net.URL;
 
 /**
  * An implementation of Capabilities Provider. The Capabilities provider

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.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/agent/CapabilityMap.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java Wed Jul 26 20:39:26 2006
@@ -15,13 +15,13 @@
 */
 package org.apache.myfaces.trinidadinternal.agent;
 
-import java.util.Set;
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.AbstractMap;
-import java.util.HashSet;
-import java.util.Collections;
+import java.util.Set;
 
 /**
  * Pretty much the same Impl of UIX CapabilityMap, with following changes

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityValue.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/agent/CapabilityValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityValue.java Wed Jul 26 20:39:26 2006
@@ -28,7 +28,7 @@
   //an string.intern() on the values read from the file.
  
   //Also string values need to be retained, as need to support
-  //clients accessing the Agent Api (AdfFacesContext object constants 
+  //clients accessing the Agent Api (RequestContext object constants 
   //are internal impl)
   
   //This is a poor man's quick substitute for string.intern().

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/DefaultAgent.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/DefaultAgent.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/agent/DefaultAgent.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/DefaultAgent.java Wed Jul 26 20:39:26 2006
@@ -15,9 +15,9 @@
 */
 package org.apache.myfaces.trinidadinternal.agent;
 
-import org.apache.myfaces.trinidad.context.Agent;
-
 import java.util.Map;
+
+import org.apache.myfaces.trinidad.context.Agent;
 
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/DeviceRepository.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/DeviceRepository.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/agent/DeviceRepository.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/DeviceRepository.java Wed Jul 26 20:39:26 2006
@@ -16,6 +16,7 @@
 package org.apache.myfaces.trinidadinternal.agent;
 
 import javax.faces.context.FacesContext;
+
 import org.apache.myfaces.trinidad.context.Agent;
 
 public abstract class DeviceRepository

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilitiesDocument.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilitiesDocument.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/agent/parse/CapabilitiesDocument.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilitiesDocument.java Wed Jul 26 20:39:26 2006
@@ -15,13 +15,13 @@
 */
 package org.apache.myfaces.trinidadinternal.agent.parse;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidad.context.Agent;
-
+import java.net.URL;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.HashMap;
-import java.net.URL;
+import java.util.List;
+
+import org.apache.myfaces.trinidad.context.Agent;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilitiesDocumentParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilitiesDocumentParser.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/agent/parse/CapabilitiesDocumentParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilitiesDocumentParser.java Wed Jul 26 20:39:26 2006
@@ -15,26 +15,23 @@
 */
 package org.apache.myfaces.trinidadinternal.agent.parse;
 
-import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidadinternal.share.xml.ParseContextImpl;
-
-import org.apache.myfaces.trinidadinternal.share.xml.TreeBuilder;
-import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
-import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
-
-
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.myfaces.trinidad.logging.ADFLogger;
+import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
+import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
+import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
+import org.apache.myfaces.trinidadinternal.share.xml.ParseContextImpl;
+import org.apache.myfaces.trinidadinternal.share.xml.TreeBuilder;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 /**
  * Parser for parsing capabilities document

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilitiesNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilitiesNodeParser.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/agent/parse/CapabilitiesNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilitiesNodeParser.java Wed Jul 26 20:39:26 2006
@@ -16,16 +16,16 @@
 package org.apache.myfaces.trinidadinternal.agent.parse;
 
 
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXParseException;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.text.ParseException;
 
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilityDataDocumentParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilityDataDocumentParser.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/agent/parse/CapabilityDataDocumentParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/CapabilityDataDocumentParser.java Wed Jul 26 20:39:26 2006
@@ -15,26 +15,25 @@
 */
 package org.apache.myfaces.trinidadinternal.agent.parse;
 
-import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.List;
-import java.util.ArrayList;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidadinternal.agent.CapabilityKey;
 import org.apache.myfaces.trinidadinternal.agent.CapabilityValue;
 import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
+import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
+import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
 import org.apache.myfaces.trinidadinternal.share.xml.ParseContextImpl;
 import org.apache.myfaces.trinidadinternal.share.xml.TreeBuilder;
-import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 /**
  * CapabilitiesData document parser

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/ComponentNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/ComponentNodeParser.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/agent/parse/ComponentNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/ComponentNodeParser.java Wed Jul 26 20:39:26 2006
@@ -15,14 +15,14 @@
 */
 package org.apache.myfaces.trinidadinternal.agent.parse;
 
-import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
+import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXParseException;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Node parser for component nodes in the capabilities file

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/DeviceNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/DeviceNodeParser.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/agent/parse/DeviceNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/DeviceNodeParser.java Wed Jul 26 20:39:26 2006
@@ -15,16 +15,16 @@
 */
 package org.apache.myfaces.trinidadinternal.agent.parse;
 
-import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
+import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXParseException;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.text.ParseException;
 
 /**
  * NodePaser for device nodes in the capabilities file

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/IncludeNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/IncludeNodeParser.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/agent/parse/IncludeNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/IncludeNodeParser.java Wed Jul 26 20:39:26 2006
@@ -15,14 +15,14 @@
 */
 package org.apache.myfaces.trinidadinternal.agent.parse;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXParseException;
-
-import java.net.URL;
-import java.net.MalformedURLException;
 
 /**
  * NodePaser for include nodes in the capabilities file

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/NameVersion.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/NameVersion.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/agent/parse/NameVersion.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/NameVersion.java Wed Jul 26 20:39:26 2006
@@ -15,9 +15,9 @@
 */
 package org.apache.myfaces.trinidadinternal.agent.parse;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.text.ParseException;
 
 /**
  * An implementation that encapsulates "Name/Version Name/version ..." string and

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/NavigationHandlerImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/NavigationHandlerImpl.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/application/NavigationHandlerImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/NavigationHandlerImpl.java Wed Jul 26 20:39:26 2006
@@ -19,7 +19,7 @@
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 public class NavigationHandlerImpl extends NavigationHandler
 {
@@ -47,7 +47,7 @@
         // Navigate back to the original root
         context.setViewRoot(oldRoot);
 
-        AdfFacesContext afc = AdfFacesContext.getCurrentInstance();
+        RequestContext afc = RequestContext.getCurrentInstance();
 
         // Give ourselves a new page flow scope
         afc.getPageFlowScopeProvider().pushPageFlowScope(context, true);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.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/application/StateManagerImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Wed Jul 26 20:39:26 2006
@@ -16,9 +16,7 @@
 package org.apache.myfaces.trinidadinternal.application;
 
 import java.io.IOException;
-
 import java.io.Serializable;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -35,16 +33,13 @@
 import javax.faces.render.RenderKitFactory;
 import javax.faces.render.ResponseStateManager;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-
 import org.apache.myfaces.trinidad.component.UIXComponentBase;
-
+import org.apache.myfaces.trinidad.logging.ADFLogger;
+import org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener;
 import org.apache.myfaces.trinidadinternal.util.LRUCache;
 import org.apache.myfaces.trinidadinternal.util.SubKeyMap;
 import org.apache.myfaces.trinidadinternal.util.TokenCache;
-import org.apache.myfaces.trinidadinternal.context.AdfFacesPhaseListener;
 
-// Imported only for a String constant - so no runtime dependency
 import com.sun.facelets.FaceletViewHandler;
 
 /**
@@ -591,7 +586,7 @@
       return false;
 
     if (_saveAsToken(context) &&
-        !AdfFacesPhaseListener.isPostback(context))
+        !TrinidadPhaseListener.isPostback(context))
     {
       if (_useApplicationViewCache == null)
       {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/Structure.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/Structure.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/application/Structure.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/Structure.java Wed Jul 26 20:39:26 2006
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.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/application/ViewHandlerImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java Wed Jul 26 20:39:26 2006
@@ -33,13 +33,13 @@
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
 import org.apache.myfaces.trinidad.render.InternalView;
 import org.apache.myfaces.trinidad.util.Service;
-import org.apache.myfaces.trinidadinternal.context.AdfFacesContextImpl;
-import org.apache.myfaces.trinidadinternal.context.AdfFacesPhaseListener;
+import org.apache.myfaces.trinidadinternal.context.RequestContextImpl;
+import org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener;
 
 /**
  * ViewHandler that adds modification detection to the existing ViewHandler,
@@ -119,7 +119,7 @@
   public String getActionURL(FacesContext context, String viewId)
   {
     String actionURL = _delegate.getActionURL(context, viewId);
-    AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+    RequestContext afContext = RequestContext.getCurrentInstance();
     if (afContext != null)
     {
       actionURL = afContext.getPageResolver().encodeActionURI(actionURL);
@@ -187,16 +187,16 @@
   {
     // If we're being asked to re-run the lifecycle for a "return"
     // event, always restore the "launch view", which was set
-    // over in AdfFacesContextImpl
+    // over in RequestContextImpl
     UIViewRoot launchView = (UIViewRoot)
       context.getExternalContext().getRequestMap().get(
-        AdfFacesContextImpl.LAUNCH_VIEW);
+        RequestContextImpl.LAUNCH_VIEW);
 
     if (launchView != null)
     {
       context.getExternalContext().getRequestMap().remove(
-        AdfFacesContextImpl.LAUNCH_VIEW);
-      AdfFacesPhaseListener.markPostback(context);
+        RequestContextImpl.LAUNCH_VIEW);
+      TrinidadPhaseListener.markPostback(context);
       return launchView;
     }
 
@@ -255,7 +255,7 @@
     // this is a postback request.
     if (result != null)
     {
-      AdfFacesPhaseListener.markPostback(context);
+      TrinidadPhaseListener.markPostback(context);
     }
 
     return result;
@@ -355,13 +355,13 @@
    */
   static private String _getPath(String uri)
   {
-    AdfFacesContext afc = AdfFacesContext.getCurrentInstance();
+    RequestContext afc = RequestContext.getCurrentInstance();
     if (afc != null)
     {
       return afc.getPageResolver().getPhysicalURI(uri);
     }
 
-    // No AdfFacesContext?  Just return the URI
+    // No RequestContext?  Just return the URI
     return uri;
   }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/change/BaseChangeManager.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/change/BaseChangeManager.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/change/BaseChangeManager.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/change/BaseChangeManager.java Wed Jul 26 20:39:26 2006
@@ -26,11 +26,10 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.change.ChangeManager;
 import org.apache.myfaces.trinidad.change.ComponentChange;
 import org.apache.myfaces.trinidad.change.DocumentChange;
-
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.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/context/DialogServiceImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java Wed Jul 26 20:39:26 2006
@@ -27,21 +27,19 @@
 import javax.faces.el.ValueBinding;
 import javax.faces.render.RenderKit;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
 import org.apache.myfaces.trinidad.context.DialogService;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.event.LaunchEvent;
 import org.apache.myfaces.trinidad.event.ReturnEvent;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.render.DialogRenderKitService;
 import org.apache.myfaces.trinidad.util.Service;
-
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-
 import org.apache.myfaces.trinidadinternal.application.StateManagerImpl;
-import org.apache.myfaces.trinidadinternal.webapp.AdfFacesFilterImpl;
+import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
 
 public class DialogServiceImpl extends DialogService
 {
-  public DialogServiceImpl(AdfFacesContextImpl context)
+  public DialogServiceImpl(RequestContextImpl context)
   {
     _context = context;
   }
@@ -231,17 +229,17 @@
     // the AdfFacesFilter to re-execute the faces lifecycle with the
     // new parameters
     Map launchParameters = (Map)
-      poppedView.getAttributes().get(AdfFacesContextImpl.LAUNCH_PARAMETERS);
+      poppedView.getAttributes().get(RequestContextImpl.LAUNCH_PARAMETERS);
 
     if (launchParameters != null)
     {
       // Store the parameters and the UIViewRoot for (respectively)
       // AdfFacesFilterImpl and ViewHandlerImpl
-      poppedView.getAttributes().remove(AdfFacesContextImpl.LAUNCH_PARAMETERS);
+      poppedView.getAttributes().remove(RequestContextImpl.LAUNCH_PARAMETERS);
 
       Map requestMap = context.getExternalContext().getRequestMap();
-      requestMap.put(AdfFacesContextImpl.LAUNCH_PARAMETERS, launchParameters);
-      requestMap.put(AdfFacesContextImpl.LAUNCH_VIEW, poppedView);
+      requestMap.put(RequestContextImpl.LAUNCH_PARAMETERS, launchParameters);
+      requestMap.put(RequestContextImpl.LAUNCH_VIEW, poppedView);
 
       context.responseComplete();
       _LOG.fine("Returned from dialog and re-executing lifecycle for {0}",
@@ -255,7 +253,7 @@
   public ReturnEvent getReturnEvent(UIComponent source)
   {
     FacesContext context = _getFacesContext();
-    if (AdfFacesFilterImpl.isExecutingDialogReturn(context))
+    if (TrinidadFilterImpl.isExecutingDialogReturn(context))
     {
       Map parameterMap = context.getExternalContext().getRequestParameterMap();
       Object returnParam = parameterMap.get(_RETURN_PARAM);
@@ -401,7 +399,7 @@
       savedRequestParameters.remove("source");
       savedRequestParameters.remove("event");
 
-      sourceRoot.getAttributes().put(AdfFacesContextImpl.LAUNCH_PARAMETERS,
+      sourceRoot.getAttributes().put(RequestContextImpl.LAUNCH_PARAMETERS,
                                      savedRequestParameters);
       pushView(sourceRoot);
 
@@ -460,7 +458,7 @@
       _executeBindings(context, (UIComponent) kids.next());
   }
 
-  private AdfFacesContextImpl _context;
+  private RequestContextImpl _context;
 
 
   /**
@@ -477,7 +475,7 @@
 
     public void launchDialog(boolean useWindow)
     {
-      AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+      RequestContext afContext = RequestContext.getCurrentInstance();
       afContext.getDialogService().launchDialog(
         getViewRoot(),
         getDialogParameters(),

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/ExternalContextDecorator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/ExternalContextDecorator.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/context/ExternalContextDecorator.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/ExternalContextDecorator.java Wed Jul 26 20:39:26 2006
@@ -22,8 +22,8 @@
 import java.security.Principal;
 import java.util.Iterator;
 import java.util.Locale;
-import java.util.Set;
 import java.util.Map;
+import java.util.Set;
 
 import javax.faces.context.ExternalContext;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.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/context/FacesContextFactoryImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.context;
 
 import java.io.IOException;
-
 import java.util.Iterator;
 
 import javax.faces.application.Application;
@@ -30,8 +29,8 @@
 import javax.faces.lifecycle.Lifecycle;
 import javax.faces.render.RenderKit;
 
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
 
 /**
  * Internal class that optimizes retrieval of the RenderKit by caching it
@@ -199,7 +198,7 @@
 
     public void dispatch(String path) throws IOException
     {
-      AdfFacesContext afc = AdfFacesContext.getCurrentInstance();
+      RequestContext afc = RequestContext.getCurrentInstance();
       if (afc != null)
       {
         path = afc.getPageResolver().getPhysicalURI(path);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeMap.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/context/PageFlowScopeMap.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeMap.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.context;
 
 import java.io.Serializable;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -26,7 +25,6 @@
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
-
 import org.apache.myfaces.trinidadinternal.util.SubKeyMap;
 import org.apache.myfaces.trinidadinternal.util.TokenCache;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.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/context/PageFlowScopeProviderImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.java Wed Jul 26 20:39:26 2006
@@ -19,9 +19,8 @@
 
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
 import org.apache.myfaces.trinidad.context.PageFlowScopeProvider;
-
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
 
 public class PageFlowScopeProviderImpl extends PageFlowScopeProvider
@@ -43,8 +42,8 @@
     PageFlowScopeMap pageFlowScope = _getPageFlowScope(context);
     if (pageFlowScope == null)
     {
-      AdfFacesContextImpl impl = (AdfFacesContextImpl)
-        AdfFacesContext.getCurrentInstance();
+      RequestContextImpl impl = (RequestContextImpl)
+        RequestContext.getCurrentInstance();
       int lifetime = impl.__getPageFlowScopeLifetime();
       String token = _getToken(context);
       if (token != null)

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java (from r425846, incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextBean.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextBean.java&r1=425846&r2=425942&rev=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java Wed Jul 26 20:39:26 2006
@@ -20,7 +20,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBeanImpl;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 
-public class AdfFacesContextBean extends FacesBeanImpl
+public class RequestContextBean extends FacesBeanImpl
 {
   static public Type TYPE = new Type();
   static public final PropertyKey PAGE_FLOW_SCOPE_LIFETIME_KEY =

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java (from r425846, incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextFactoryImpl.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextFactoryImpl.java&r1=425846&r2=425942&rev=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextFactoryImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java Wed Jul 26 20:39:26 2006
@@ -19,35 +19,33 @@
 
 import javax.servlet.ServletContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-import org.apache.myfaces.trinidad.context.AdfFacesContextFactory;
 import org.apache.myfaces.trinidad.context.PageFlowScopeProvider;
 import org.apache.myfaces.trinidad.context.PageResolver;
-
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.context.RequestContextFactory;
 import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
-
 import org.apache.myfaces.trinidadinternal.webapp.ConfigParser;
 
 /**
  * @author The Oracle ADF Faces Team
  */
-public class AdfFacesContextFactoryImpl extends AdfFacesContextFactory
+public class RequestContextFactoryImpl extends RequestContextFactory
 {
-  public AdfFacesContextFactoryImpl()
+  public RequestContextFactoryImpl()
   {
   }
 
-  public AdfFacesContext createContext(Object context,
+  public RequestContext createContext(Object context,
                                        Object request)
   {
-    AdfFacesContextImpl impl =  new AdfFacesContextImpl(_getBean(context));
+    RequestContextImpl impl =  new RequestContextImpl(_getBean(context));
     impl.init(request);
     impl.__setPageResolver(_pageResolver);
     impl.__setPageFlowScopeProvider(_pageFlowScopeProvider);
     return impl;
   }
 
-  private AdfFacesContextBean _getBean(Object context)
+  private RequestContextBean _getBean(Object context)
   {
     if (_bean == null)
     {
@@ -59,7 +57,7 @@
         }
         else
         {
-          _bean = new AdfFacesContextBean();
+          _bean = new RequestContextBean();
         }
 
         // And let's load the PageResolver and PageFlowScopeProvider
@@ -88,7 +86,7 @@
     return _bean;
   }
 
-  private AdfFacesContextBean _bean;
+  private RequestContextBean _bean;
   private PageResolver        _pageResolver;
   private PageFlowScopeProvider _pageFlowScopeProvider;
 

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java (from r425846, incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextImpl.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextImpl.java&r1=425846&r2=425942&rev=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java Wed Jul 26 20:39:26 2006
@@ -27,49 +27,41 @@
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.change.ChangeManager;
 import org.apache.myfaces.trinidad.component.UIXCollection;
 import org.apache.myfaces.trinidad.config.RegionManager;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-import org.apache.myfaces.trinidad.context.DialogService;
 import org.apache.myfaces.trinidad.context.Agent;
-import org.apache.myfaces.trinidad.context.PageResolver;
+import org.apache.myfaces.trinidad.context.DialogService;
 import org.apache.myfaces.trinidad.context.PageFlowScopeProvider;
+import org.apache.myfaces.trinidad.context.PageResolver;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
 import org.apache.myfaces.trinidad.webapp.UploadedFileProcessor;
-
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgentImpl;
 import org.apache.myfaces.trinidadinternal.agent.AgentFactory;
 import org.apache.myfaces.trinidadinternal.agent.AgentFactoryImpl;
-
 import org.apache.myfaces.trinidadinternal.change.NullChangeManager;
 import org.apache.myfaces.trinidadinternal.change.SessionChangeManager;
-
 import org.apache.myfaces.trinidadinternal.el.FormatterMap;
 import org.apache.myfaces.trinidadinternal.el.HelpProvider;
 import org.apache.myfaces.trinidadinternal.el.OracleHelpProvider;
-
 import org.apache.myfaces.trinidadinternal.metadata.RegionMetadata;
-
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
 import org.apache.myfaces.trinidadinternal.share.config.UIXCookie;
-
 import org.apache.myfaces.trinidadinternal.ui.expl.ColorPaletteUtils;
 import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
-
-import org.apache.myfaces.trinidadinternal.webapp.AdfFacesFilterImpl;
+import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
 
 /**
  * @author The Oracle ADF Faces Team
  */
-public class AdfFacesContextImpl extends AdfFacesContext
+public class RequestContextImpl extends RequestContext
 {
   static public final String LAUNCH_PARAMETERS =
     "org.apache.myfaces.trinidad.PageFlowSourceParameters";
@@ -78,7 +70,7 @@
     "org.apache.myfaces.trinidad.PageFlowSourceView";
 
 
-  public AdfFacesContextImpl(AdfFacesContextBean bean)
+  public RequestContextImpl(RequestContextBean bean)
   {
     _bean = bean;
     _dialogService = new DialogServiceImpl(this);
@@ -144,7 +136,7 @@
   public UploadedFileProcessor getUploadedFileProcessor()
   {
     return (UploadedFileProcessor)
-      _bean.getProperty(AdfFacesContextBean.UPLOADED_FILE_PROCESSOR_KEY);
+      _bean.getProperty(RequestContextBean.UPLOADED_FILE_PROCESSOR_KEY);
   }
 
 
@@ -152,14 +144,14 @@
   {
     FacesContext context = __getFacesContext();
     // First, see if this is definitely not a postback request
-    if (!AdfFacesPhaseListener.isPostback(context))
+    if (!TrinidadPhaseListener.isPostback(context))
       return false;
 
     // Second, see if we are still on the original view root (which
     // the PhaseListener's isPostback() method doesn't look at).
     UIViewRoot originalViewRoot = (UIViewRoot)
       context.getExternalContext().getRequestMap().
-         get(AdfFacesPhaseListener.INITIAL_VIEW_ROOT_KEY);
+         get(TrinidadPhaseListener.INITIAL_VIEW_ROOT_KEY);
 
     // However, we only set the "originalViewRoot" during the afterPhase()
     // of our PhaseListener;  so, if it's null, then we have to asume
@@ -192,25 +184,25 @@
   public boolean isDebugOutput()
   {
     return Boolean.TRUE.equals(
-       _bean.getProperty(AdfFacesContextBean.DEBUG_OUTPUT_KEY));
+       _bean.getProperty(RequestContextBean.DEBUG_OUTPUT_KEY));
   }
 
   public boolean isClientValidationDisabled()
   {
     return Boolean.TRUE.equals(
-       _bean.getProperty(AdfFacesContextBean.CLIENT_VALIDATION_DISABLED_KEY));
+       _bean.getProperty(RequestContextBean.CLIENT_VALIDATION_DISABLED_KEY));
   }
 
   public String getOutputMode()
   {
-    return (String) _bean.getProperty(AdfFacesContextBean.OUTPUT_MODE_KEY);
+    return (String) _bean.getProperty(RequestContextBean.OUTPUT_MODE_KEY);
   }
 
   // get skinFamily; default to minimal if nothing is specified.
   public String getSkinFamily()
   {
     String skinFamily =
-      (String) _bean.getProperty(AdfFacesContextBean.SKIN_FAMILY_KEY);
+      (String) _bean.getProperty(RequestContextBean.SKIN_FAMILY_KEY);
     if (skinFamily == null)
       skinFamily = "minimal";
     return skinFamily;
@@ -219,7 +211,7 @@
   public String getAccessibilityMode()
   {
     String s = (String) _bean.getProperty(
-      AdfFacesContextBean.ACCESSIBILITY_MODE_KEY);
+      RequestContextBean.ACCESSIBILITY_MODE_KEY);
     if (s != null)
       return s;
 
@@ -236,7 +228,7 @@
   public char getNumberGroupingSeparator()
   {
     Character c = (Character) _bean.getProperty(
-      AdfFacesContextBean.NUMBER_GROUPING_SEPARATOR_KEY);
+      RequestContextBean.NUMBER_GROUPING_SEPARATOR_KEY);
     if (c != null)
       return c.charValue();
 
@@ -246,7 +238,7 @@
   public char getDecimalSeparator()
   {
     Character c = (Character) _bean.getProperty(
-      AdfFacesContextBean.DECIMAL_SEPARATOR_KEY);
+      RequestContextBean.DECIMAL_SEPARATOR_KEY);
     if (c != null)
       return c.charValue();
 
@@ -256,7 +248,7 @@
 
   public TimeZone getTimeZone()
   {
-    TimeZone tz = (TimeZone) _bean.getProperty(AdfFacesContextBean.TIME_ZONE_KEY);
+    TimeZone tz = (TimeZone) _bean.getProperty(RequestContextBean.TIME_ZONE_KEY);
     if (tz != null)
       return tz;
 
@@ -345,18 +337,18 @@
 
   public String getCurrencyCode()
   {
-    return (String) _bean.getProperty(AdfFacesContextBean.CURRENCY_CODE_KEY);
+    return (String) _bean.getProperty(RequestContextBean.CURRENCY_CODE_KEY);
   }
 
   public String getOracleHelpServletUrl()
   {
     return (String) _bean.getProperty(
-     AdfFacesContextBean.ORACLE_HELP_SERVLET_URL_KEY);
+     RequestContextBean.ORACLE_HELP_SERVLET_URL_KEY);
   }
 
   public boolean isRightToLeft()
   {
-    Boolean b = (Boolean) _bean.getProperty(AdfFacesContextBean.RIGHT_TO_LEFT_KEY);
+    Boolean b = (Boolean) _bean.getProperty(RequestContextBean.RIGHT_TO_LEFT_KEY);
     if (b != null)
       return b.booleanValue();
 
@@ -398,7 +390,7 @@
   {
     FacesContext fContext = __getFacesContext();
 
-    AdfRenderingContext afContext = AdfRenderingContext.getCurrentInstance();
+    RenderingContext afContext = RenderingContext.getCurrentInstance();
 
     PartialPageContext pContext = null;
 
@@ -515,7 +507,7 @@
   public int getTwoDigitYearStart()
   {
     Integer twoDigitYearStart  = (Integer) _bean.getProperty(
-      AdfFacesContextBean.TWO_DIGIT_YEAR_START);
+      RequestContextBean.TWO_DIGIT_YEAR_START);
 
     if (twoDigitYearStart != null)
       return twoDigitYearStart.intValue();
@@ -550,7 +542,7 @@
   int __getPageFlowScopeLifetime()
   {
     Integer lifetimeObj = (Integer) _bean.getProperty(
-                           AdfFacesContextBean.PAGE_FLOW_SCOPE_LIFETIME_KEY);
+                           RequestContextBean.PAGE_FLOW_SCOPE_LIFETIME_KEY);
     if (lifetimeObj == null)
       return _DEFAULT_PAGE_FLOW_SCOPE_LIFETIME;
     return lifetimeObj.intValue();
@@ -592,7 +584,7 @@
 
   //
   // Get the FacesContext.  We used to cache the instance, but
-  // in some circumstances the AdfFacesContext was getting reused
+  // in some circumstances the RequestContext was getting reused
   // across multiple FacesServlet invocations, so the caching
   // was more trouble than it was worth.  Re-enable some sort
   // of caching if it proves a performance issue.
@@ -605,7 +597,7 @@
     // to the filter and ask for a pseudo-FacesContext
     if (fContext == null)
     {
-      fContext = AdfFacesFilterImpl.getPseudoFacesContext();
+      fContext = TrinidadFilterImpl.getPseudoFacesContext();
     }
 
     return fContext;
@@ -639,7 +631,7 @@
   }
 
 
-  private AdfFacesContextBean _bean;
+  private RequestContextBean _bean;
   private HelpProvider        _provider;
   private Map                 _partialListeners;
   private Set                 _partialTargets = new HashSet();
@@ -650,7 +642,7 @@
   private PageResolver        _pageResolver;
   private PageFlowScopeProvider _pageFlowScopeProvider;
 
-  //todo: get factory from configuration (else implementations have to provide their own AdfFacesContext)
+  //todo: get factory from configuration (else implementations have to provide their own RequestContext)
   static private final AgentFactory _agentFactory = new AgentFactoryImpl();
 
   // static private final Object _GLOBAL_TRIGGER = new Object();
@@ -661,5 +653,5 @@
     "org.apache.myfaces.trinidad.CHANGE_PERSISTENCE";
 
   static private final ADFLogger _LOG =
-    ADFLogger.createADFLogger(AdfFacesContextImpl.class);
+    ADFLogger.createADFLogger(RequestContextImpl.class);
 }

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java (from r425846, incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesPhaseListener.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesPhaseListener.java&r1=425846&r2=425942&rev=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesPhaseListener.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java Wed Jul 26 20:39:26 2006
@@ -18,26 +18,24 @@
 import java.util.Map;
 
 import javax.faces.context.FacesContext;
-
 import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
 import javax.faces.event.PhaseListener;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-import org.apache.myfaces.trinidad.context.AdfFacesContextFactory;
-
-import org.apache.myfaces.trinidadinternal.webapp.AdfFacesFilterImpl;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.context.RequestContextFactory;
+import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
 
 /**
- * PhaseListener that hacks to ensure that the AdfFacesContext is
+ * PhaseListener that hacks to ensure that the RequestContext is
  * available even if the filter doesn't execute.
  *
  * @author The Oracle ADF Faces Team
  */
-public class AdfFacesPhaseListener implements PhaseListener
+public class TrinidadPhaseListener implements PhaseListener
 {
   static public final String CACHED_ADF_FACES_CONTEXT =
-    "org.apache.myfaces.trinidadinternal.context.CachedAdfFacesContext";
+    "org.apache.myfaces.trinidadinternal.context.CachedRequestContext";
 
   /**
    * Returns true if the request might be a postback request.
@@ -70,7 +68,7 @@
     }
 
     // If we've finished up Render Response, or for some other
-    // reason the response is complete, free up the AdfFacesContext
+    // reason the response is complete, free up the RequestContext
     // if we created.
     // Note, however, that this code is *not* bulletproof!  There
     // is nothing stopping an "afterPhase()" listener getting called
@@ -98,7 +96,7 @@
         // Assume it's not a postback request
         context.getExternalContext().getRequestMap().put(_POSTBACK_KEY,
                                                          Boolean.FALSE);
-        AdfFacesFilterImpl.verifyFilterIsInstalled(context);
+        TrinidadFilterImpl.verifyFilterIsInstalled(context);
       }
 
       _createContextIfNecessary(event.getFacesContext());
@@ -120,7 +118,7 @@
   }
 
   //
-  // Create the AdfFacesContext if necessary;  ideally, this is unnecessary
+  // Create the RequestContext if necessary;  ideally, this is unnecessary
   // because our filter will have executed - but if not, deal.
   //
   static private void _createContextIfNecessary(FacesContext fContext)
@@ -130,29 +128,29 @@
       requestMap.get(_CREATED_CONTEXT_KEY);
     if (createdContext == null)
     {
-      AdfFacesContext context = AdfFacesContext.getCurrentInstance();
+      RequestContext context = RequestContext.getCurrentInstance();
       // Let our code know if it has to clean up.
       requestMap.put(_CREATED_CONTEXT_KEY,
                      context == null ? Boolean.TRUE : Boolean.FALSE);
 
       if (context == null)
       {
-        Object cachedAdfFacesContext = requestMap.get(CACHED_ADF_FACES_CONTEXT);
+        Object cachedRequestContext = requestMap.get(CACHED_ADF_FACES_CONTEXT);
         
         // Catch both the null scenario and the 
-        // AdfFacesContext-from-a-different-classloader scenario
-        if (cachedAdfFacesContext instanceof AdfFacesContext)
+        // RequestContext-from-a-different-classloader scenario
+        if (cachedRequestContext instanceof RequestContext)
         {
-          context = (AdfFacesContext) cachedAdfFacesContext;
+          context = (RequestContext) cachedRequestContext;
           context.attach();
         }
         else
         {
-          AdfFacesContextFactory factory = AdfFacesContextFactory.getFactory();
+          RequestContextFactory factory = RequestContextFactory.getFactory();
           if (factory == null)
           {
-            AdfFacesContextFactory.setFactory(new AdfFacesContextFactoryImpl());
-            factory = AdfFacesContextFactory.getFactory();
+            RequestContextFactory.setFactory(new RequestContextFactoryImpl());
+            factory = RequestContextFactory.getFactory();
           }
 
           assert(factory != null);
@@ -166,7 +164,7 @@
   }
 
   //
-  // Release the AdfFacesContext if we created it.
+  // Release the RequestContext if we created it.
   //
   static private void _releaseContextIfNecessary(FacesContext fContext)
   {
@@ -174,7 +172,7 @@
       fContext.getExternalContext().getRequestMap().get(_CREATED_CONTEXT_KEY);
     if (Boolean.TRUE.equals(createdContext))
     {
-      AdfFacesContext context = AdfFacesContext.getCurrentInstance();
+      RequestContext context = RequestContext.getCurrentInstance();
       if (context != null)
         context.release();
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.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/convert/ColorConverter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java Wed Jul 26 20:39:26 2006
@@ -22,7 +22,6 @@
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.util.MessageFactory;
-
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
 import org.apache.myfaces.trinidadinternal.share.text.RGBColorFormat;
 import org.apache.myfaces.trinidadinternal.util.MessageUtils;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.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/convert/ConverterUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java Wed Jul 26 20:39:26 2006
@@ -17,17 +17,17 @@
 package org.apache.myfaces.trinidadinternal.convert;
 
 import java.math.BigInteger;
+
 import javax.faces.FacesException;
 import javax.faces.application.Application;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
-
 import javax.faces.convert.ConverterException;
+
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.util.MessageFactory;
-
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
 import org.apache.myfaces.trinidadinternal.util.MessageUtils;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.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/convert/DateTimeConverter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java Wed Jul 26 20:39:26 2006
@@ -17,25 +17,23 @@
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 
 import javax.faces.component.UIComponent;
+import javax.faces.component.ValueHolder;
 import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.el.ValueBinding;
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
 import org.apache.myfaces.trinidadinternal.util.MessageUtils;
-import javax.faces.component.ValueHolder;
-import javax.faces.convert.Converter;
 
 /**
  * <p>This class implements client side equivalent of DateTimeConverter.
@@ -495,7 +493,7 @@
     if (dateTimeConverterLocale != null)
     {
       Locale defaultLocale =
-        AdfRenderingContext.getCurrentInstance().getLocaleContext().getLocale();
+        RenderingContext.getCurrentInstance().getLocaleContext().getLocale();
       return !dateTimeConverterLocale.equals(defaultLocale);
     }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverter.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/convert/LongConverter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverter.java Wed Jul 26 20:39:26 2006
@@ -18,8 +18,8 @@
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-
 import javax.faces.convert.ConverterException;
+
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/SqlConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/SqlConverter.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/convert/SqlConverter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/SqlConverter.java Wed Jul 26 20:39:26 2006
@@ -18,7 +18,6 @@
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.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/el/OracleHelpProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.java Wed Jul 26 20:39:26 2006
@@ -15,11 +15,11 @@
  */
 package org.apache.myfaces.trinidadinternal.el;
 
+import java.util.Locale;
+
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.trinidadinternal.util.OptimisticHashMap;
-
-import java.util.Locale;
 
 /**
  * <p>

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java (from r425846, incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/AdfFacesVariableResolver.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/AdfFacesVariableResolver.java&r1=425846&r2=425942&rev=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/AdfFacesVariableResolver.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java Wed Jul 26 20:39:26 2006
@@ -18,34 +18,34 @@
 import javax.faces.context.FacesContext;
 import javax.faces.el.VariableResolver;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 /**
  * VariableResolver decorator used by ADF Faces.
  * <p>
  * @author The Oracle ADF Faces Team
  */
-public class AdfFacesVariableResolver extends VariableResolver
+public class TrinidadVariableResolver extends VariableResolver
 {
   static public final String PAGE_FLOW_SCOPE_VARIABLE_NAME = "pageFlowScope";
 
-  public AdfFacesVariableResolver(VariableResolver decorated)
+  public TrinidadVariableResolver(VariableResolver decorated)
   {
     _decorated = decorated;
   }
 
   public Object resolveVariable(FacesContext context, String name)
   {
-    if (AdfFacesContext.VARIABLE_NAME.equals(name))
+    if (RequestContext.VARIABLE_NAME.equals(name))
     {
-      return AdfFacesContext.getCurrentInstance();
+      return RequestContext.getCurrentInstance();
     }
     // Support both "pageFlowScope" and "processScope"
     // as EL variables to give developers a time to migrate
     else if (PAGE_FLOW_SCOPE_VARIABLE_NAME.equals(name) ||
              "processScope".equals(name))
     {
-      return AdfFacesContext.getCurrentInstance().getPageFlowScope();
+      return RequestContext.getCurrentInstance().getPageFlowScope();
     }
 
     return _decorated.resolveVariable(context, name);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/StringArrayPropertyTagRule.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/StringArrayPropertyTagRule.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/facelets/StringArrayPropertyTagRule.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/StringArrayPropertyTagRule.java Wed Jul 26 20:39:26 2006
@@ -17,14 +17,13 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
 import com.sun.facelets.FaceletContext;
+import com.sun.facelets.tag.MetaRule;
 import com.sun.facelets.tag.Metadata;
 import com.sun.facelets.tag.MetadataTarget;
-import com.sun.facelets.tag.MetaRule;
 import com.sun.facelets.tag.TagAttribute;
 import com.sun.facelets.tag.TagAttributeException;
 

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java (from r425846, incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfComponentHandler.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfComponentHandler.java&r1=425846&r2=425942&rev=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfComponentHandler.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java Wed Jul 26 20:39:26 2006
@@ -15,13 +15,6 @@
 */
 package org.apache.myfaces.trinidadinternal.facelets;
 
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.FaceletViewHandler;
-import com.sun.facelets.tag.jsf.ComponentHandler;
-import com.sun.facelets.tag.jsf.ComponentConfig;
-
-import com.sun.facelets.tag.MetaRuleset;
-
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.ExternalContext;
@@ -29,14 +22,20 @@
 
 import org.apache.myfaces.trinidad.component.UIXComponent;
 
+import com.sun.facelets.FaceletContext;
+import com.sun.facelets.FaceletViewHandler;
+import com.sun.facelets.tag.MetaRuleset;
+import com.sun.facelets.tag.jsf.ComponentConfig;
+import com.sun.facelets.tag.jsf.ComponentHandler;
+
 /**
  * TagLibrary implementation for Oracle ADF core library.
  * @author Adam Winer
  * @version
  */
-public class AdfComponentHandler extends ComponentHandler
+public class TrinidadComponentHandler extends ComponentHandler
 {
-  public AdfComponentHandler(ComponentConfig config) 
+  public TrinidadComponentHandler(ComponentConfig config) 
   {
     super(config);
     if (_markInitialState == null)
@@ -62,7 +61,7 @@
     MetaRuleset m = super.createMetaRuleset(type);
     
     m.addRule(StringArrayPropertyTagRule.Instance);
-    m.addRule(AdfListenersTagRule.Instance);
+    m.addRule(TrinidadListenersTagRule.Instance);
            
     return m;
   }

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java (from r425846, incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfListenersTagRule.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfListenersTagRule.java&r1=425846&r2=425942&rev=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfListenersTagRule.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java Wed Jul 26 20:39:26 2006
@@ -35,9 +35,9 @@
  * @author Adam Winer
  * =-=AEW REWRITE USING BEANINFO
  */
-final class AdfListenersTagRule extends MetaRule
+final class TrinidadListenersTagRule extends MetaRule
 {
-  public static final MetaRule Instance = new AdfListenersTagRule();
+  public static final MetaRule Instance = new TrinidadListenersTagRule();
 
   private static class ListenerPropertyMetadata extends Metadata
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/AbstractImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/AbstractImageRenderer.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/image/AbstractImageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/AbstractImageRenderer.java Wed Jul 26 20:39:26 2006
@@ -19,7 +19,6 @@
 import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.awt.image.ImageObserver;
-
 import java.util.Map;
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageContext.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/image/ImageContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageContext.java Wed Jul 26 20:39:26 2006
@@ -19,7 +19,6 @@
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 import org.apache.myfaces.trinidadinternal.share.config.Configuration;
 import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
-
 import org.apache.myfaces.trinidadinternal.style.StyleContext;
 
 /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageRenderer.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/image/ImageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,9 +16,8 @@
 
 package org.apache.myfaces.trinidadinternal.image;
 
-import java.util.Map;
-
 import java.awt.Image;
+import java.util.Map;
 
 /**
  * ImageRenderer defines an interface for generated an AWT Image from

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.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/image/ImageTypeImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.java Wed Jul 26 20:39:26 2006
@@ -16,9 +16,8 @@
 
 package org.apache.myfaces.trinidadinternal.image;
 
-import java.util.Map;
 import java.util.Iterator;
-
+import java.util.Map;
 
 import org.apache.myfaces.trinidad.util.ArrayMap;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeManager.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeManager.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/image/ImageTypeManager.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeManager.java Wed Jul 26 20:39:26 2006
@@ -18,11 +18,8 @@
 
 import java.util.Map;
 
-
-
-import org.apache.myfaces.trinidadinternal.share.util.NamespaceMap;
-
 import org.apache.myfaces.trinidadinternal.image.laf.browser.BlafImageUtils;
+import org.apache.myfaces.trinidadinternal.share.util.NamespaceMap;
 
 /**
  * ImageTypeManager maintains a set of ImageType objects, each of which

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.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/image/PainterImageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java Wed Jul 26 20:39:26 2006
@@ -24,21 +24,17 @@
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.RenderingHints;
-
 import java.awt.image.BufferedImage;
 import java.awt.image.ImageObserver;
-
 import java.util.Locale;
-
 import java.util.Map;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 import org.apache.myfaces.trinidadinternal.image.painter.FontUtils;
-import org.apache.myfaces.trinidadinternal.image.painter.Painter;
 import org.apache.myfaces.trinidadinternal.image.painter.PaintContext;
-
+import org.apache.myfaces.trinidadinternal.image.painter.Painter;
 import org.apache.myfaces.trinidadinternal.style.util.FontProxy;
 import org.apache.myfaces.trinidadinternal.style.util.GraphicsUtils;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 /**
  * ImageRenderer implementation that uses Painter objects to



Mime
View raw message