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 2013/03/26 09:43:24 UTC
svn commit: r1461016 - in /myfaces/tobago/trunk/tobago-core/src:
main/java/org/apache/myfaces/tobago/ajax/
main/java/org/apache/myfaces/tobago/internal/util/
test/java/org/apache/myfaces/tobago/internal/mock/faces/
Author: lofwyr
Date: Tue Mar 26 08:43:24 2013
New Revision: 1461016
URL: http://svn.apache.org/r1461016
Log:
using the type-save alternative
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java?rev=1461016&r1=1461015&r2=1461016&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java Tue Mar 26 08:43:24 2013
@@ -84,12 +84,10 @@ public class AjaxUtils {
}
return ajaxComponents;
}
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
/**
- *
- * @param context
* @return true if a UIMessage component has added to renderedPartially
*/
public static boolean addUIMessagesToRenderedPartially(FacesContext context) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java?rev=1461016&r1=1461015&r2=1461016&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java Tue Mar 26 08:43:24 2013
@@ -91,7 +91,7 @@ public final class FacesContextUtils {
public static List<String> getScriptFiles(FacesContext context) {
List<String> list = (List<String>) context.getAttributes().get(TOBAGO_SCRIPT_FILES);
if (list == null) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
return list;
}
@@ -109,7 +109,7 @@ public final class FacesContextUtils {
public static Set<String> getScriptBlocks(FacesContext context) {
Set<String> set = (Set<String>) context.getAttributes().get(TOBAGO_SCRIPT_BLOCKS);
if (set == null) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
return set;
}
@@ -127,7 +127,7 @@ public final class FacesContextUtils {
public static Set<String> getStyleFiles(FacesContext context) {
Set<String> set = (Set<String>) context.getAttributes().get(TOBAGO_STYLE_FILES);
if (set == null) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
return set;
}
@@ -144,7 +144,7 @@ public final class FacesContextUtils {
public static Set<String> getStyleBlocks(FacesContext context) {
Set<String> set = (Set<String>) context.getAttributes().get(TOBAGO_STYLE_BLOCKS);
if (set == null) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
return set;
}
@@ -161,7 +161,7 @@ public final class FacesContextUtils {
public static List<String> getOnloadScripts(FacesContext context) {
List<String> list = (List<String>) context.getAttributes().get(TOBAGO_ONLOAD_SCRIPTS);
if (list == null) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
return list;
}
@@ -188,7 +188,7 @@ public final class FacesContextUtils {
public static Set<String> getOnunloadScripts(FacesContext context) {
Set<String> set = (Set<String>) context.getAttributes().get(TOBAGO_ONUNLOAD_SCRIPTS);
if (set == null) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
return set;
}
@@ -205,7 +205,7 @@ public final class FacesContextUtils {
public static Set<String> getOnexitScripts(FacesContext context) {
Set<String> set = (Set<String>) context.getAttributes().get(TOBAGO_ONEXIT_SCRIPTS);
if (set == null) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
return set;
}
@@ -222,7 +222,7 @@ public final class FacesContextUtils {
public static Set<String> getOnsubmitScripts(FacesContext context) {
Set<String> set = (Set<String>) context.getAttributes().get(TOBAGO_ONSUBMIT_SCRIPTS);
if (set == null) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
return set;
}
@@ -244,7 +244,7 @@ public final class FacesContextUtils {
public static Set<String> getMenuAcceleratorScripts(FacesContext context) {
Set<String> set = (Set<String>) context.getAttributes().get(TOBAGO_MENU_ACCELERATORS);
if (set == null) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
return set;
}
@@ -261,7 +261,7 @@ public final class FacesContextUtils {
public static Set<AbstractUIPopup> getPopups(FacesContext context) {
Set<AbstractUIPopup> set = (Set<AbstractUIPopup>) context.getAttributes().get(TOBAGO_POPUPS);
if (set == null) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
return set;
}
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java?rev=1461016&r1=1461015&r2=1461016&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java Tue Mar 26 08:43:24 2013
@@ -72,7 +72,7 @@ public abstract class AbstractTobagoTest
// Tobago specific extensions
TobagoConfigImpl tobagoConfig = new TobagoConfigImpl();
- Theme theme = new MockTheme("default", "Default Mock Theme", Collections.EMPTY_LIST);
+ Theme theme = new MockTheme("default", "Default Mock Theme", Collections.<Theme>emptyList());
Theme one = new MockTheme("one", "Mock Theme One", Arrays.asList(theme));
Map<String, Theme> availableThemes = new HashMap<String, Theme>();
availableThemes.put(theme.getName(), theme);