You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/07/31 16:09:09 UTC
svn commit: r561333 - in /cocoon/trunk/core/cocoon-expression-language: cocoon-expression-language-api/src/main/java/org/apache/cocoon/objectmodel/provider/ cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/ cocoon-expression-...

Author: gkossakowski
Date: Tue Jul 31 07:09:08 2007
New Revision: 561333

URL: http://svn.apache.org/viewvc?view=rev&rev=561333
Log:
COCOON-2095: Object Model Providers should be able to provide any kind of object, not only Map.

Modified:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/objectmodel/provider/ObjectModelProvider.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/ObjectModelImpl.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/objectmodel/provider/ObjectModelProvider.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/objectmodel/provider/ObjectModelProvider.java?view=diff&rev=561333&r1=561332&r2=561333
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/objectmodel/provider/ObjectModelProvider.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/objectmodel/provider/ObjectModelProvider.java Tue Jul 31 07:09:08 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.cocoon.objectmodel.provider;
 
-import java.util.Map;
 
 /**
  * This simple interface should be implemented by Spring beans providing initial entries for 
@@ -27,6 +26,6 @@
  */
 public interface ObjectModelProvider {
     
-    public Map getMap();
+    public Object getObject();
     
 }

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/ObjectModelImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/ObjectModelImpl.java?view=diff&rev=561333&r1=561332&r2=561333
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/ObjectModelImpl.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/ObjectModelImpl.java Tue Jul 31 07:09:08 2007
@@ -126,7 +126,7 @@
         this.initialEntries = initialEntries;
         for (Iterator keysIterator = initialEntries.keySet().iterator(); keysIterator.hasNext(); ) {
             Object key = keysIterator.next();
-            put(key, ((ObjectModelProvider)initialEntries.get(key)).getMap());
+            put(key, ((ObjectModelProvider)initialEntries.get(key)).getObject());
         }
     }
     

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java?view=diff&rev=561333&r1=561332&r2=561333
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java Tue Jul 31 07:09:08 2007
@@ -52,7 +52,7 @@
         this.processInfoProvider = processInfoProvider;
     }
 
-    public Map getMap() {
+    public Object getObject() {
         Map objectModel = processInfoProvider.getObjectModel();
         
         Map cocoonMap = new HashMap();