You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2011/06/14 11:32:41 UTC
svn commit: r1135434 -
/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
Author: lofwyr
Date: Tue Jun 14 09:32:41 2011
New Revision: 1135434
URL: http://svn.apache.org/viewvc?rev=1135434&view=rev
Log:
prevent exception
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java?rev=1135434&r1=1135433&r2=1135434&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java Tue Jun 14 09:32:41 2011
@@ -46,18 +46,18 @@ public class MultiplePageDeclarationLang
PageDeclarationLanguageBean bean = (PageDeclarationLanguageBean)
VariableResolverUtils.resolveVariable(facesContext, "pageDeclarationLanguage");
- for (PageDeclarationLanguage renderTechnologie : PageDeclarationLanguage.values()) {
- if (outcome.endsWith(renderTechnologie.getExtension())) {
- outcome = outcome.substring(0, outcome.lastIndexOf(renderTechnologie.getExtension()));
+ for (PageDeclarationLanguage renderTechnology : PageDeclarationLanguage.values()) {
+ if (outcome.endsWith(renderTechnology.getExtension())) {
+ outcome = outcome.substring(0, outcome.lastIndexOf(renderTechnology.getExtension()));
}
}
if (pageExists(facesContext, outcome, bean.getLanguage().getExtension())) {
outcome = outcome + bean.getLanguage().getExtension();
} else {
- for (PageDeclarationLanguage renderTechnologie : PageDeclarationLanguage.values()) {
- if (pageExists(facesContext, outcome, renderTechnologie.getExtension())) {
- bean.setLanguage(renderTechnologie);
+ for (PageDeclarationLanguage renderTechnology : PageDeclarationLanguage.values()) {
+ if (pageExists(facesContext, outcome, renderTechnology.getExtension())) {
+ bean.setLanguage(renderTechnology);
outcome = outcome + bean.getLanguage().getExtension();
break;
}
@@ -78,6 +78,9 @@ public class MultiplePageDeclarationLang
}
private boolean pageExists(FacesContext facesContext, String outcome, String extension) {
+ if (StringUtils.isEmpty(outcome)) {
+ return false;
+ }
String path = ResourceManagerUtils.getImageWithPath(facesContext, outcome.substring(1) + extension, true);
return path != null;
}