Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Jeremy Grelle
2008-03-06 22:11:28 +00:00
parent fd7f35113f
commit f60e43c367
6 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java
View File

@@ -13,8 +13,6 @@ public abstract class BaseDojoParentComponentRenderer extends BaseSpringFacesPar
private String dojoJsResourceUri = "/dojo/dojo.js";
private String dojoCssResourceUri = "/dojo/resources/dojo.css";
private String dijitThemePath = "/dijit/themes/";
private String dijitTheme = "tundra";
@@ -26,7 +24,6 @@ public abstract class BaseDojoParentComponentRenderer extends BaseSpringFacesPar
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
super.encodeBegin(context, component);
resourceHelper.renderStyleLink(context, dojoCssResourceUri);
resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css");
Map dojoAttributes = new HashMap();

3
spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java
View File

@@ -28,8 +28,6 @@ public class DojoRenderer extends SpringFacesRenderer {
private String dojoJsResourceUri = "/dojo/dojo.js";
private String dojoCssResourceUri = "/dojo/resources/dojo.css";
private String dijitThemePath = "/dijit/themes/";
private String dijitTheme = "tundra";
@@ -42,7 +40,6 @@ public class DojoRenderer extends SpringFacesRenderer {
super.encodeBegin(context, component);
resourceHelper.renderStyleLink(context, dojoCssResourceUri);
resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css");
Map dojoAttributes = new HashMap();

5
spring-faces/src/main/java/org/springframework/faces/ui/resource/ResourceServlet.java
View File

@@ -117,10 +117,7 @@ public class ResourceServlet extends HttpServlet {
}
private URL getRequestResourceURL(String localResourcePath) throws MalformedURLException {
if (localResourcePath.contains("/resources")){
localResourcePath = localResourcePath.replaceAll("/resources", "");
}
String jarResourcePath = "META-INF" + localResourcePath;
URL resource;

6
spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactoryCreator.java
View File

@@ -32,6 +32,8 @@ import org.springframework.webflow.execution.ViewFactory;
*/
public class JsfViewFactoryCreator implements ViewFactoryCreator {
private static final String FACELETS_EXTENSION = ".xhtml";
private Lifecycle lifecycle;
public Action createFinalResponseAction(Expression viewName, ResourceLoader resourceLoader) {
@@ -56,4 +58,8 @@ public class JsfViewFactoryCreator implements ViewFactoryCreator {
return lifecycle;
}
public String createViewIdByConvention(String viewStateId) {
return viewStateId + FACELETS_EXTENSION;
}
}

4
spring-faces/src/test/java/org/springframework/faces/webflow/JsfFinalResponseActionTests.java
View File

@@ -71,8 +71,8 @@ public class JsfFinalResponseActionTests extends TestCase {
jsfMock.facesContext().setViewRoot(null);
jsfMock.facesContext().getApplication().setViewHandler(viewHandler);
lifecycle = new TestLifecycle(jsfMock.lifecycle());
factory = new JsfViewFactory(parser.parseExpression("#{'" + VIEW_ID + "'}", new ParserContextImpl().eval(
RequestContext.class).expect(String.class)), null, lifecycle);
factory = new JsfViewFactory(parser.parseExpression("#{'" + VIEW_ID + "'}", new ParserContextImpl().template()
.eval(RequestContext.class).expect(String.class)), null, lifecycle);
finalResponseAction = new JsfFinalResponseAction(factory);
RequestContextHolder.setRequestContext(context);
MockExternalContext ext = new MockExternalContext();

20
spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewFactoryTests.java
View File

@@ -82,8 +82,8 @@ public class JsfViewFactoryTests extends TestCase {
public final void testGetView_Create() {
lifecycle = new NoEventLifecycle(jsfMock.lifecycle());
factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().eval(RequestContext.class)
.expect(String.class)), null, lifecycle);
factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().template().eval(
RequestContext.class).expect(String.class)), null, lifecycle);
UIViewRoot newRoot = new UIViewRoot();
newRoot.setViewId(VIEW_ID);
@@ -106,8 +106,8 @@ public class JsfViewFactoryTests extends TestCase {
public final void testGetView_Restore_NoEvent() {
lifecycle = new NoEventLifecycle(jsfMock.lifecycle());
factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().eval(RequestContext.class)
.expect(String.class)), null, lifecycle);
factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().template().eval(
RequestContext.class).expect(String.class)), null, lifecycle);
UIViewRoot existingRoot = new UIViewRoot();
existingRoot.setViewId(VIEW_ID);
@@ -131,8 +131,8 @@ public class JsfViewFactoryTests extends TestCase {
public final void testGetView_Restore_Ajax_NoEvent() {
lifecycle = new NoEventLifecycle(jsfMock.lifecycle());
factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().eval(RequestContext.class)
.expect(String.class)), null, lifecycle);
factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().template().eval(
RequestContext.class).expect(String.class)), null, lifecycle);
UIViewRoot existingRoot = new UIViewRoot();
existingRoot.setViewId(VIEW_ID);
@@ -160,8 +160,8 @@ public class JsfViewFactoryTests extends TestCase {
public final void testGetView_Restore_EventSignaled() {
lifecycle = new EventSignalingLifecycle(jsfMock.lifecycle());
factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().eval(RequestContext.class)
.expect(String.class)), null, lifecycle);
factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().template().eval(
RequestContext.class).expect(String.class)), null, lifecycle);
UIViewRoot existingRoot = new UIViewRoot();
existingRoot.setViewId(VIEW_ID);
@@ -185,8 +185,8 @@ public class JsfViewFactoryTests extends TestCase {
public final void testGetView_ExternalViewRoot() {
lifecycle = new NoEventLifecycle(jsfMock.lifecycle());
factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().eval(RequestContext.class)
.expect(String.class)), null, lifecycle);
factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().template().eval(
RequestContext.class).expect(String.class)), null, lifecycle);
UIViewRoot newRoot = new UIViewRoot();
newRoot.setViewId(VIEW_ID);