You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/11/17 01:16:50 UTC
svn commit: r1202947 [5/5] - in /myfaces/shared/trunk_4.0.x: ./ core/
core/src/main/java/org/apache/myfaces/shared/application/
core/src/main/java/org/apache/myfaces/shared/component/
core/src/main/java/org/apache/myfaces/shared/config/ core/src/main/j...
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/BiLevelCacheMap.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/BiLevelCacheMap.java?rev=1202947&r1=1202946&r2=1202947&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/BiLevelCacheMap.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/BiLevelCacheMap.java Thu Nov 17 00:16:48 2011
@@ -67,14 +67,16 @@ public abstract class BiLevelCacheMap im
public boolean isEmpty()
{
- synchronized (_cacheL2) {
+ synchronized (_cacheL2)
+ {
return _cacheL1.isEmpty() && _cacheL2.isEmpty();
}
}
public void clear()
{
- synchronized (_cacheL2) {
+ synchronized (_cacheL2)
+ {
_cacheL1 = new HashMap(); // dafault size
_cacheL2.clear();
}
@@ -82,14 +84,16 @@ public abstract class BiLevelCacheMap im
public boolean containsKey(Object key)
{
- synchronized (_cacheL2) {
+ synchronized (_cacheL2)
+ {
return _cacheL1.containsKey(key) || _cacheL2.containsKey(key);
}
}
public boolean containsValue(Object value)
{
- synchronized (_cacheL2) {
+ synchronized (_cacheL2)
+ {
return _cacheL1.containsValue(value) || _cacheL2.containsValue(value);
}
}
@@ -117,14 +121,16 @@ public abstract class BiLevelCacheMap im
// Has another thread merged caches while we were waiting on the mutex? Then check L1 again
if (cacheL1 != _cacheL1)
{
- if ((retval = _cacheL1.get(key)) != null)
+ retval = _cacheL1.get(key);
+ if (retval != null)
{
// do not update miss count (it is not a miss anymore)
return retval;
}
}
- if ((retval = _cacheL2.get(key)) == null)
+ retval = _cacheL2.get(key);
+ if (retval == null)
{
retval = newInstance(key);
if (retval != null)
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ClassLoaderExtension.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ClassLoaderExtension.java?rev=1202947&r1=1202946&r2=1202947&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ClassLoaderExtension.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ClassLoaderExtension.java Thu Nov 17 00:16:48 2011
@@ -23,14 +23,16 @@ package org.apache.myfaces.shared.util;
*
* @author Werner Punz
*/
-public class ClassLoaderExtension {
+public class ClassLoaderExtension
+{
/**
* standard forName for the loader
*
* @param name
* @return
*/
- public Class forName(String name) {
+ public Class forName(String name)
+ {
return null;
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ExceptionUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ExceptionUtils.java?rev=1202947&r1=1202946&r2=1202947&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ExceptionUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ExceptionUtils.java Thu Nov 17 00:16:48 2011
@@ -36,8 +36,9 @@ public final class ExceptionUtils
/**
* <p>
* returns a list of all throwables (including the one you passed in) wrapped by the given throwable.
- * In contrast to a simple call to <code>getClause()</code> on each throwable it will also check if the throwable class
- * contain a method <code>getRootCause()</code> (e.g. ServletException or JspException) and call it instead.
+ * In contrast to a simple call to <code>getClause()</code> on each throwable it will also check if
+ * the throwable class contain a method <code>getRootCause()</code> (e.g. ServletException or JspException)
+ * and call it instead.
* </p>
* <p>
* The first list element will your passed in exception, the last list element is the cause.
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ExternalContextUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ExternalContextUtils.java?rev=1202947&r1=1202946&r2=1202947&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ExternalContextUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ExternalContextUtils.java Thu Nov 17 00:16:48 2011
@@ -590,14 +590,16 @@ public final class ExternalContextUtils
//Find bridge to tell if portal is supported
if(context != null)
{
+ // Portlet 1.0 API found. In this case we have to consider that exists alternate
+ // bridge implementations like in WebSphere and others.
+ portlet10Supported = true;
+
try
{
Class<?> bridge = ClassLoaderUtils.loadClass("javax.portlet.faces.Bridge");
if(bridge != null)
{
- portlet10Supported = true;
-
//Standard bridge defines a spec name which can be used to
//determine Portlet 2.0 Support.
String specName = bridge.getPackage().getSpecificationTitle();
@@ -616,7 +618,13 @@ public final class ExternalContextUtils
}
catch (ClassNotFoundException e)
{
- _LOG.fine("Portlet API is present but bridge is not. Portlet configurations are disabled.");
+ _LOG.fine("Portlet API is present but Standard Apache Portlet Bridge is not. " +
+ " This could happen if you are using an alternate Portlet Bridge solution.");
+
+ if (resourceRequest != null)
+ {
+ portlet20Supported = true;
+ }
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java?rev=1202947&r1=1202946&r2=1202947&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java Thu Nov 17 00:16:48 2011
@@ -76,7 +76,8 @@ public class HashMapUtils
/**
* spit out each name/value pair
*/
- public static String mapToString(Map map){
+ public static String mapToString(Map map)
+ {
Set entries = map.entrySet();
Iterator iter = entries.iterator();
StringBuffer buff = new StringBuffer();
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java?rev=1202947&r1=1202946&r2=1202947&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java Thu Nov 17 00:16:48 2011
@@ -29,11 +29,11 @@ import java.util.NoSuchElementException;
*/
public final class NullEnumeration implements Enumeration
{
- private static final NullEnumeration s_nullEnumeration = new NullEnumeration();
+ private static final NullEnumeration NULL_ENUMERATION = new NullEnumeration();
public static final NullEnumeration instance()
{
- return s_nullEnumeration;
+ return NULL_ENUMERATION;
}
public boolean hasMoreElements()
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java?rev=1202947&r1=1202946&r2=1202947&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java Thu Nov 17 00:16:48 2011
@@ -69,7 +69,8 @@ public class SelectItemsIterator impleme
public SelectItemsIterator(UIComponent selectItemsParent, FacesContext facesContext)
{
- _children = selectItemsParent.getChildCount() > 0 ? selectItemsParent.getChildren().iterator() : _EMPTY_UICOMPONENT_ITERATOR;
+ _children = selectItemsParent.getChildCount() > 0 ?
+ selectItemsParent.getChildren().iterator() : _EMPTY_UICOMPONENT_ITERATOR;
_facesContext = facesContext;
}
@@ -136,7 +137,8 @@ public class SelectItemsIterator impleme
ValueExpression expression = uiSelectItem.getValueExpression("value");
throw new IllegalArgumentException("ValueExpression '"
+ (expression == null ? null : expression.getExpressionString()) + "' of UISelectItem : "
- + RendererUtils.getPathToComponent(child) + " does not reference an Object of type SelectItem");
+ + RendererUtils.getPathToComponent(child) +
+ " does not reference an Object of type SelectItem");
}
_nextItem = (SelectItem) item;
return true;
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java?rev=1202947&r1=1202946&r2=1202947&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java Thu Nov 17 00:16:48 2011
@@ -104,7 +104,7 @@ public final class StateUtils {
/**
* Indicate if the view state is encrypted or not. By default, encryption is enabled.
*/
- @JSFWebConfigParam(name="org.apache.myfaces.USE_ENCRYPTION",since="1.1",defaultValue="true",expectedValues="true,false")
+ @JSFWebConfigParam(name="org.apache.myfaces.USE_ENCRYPTION",since="1.1",defaultValue="true",expectedValues="true,false",group="state")
public static final String USE_ENCRYPTION = INIT_PREFIX + "USE_ENCRYPTION";
/**
@@ -113,32 +113,32 @@ public final class StateUtils {
* for instructions on how to configure an application for
* different encryption strengths.
*/
- @JSFWebConfigParam(name="org.apache.myfaces.SECRET",since="1.1")
+ @JSFWebConfigParam(name="org.apache.myfaces.SECRET",since="1.1",group="state")
public static final String INIT_SECRET = INIT_PREFIX + "SECRET";
/**
* Indicate the encryption algorithm used for encrypt the view state.
*/
- @JSFWebConfigParam(name="org.apache.myfaces.ALGORITHM",since="1.1",defaultValue="DES")
+ @JSFWebConfigParam(name="org.apache.myfaces.ALGORITHM",since="1.1",defaultValue="DES",group="state",tags="performance")
public static final String INIT_ALGORITHM = INIT_PREFIX + "ALGORITHM";
/**
* If is set to "false", the secret key used for encryption algorithm is not cached. This is used
* when the returned SecretKey for encryption algorithm is not thread safe.
*/
- @JSFWebConfigParam(name="org.apache.myfaces.SECRET.CACHE",since="1.1")
+ @JSFWebConfigParam(name="org.apache.myfaces.SECRET.CACHE",since="1.1",group="state")
public static final String INIT_SECRET_KEY_CACHE = INIT_SECRET + ".CACHE";
/**
* Defines the initialization vector (Base64 encoded) used for the encryption algorithm
*/
- @JSFWebConfigParam(name="org.apache.myfaces.ALGORITHM.IV",since="1.1")
+ @JSFWebConfigParam(name="org.apache.myfaces.ALGORITHM.IV",since="1.1",group="state")
public static final String INIT_ALGORITHM_IV = INIT_ALGORITHM + ".IV";
/**
* Defines the default mode and padding used for the encryption algorithm
*/
- @JSFWebConfigParam(name="org.apache.myfaces.ALGORITHM.PARAMETERS",since="1.1",defaultValue="ECB/PKCS5Padding")
+ @JSFWebConfigParam(name="org.apache.myfaces.ALGORITHM.PARAMETERS",since="1.1",defaultValue="ECB/PKCS5Padding",group="state")
public static final String INIT_ALGORITHM_PARAM = INIT_ALGORITHM + ".PARAMETERS";
/**
@@ -146,13 +146,13 @@ public final class StateUtils {
* by state manager into a byte array. The expected class must implement
* org.apache.myfaces.shared.util.serial.SerialFactory interface.
*/
- @JSFWebConfigParam(name="org.apache.myfaces.SERIAL_FACTORY", since="1.1")
+ @JSFWebConfigParam(name="org.apache.myfaces.SERIAL_FACTORY", since="1.1",group="state",tags="performance")
public static final String SERIAL_FACTORY = INIT_PREFIX + "SERIAL_FACTORY";
/**
* Indicate if the view state should be compressed before encrypted(optional) and encoded
*/
- @JSFWebConfigParam(name="org.apache.myfaces.COMPRESS_STATE_IN_CLIENT",since="1.1",defaultValue="false",expectedValues="true,false")
+ @JSFWebConfigParam(name="org.apache.myfaces.COMPRESS_STATE_IN_CLIENT",since="1.1",defaultValue="false",expectedValues="true,false",group="state",tags="performance")
public static final String COMPRESS_STATE_IN_CLIENT = INIT_PREFIX + "COMPRESS_STATE_IN_CLIENT";
public static final String DEFAULT_MAC_ALGORITHM = "HmacSHA1";
@@ -161,21 +161,21 @@ public final class StateUtils {
* Indicate the algorithm used to calculate the Message Authentication Code that is
* added to the view state.
*/
- @JSFWebConfigParam(name="org.apache.myfaces.MAC_ALGORITHM",defaultValue="HmacSHA1")
+ @JSFWebConfigParam(name="org.apache.myfaces.MAC_ALGORITHM",defaultValue="HmacSHA1",group="state",tags="performance")
public static final String INIT_MAC_ALGORITHM = "org.apache.myfaces.MAC_ALGORITHM";
/**
* Define the initialization code that are used to initialize the secret key used
* on the Message Authentication Code algorithm
*/
- @JSFWebConfigParam(name="org.apache.myfaces.MAC_SECRET")
+ @JSFWebConfigParam(name="org.apache.myfaces.MAC_SECRET",group="state")
public static final String INIT_MAC_SECRET = "org.apache.myfaces.MAC_SECRET";
/**
* If is set to "false", the secret key used for MAC algorithm is not cached. This is used
* when the returned SecretKey for mac algorithm is not thread safe.
*/
- @JSFWebConfigParam(name="org.apache.myfaces.MAC_SECRET.CACHE")
+ @JSFWebConfigParam(name="org.apache.myfaces.MAC_SECRET.CACHE",group="state")
public static final String INIT_MAC_SECRET_KEY_CACHE = "org.apache.myfaces.MAC_SECRET.CACHE";
/** Utility class, do not instatiate */
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StringUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StringUtils.java?rev=1202947&r1=1202946&r2=1202947&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StringUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StringUtils.java Thu Nov 17 00:16:48 2011
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.shared.util;
-import org.apache.myfaces.shared.util.ArrayUtils;
-
import java.util.ArrayList;
@@ -267,31 +265,33 @@ public final class StringUtils
return "";
}
- int end_ = str.indexOf(quote, begin);
+ int endInt = str.indexOf(quote, begin);
// If no quotes, return the original string
// and save StringBuffer allocation/char copying
- if (end_ < 0)
+ if (endInt < 0)
{
return str.substring(begin, end);
}
StringBuffer sb = new StringBuffer(end - begin);
- int begin_ = begin; // need begin later
- for (; (end_ >= 0) && (end_ < end);
- end_ = str.indexOf(quote, begin_ = end_ + 2))
+ int beginInt = begin; // need begin later
+ do
{
- if (((end_ + 1) >= end) || (str.charAt(end_ + 1) != quote))
+ if (((endInt + 1) >= end) || (str.charAt(endInt + 1) != quote))
{
throw new IllegalArgumentException(
"Internal quote not doubled in string '"
+ str.substring(begin, end) + "'");
}
- sb.append(substring(str, begin_, end_)).append(quote);
+ sb.append(substring(str, beginInt, endInt)).append(quote);
+ beginInt = endInt + 2;
+ endInt = str.indexOf(quote, beginInt);
}
+ while ((endInt >= 0) && (endInt < end));
- return sb.append(substring(str, begin_, end)).toString();
+ return sb.append(substring(str, beginInt, end)).toString();
}
/**
@@ -330,15 +330,15 @@ public final class StringUtils
return str.substring(begin, end);
}
- int _end = end - 1;
- if ((str.length() < 2) || (str.charAt(_end) != quote))
+ int endInt = end - 1;
+ if ((str.length() < 2) || (str.charAt(endInt) != quote))
{
throw new IllegalArgumentException(
"Closing quote missing in string '"
+ substring(str, begin, end) + "'");
}
- return dequote(str, begin + 1, _end, quote);
+ return dequote(str, begin + 1, endInt, quote);
}
public static String replace(String str, String repl, String with)
@@ -358,9 +358,11 @@ public final class StringUtils
StringBuffer out =
new StringBuffer((lendiff <= 0) ? str.length()
: (str.length() + (10 * lendiff)));
- for (; pos >= 0; pos = str.indexOf(repl, lastindex = pos + len))
+ while(pos >= 0)
{
out.append(substring(str, lastindex, pos)).append(with);
+ lastindex = pos + len;
+ pos = str.indexOf(repl, lastindex);
}
return out.append(substring(str, lastindex, str.length())).toString();
@@ -383,9 +385,11 @@ public final class StringUtils
new StringBuffer((lendiff <= 0) ? str.length()
: (str.length() + (10 * lendiff)));
int lastindex = 0;
- for (; pos >= 0; pos = str.indexOf(repl, lastindex = pos + 1))
+ while( pos >= 0)
{
out.append(substring(str, lastindex, pos)).append(with);
+ lastindex = pos + 1;
+ pos = str.indexOf(repl, lastindex);
}
return out.append(substring(str, lastindex, len)).toString();
@@ -396,11 +400,13 @@ public final class StringUtils
{
int lastindex = 0;
int len = repl.length();
- for (int index = s.indexOf(repl); index >= 0;
- index = s.indexOf(repl, lastindex = index + len))
+ int index = s.indexOf(repl);
+ while (index >= 0)
{
// we have search string at position index
out.append(substring(s, lastindex, index)).append(with);
+ lastindex = index + len;
+ index = s.indexOf(repl, lastindex);
}
return out.append(substring(s, lastindex, len));
@@ -417,21 +423,23 @@ public final class StringUtils
*/
public static String[] splitLongString(String str, char separator)
{
- int len;
- if (str == null || (len = str.length()) == 0)
+ int len = (str == null) ? 0 : str.length();
+ if (str == null || len == 0)
{
return ArrayUtils.EMPTY_STRING_ARRAY;
}
int oldPos = 0;
ArrayList list = new ArrayList();
- for (
- int pos = str.indexOf(separator); pos >= 0;
- pos = str.indexOf(separator, (oldPos = (pos + 1))))
+ int pos = str.indexOf(separator);
+ while(pos >= 0)
{
list.add(substring(str, oldPos, pos));
+ oldPos = (pos + 1);
+ pos = str.indexOf(separator, oldPos);
}
+
list.add(substring(str, oldPos, len));
return (String[]) list.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
@@ -453,8 +461,8 @@ public final class StringUtils
public static String[] splitLongString(
String str, char separator, char quote)
{
- int len;
- if (str == null || (len = str.length()) == 0)
+ int len = (str == null) ? 0 : str.length();
+ if (str == null || len == 0)
{
return ArrayUtils.EMPTY_STRING_ARRAY;
}
@@ -518,8 +526,8 @@ public final class StringUtils
*/
public static String[] splitShortString(String str, char separator)
{
- int len;
- if (str == null || (len = str.length()) == 0)
+ int len = (str == null) ? 0 : str.length();
+ if (str == null || len == 0)
{
return org.apache.myfaces.shared.util.ArrayUtils.EMPTY_STRING_ARRAY;
}
@@ -540,11 +548,14 @@ public final class StringUtils
int oldPos = 0;
// Step 3: retrieve substrings
- for (
- int pos = str.indexOf(separator), i = 0; pos >= 0;
- pos = str.indexOf(separator, (oldPos = (pos + 1))))
+ int pos = str.indexOf(separator);
+ int i = 0;
+
+ while (pos >= 0)
{
list[i++] = substring(str, oldPos, pos);
+ oldPos = (pos + 1);
+ pos = str.indexOf(separator, oldPos);
}
list[lastTokenIndex] = substring(str, oldPos, len);
@@ -569,8 +580,8 @@ public final class StringUtils
public static String[] splitShortString(
String str, char separator, char quote)
{
- int len;
- if (str == null || (len = str.length()) == 0)
+ int len = (str == null) ? 0 : str.length();
+ if (str == null || len == 0)
{
return ArrayUtils.EMPTY_STRING_ARRAY;
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/el/GenericMap.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/el/GenericMap.java?rev=1202947&r1=1202946&r2=1202947&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/el/GenericMap.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/el/GenericMap.java Thu Nov 17 00:16:48 2011
@@ -18,67 +18,80 @@
*/
package org.apache.myfaces.shared.util.el;
+import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import java.util.Collection;
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
*
*/
-public abstract class GenericMap implements Map {
+public abstract class GenericMap implements Map
+{
/**
* This method should return the result of the test.
*/
protected abstract Object getValue(Object key);
- public int size() {
+ public int size()
+ {
return 1;
}
- public boolean isEmpty() {
+ public boolean isEmpty()
+ {
return false;
}
- public boolean containsKey(Object key) {
+ public boolean containsKey(Object key)
+ {
return true;
}
- public boolean containsValue(Object value) {
+ public boolean containsValue(Object value)
+ {
return value instanceof Boolean;
}
- public Object get(Object key) {
+ public Object get(Object key)
+ {
return getValue(key);
}
- public Object put(Object key, Object value) {
+ public Object put(Object key, Object value)
+ {
return null;
}
- public Object remove(Object key) {
+ public Object remove(Object key)
+ {
return null;
}
- public void putAll(Map m) {
+ public void putAll(Map m)
+ {
// NoOp
}
- public void clear() {
+ public void clear()
+ {
// NoOp
}
- public Set keySet() {
+ public Set keySet()
+ {
return null;
}
- public Collection values() {
+ public Collection values()
+ {
return null;
}
- public Set entrySet() {
+ public Set entrySet()
+ {
return null;
}
}
Modified: myfaces/shared/trunk_4.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/pom.xml?rev=1202947&r1=1202946&r2=1202947&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/pom.xml (original)
+++ myfaces/shared/trunk_4.0.x/pom.xml Thu Nov 17 00:16:48 2011
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-annotations</artifactId>
- <version>1.0.6</version>
+ <version>1.0.9</version>
<scope>provided</scope>
</dependency>