cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r330335 - in /cocoon/blocks/portal/trunk: ./ java/org/apache/cocoon/portal/event/impl/ java/org/apache/cocoon/portal/layout/ java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ java/org/apache/cocoon/portal/layout/renderer/impl/
Date Wed, 02 Nov 2005 19:56:40 GMT
Author: cziegeler
Date: Wed Nov  2 11:56:17 2005
New Revision: 330335

URL: http://svn.apache.org/viewcvs?rev=330335&view=rev
Log:
Rename temporary parameters to attributes to make the naming consistent with coplet instance
datas etc.

Modified:
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/AbstractLayout.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/Layout.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java
    cocoon/blocks/portal/trunk/status.xml

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java?rev=330335&r1=330334&r2=330335&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java
Wed Nov  2 11:56:17 2005
@@ -112,7 +112,7 @@
     public void inform(LayoutChangeParameterEvent e, PortalService service) {
         final Layout l = (Layout)e.getTarget();
         if ( e.isTemporary() ) {
-            l.setTemporaryParameter(e.getParameterName(), e.getValue());
+            l.setTemporaryAttribute(e.getParameterName(), e.getValue());
         } else {
             l.setParameter(e.getParameterName(), e.getValue());
         }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/AbstractLayout.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/AbstractLayout.java?rev=330335&r1=330334&r2=330335&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/AbstractLayout.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/AbstractLayout.java Wed
Nov  2 11:56:17 2005
@@ -49,8 +49,8 @@
     /** The corresponding layout descripton. */
     transient protected LayoutDescription description;
 
-    /** The temporary parameters. */
-    transient protected Map temporaryParameters = new LinkedMap();
+    /** The temporary attributes. */
+    transient protected Map temporaryAttributes = new LinkedMap();
 
     /** Is this layout object static? */
     protected boolean isStatic = false;
@@ -138,31 +138,31 @@
     }
 
     /**
-     * @see org.apache.cocoon.portal.layout.Layout#getTemporaryParameter(java.lang.String)
+     * @see org.apache.cocoon.portal.layout.Layout#getTemporaryAttribute(java.lang.String)
      */
-    public Object getTemporaryParameter(String key) {
-        return this.temporaryParameters.get(key);
+    public Object getTemporaryAttribute(String key) {
+        return this.temporaryAttributes.get(key);
     }
 
     /**
-     * @see org.apache.cocoon.portal.layout.Layout#getTemporaryParameters()
+     * @see org.apache.cocoon.portal.layout.Layout#getTemporaryAttributes()
      */
-    public Map getTemporaryParameters() {
-        return this.temporaryParameters;
+    public Map getTemporaryAttributes() {
+        return this.temporaryAttributes;
     }
 
     /**
-     * @see org.apache.cocoon.portal.layout.Layout#setTemporaryParameter(java.lang.String,
java.lang.Object)
+     * @see org.apache.cocoon.portal.layout.Layout#setTemporaryAttribute(java.lang.String,
java.lang.Object)
      */
-    public void setTemporaryParameter(String key, Object value) {
-        this.temporaryParameters.put(key, value);
+    public void setTemporaryAttribute(String key, Object value) {
+        this.temporaryAttributes.put(key, value);
     }
 
     /**
-     * @see org.apache.cocoon.portal.layout.Layout#removeTemporaryParameter(java.lang.String)
+     * @see org.apache.cocoon.portal.layout.Layout#removeTemporaryAttribute(java.lang.String)
      */
-    public Object removeTemporaryParameter(String key) {
-        return this.temporaryParameters.remove(key);
+    public Object removeTemporaryAttribute(String key) {
+        return this.temporaryAttributes.remove(key);
     }
 
     /**

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/Layout.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/Layout.java?rev=330335&r1=330334&r2=330335&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/Layout.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/Layout.java Wed Nov  2
11:56:17 2005
@@ -19,11 +19,11 @@
 
 /**
  * 
- * Parameters and temporary parameters:
+ * Parameters and temporary attributes:
  * A parameter is a key-value pair consisting of strings for
  * both key and value. While the parameters are persisted,
- * the temporary parameters have only the life-time of a
- * session.
+ * the temporary attributes have only the life-time of a
+ * session, but can contain any object.
  *
  * @version $Id$
  */
@@ -74,32 +74,32 @@
     String removeParameter(String key);
     
     /**
-     * Get the temporary parameters map.
+     * Get the temporary attributes map.
      * This method never returns null.
      * @return A map with key value pairs.
      */
-    Map getTemporaryParameters();
+    Map getTemporaryAttributes();
 
     /**
-     * Return the temporary parameter value for the given key.
-     * @param key The name of the parameter.
-     * @return The value of the parameter or null.
+     * Return the temporary attribute value for the given key.
+     * @param key The name of the attribute.
+     * @return The value of the attribute or null.
      */
-    Object getTemporaryParameter(String key);
+    Object getTemporaryAttribute(String key);
 
     /**
-     * Set the temporary parameter to a value.
-     * @param key The name of the parameter.
+     * Set the temporary attribute to a value.
+     * @param key The name of the attribute.
      * @param value The value.
      */
-    void setTemporaryParameter(String key, Object value);
+    void setTemporaryAttribute(String key, Object value);
 
     /**
-     * Remove the parameter.
-     * @param key The name of the parameter.
-     * @return The old value for the parameter or null.
+     * Remove the attribute.
+     * @param key The name of the attribute.
+     * @return The old value for the attribute or null.
      */
-    Object removeTemporaryParameter(String key);
+    Object removeTemporaryAttribute(String key);
 
     /**
      * Get the name of the {@link org.apache.cocoon.portal.layout.renderer.Renderer} to draw
this layout.

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java?rev=330335&r1=330334&r2=330335&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java
Wed Nov  2 11:56:17 2005
@@ -58,7 +58,7 @@
             throw new SAXException("Wrong layout type, FrameLayout expected: " + layout.getClass().getName());
         }
 
-        String source = (String)layout.getTemporaryParameter(config.aspectName);
+        String source = (String)layout.getTemporaryAttribute(config.aspectName);
         if (source == null) {
             source = ((FrameLayout) layout).getSource();
         }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java?rev=330335&r1=330334&r2=330335&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java
Wed Nov  2 11:56:17 2005
@@ -107,7 +107,7 @@
                 }
 
                 this.addValues(layout.getId(), state, layout.getParameters(), "parameters/",
false);
-                this.addValues(layout.getId(), state, layout.getTemporaryParameters(), "temporaryParameters/",
false);
+                this.addValues(layout.getId(), state, layout.getTemporaryAttributes(), "temporaryAttributes/",
false);
 
                 // are we a coplet layout
                 if ( layout instanceof CopletLayout ) {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java?rev=330335&r1=330334&r2=330335&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
Wed Nov  2 11:56:17 2005
@@ -126,7 +126,7 @@
             CompositeLayout tabLayout = (CompositeLayout) layout;
 
             // selected tab
-            String data = (String)layout.getTemporaryParameter(config.aspectName);
+            String data = (String)layout.getTemporaryAttribute(config.aspectName);
             int selected = 0;
             if ( data != null ) {
                 selected = Integer.valueOf(data).intValue();

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java?rev=330335&r1=330334&r2=330335&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java
Wed Nov  2 11:56:17 2005
@@ -36,8 +36,8 @@
     public void process(Layout layout, PortalService service, ContentHandler handler)
     throws SAXException {
         if (layout instanceof LinkLayout) {
-            String layoutKey = (String)layout.getTemporaryParameter("link-layout-key");
-			String layoutId = (String)layout.getTemporaryParameter("link-layout-id");
+            String layoutKey = (String)layout.getTemporaryAttribute("link-layout-key");
+			String layoutId = (String)layout.getTemporaryAttribute("link-layout-id");
             if ( layoutKey == null && layoutId == null){
 				// get default values
 				layoutKey = ((LinkLayout)layout).getLayoutKey();

Modified: cocoon/blocks/portal/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/status.xml?rev=330335&r1=330334&r2=330335&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/status.xml (original)
+++ cocoon/blocks/portal/trunk/status.xml Wed Nov  2 11:56:17 2005
@@ -66,6 +66,9 @@
  <changes>
   <release version="@version@" date="@date@">
     <action dev="CZ" type="add">
+      Add AJAX support.
+    </action>
+    <action dev="CZ" type="add">
       Make coplet adapters accessible from component manager.
     </action>
     <action dev="CZ" type="add">



Mime
View raw message