You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2009/12/09 22:09:01 UTC
svn commit: r888973 - in /myfaces/trinidad/trunk: ./ trinidad-api/
trinidad-impl/
trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/
trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/
trinidad-sandbox/sandb...
Author: arobinson74
Date: Wed Dec 9 21:09:01 2009
New Revision: 888973
URL: http://svn.apache.org/viewvc?rev=888973&view=rev
Log:
Add support for createVisitContext in MRequestContext
Added:
myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/MVisitContextFactory.java
- copied unchanged from r888969, myfaces/trinidad/branches/1.2.12.2-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/MVisitContextFactory.java
Modified:
myfaces/trinidad/trunk/ (props changed)
myfaces/trinidad/trunk/trinidad-api/pom.xml
myfaces/trinidad/trunk/trinidad-impl/pom.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ (props changed)
myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/ (props changed)
Propchange: myfaces/trinidad/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 9 21:09:01 2009
@@ -1,5 +1,6 @@
/myfaces/trinidad/branches/1.2.11.3-branch:770843-770856,771372,785365
/myfaces/trinidad/branches/1.2.11.4-branch:794062,794792,798299
+/myfaces/trinidad/branches/1.2.12.2-branch:888969
/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402:745675
/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
Modified: myfaces/trinidad/trunk/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/pom.xml?rev=888973&r1=888972&r2=888973&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-api/pom.xml Wed Dec 9 21:09:01 2009
@@ -94,6 +94,12 @@
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-jdev-plugin</artifactId>
+ <configuration>
+ <projectHasTests>true</projectHasTests>
+ <testSourceRoots>
+ <file>${project.basedir}/src/test</file>
+ </testSourceRoots>
+ </configuration>
</plugin>
<plugin>
Modified: myfaces/trinidad/trunk/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/pom.xml?rev=888973&r1=888972&r2=888973&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/pom.xml Wed Dec 9 21:09:01 2009
@@ -135,6 +135,10 @@
<resourceRoots>
<resourceRoot>src/main/javascript/</resourceRoot>
</resourceRoots>
+ <projectHasTests>true</projectHasTests>
+ <testSourceRoots>
+ <file>${project.basedir}/src/test</file>
+ </testSourceRoots>
</configuration>
</plugin>
<plugin>
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java?rev=888973&r1=888972&r2=888973&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java Wed Dec 9 21:09:01 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,6 +19,7 @@
package org.apache.myfaces.trinidadinternal.renderkit;
import java.awt.Color;
+
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -27,33 +28,30 @@
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
+
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.faces.event.PhaseId;
import org.apache.myfaces.trinidad.change.ChangeManager;
-import org.apache.myfaces.trinidad.config.RegionManager;
-
import org.apache.myfaces.trinidad.component.visit.VisitContext;
import org.apache.myfaces.trinidad.component.visit.VisitHint;
-
-
+import org.apache.myfaces.trinidad.config.RegionManager;
import org.apache.myfaces.trinidad.context.AccessibilityProfile;
-import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.context.Agent;
-import org.apache.myfaces.trinidad.context.PageResolver;
-import org.apache.myfaces.trinidad.context.PageFlowScopeProvider;
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.webapp.UploadedFileProcessor;
-
+import org.apache.myfaces.trinidadinternal.context.MVisitContextFactory;
import org.apache.myfaces.trinidadinternal.context.PageFlowScopeProviderImpl;
import org.apache.myfaces.trinidadinternal.context.PageResolverDefaultImpl;
+
public class MRequestContext extends RequestContext
{
-
public MRequestContext()
{
attach();
@@ -99,7 +97,7 @@
@Override
public void returnFromDialog(
- Object returnValue,
+ Object returnValue,
Map<Object, Object> returnParam)
{
throw new UnsupportedOperationException("Should not be called during rendering");
@@ -107,10 +105,10 @@
@Override
public void launchDialog(
- UIViewRoot dialogRoot,
- Map<String, Object> dialogParameters,
- UIComponent source,
- boolean useWindow,
+ UIViewRoot dialogRoot,
+ Map<String, Object> dialogParameters,
+ UIComponent source,
+ boolean useWindow,
Map<String, Object> windowProperties)
{
throw new UnsupportedOperationException("Should not be called during rendering");
@@ -121,7 +119,7 @@
{
return false;
}
-
+
@Override
public boolean isPartialRequest(FacesContext context)
{
@@ -304,14 +302,14 @@
{
// throw new UnsupportedOperationException("Not implemented yet");
}
-
+
/**
* @see org.apache.myfaces.trinidad.context.RequestContext#addPartialTargets(javax.faces.component.UIComponent, java.lang.String[])
*/
@Override
public void addPartialTargets(UIComponent from, String... targets)
{
-
+
}
@Override
@@ -382,7 +380,7 @@
Set<VisitHint> hints,
PhaseId phaseId)
{
- throw new UnsupportedOperationException("Not implemented yet");
+ return MVisitContextFactory.createVisitContext(context, ids, hints, phaseId);
}
@Override
@@ -440,7 +438,7 @@
static private TimeZone _FIXED_TIME_ZONE =
TimeZone.getTimeZone("America/Los_Angeles");
-
+
static private final String _VIEW_MAP_KEY =
MRequestContext.class.getName() + ".VIEW_MAP";
}
Propchange: myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 9 21:09:01 2009
@@ -1,4 +1,5 @@
/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:785365
/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:794062,794792,798299
+/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:888969
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:745675
Propchange: myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 9 21:09:01 2009
@@ -1,4 +1,5 @@
/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:785365
/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:794062,794792,798299
+/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:888969
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:745675