svn commit: r1004146 - in /myfaces/extensions/cdi/trunk: core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/ jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/

[gp...@apache.org]

Author: gpetracek
Date: Mon Oct  4 08:52:28 2010
New Revision: 1004146

URL: http://svn.apache.org/viewvc?rev=1004146&view=rev
Log:
minor changes

Modified:
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/UnmodifiableMap.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/UnmodifiableMap.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/UnmodifiableMap.java?rev=1004146&r1=1004145&r2=1004146&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/UnmodifiableMap.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/UnmodifiableMap.java Mon Oct  4 08:52:28 2010
@@ -22,9 +22,11 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
+ * Helper for the JSF-Map trick in case of expressions which are read-only.
+ *
  * @author Gerhard Petracek
  */
-public class UnmodifiableMap<K, V> extends HashMap<K, V>
+public abstract class UnmodifiableMap<K, V> extends HashMap<K, V>
 {
     private static final long serialVersionUID = -7117422976009229722L;
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java?rev=1004146&r1=1004145&r2=1004146&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java Mon Oct  4 08:52:28 2010
@@ -25,6 +25,7 @@ import org.apache.myfaces.extensions.cdi
 import static org.apache.myfaces.extensions.cdi.core.api.CoreModuleBeanNames.*;
 import static org.apache.myfaces.extensions.cdi.core.impl.CoreModuleBeanNames.*;
 import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
+import org.apache.myfaces.extensions.cdi.core.impl.utils.UnmodifiableMap;
 import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
 import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowContextManagerFactory;
 import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContextManager;
@@ -38,7 +39,6 @@ import javax.enterprise.context.SessionS
 import javax.enterprise.context.Dependent;
 import javax.inject.Named;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author Gerhard Petracek
@@ -87,7 +87,7 @@ final class InstanceProducer
     @RequestScoped
     protected Map<String, Object> currentWindow(final WindowContextManager windowContextManager)
     {
-        return new HashMap<String, Object>() {
+        return new UnmodifiableMap<String, Object>() {
             private static final long serialVersionUID = 2356468240049980467L;
 
             @Override