You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/11/10 15:57:35 UTC
svn commit: r332303 - in
/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl:
FrameAspect.java SizingAspect.java TabContentAspect.java
Author: cziegeler
Date: Thu Nov 10 06:57:31 2005
New Revision: 332303
URL: http://svn.apache.org/viewcvs?rev=332303&view=rev
Log:
Remove unused stuff
Modified:
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/SizingAspect.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
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=332303&r1=332302&r2=332303&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 Thu Nov 10 06:57:31 2005
@@ -15,8 +15,6 @@
*/
package org.apache.cocoon.portal.layout.renderer.aspect.impl;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.layout.impl.FrameLayout;
@@ -37,12 +35,6 @@
* <li>{@link org.apache.cocoon.portal.layout.impl.FrameLayout}</li>
* </ul>
*
- * <h2>Parameters</h2>
- * <table><tbody>
- * <tr><th>aspect-name</th><td></td><td></td><td>String</td><td><code>"frame"</code></td></tr>
- * <tr><th>store</th><td></td><td>req</td><td>String</td><td><code>null</code></td></tr>
- * </tbody></table>
- *
* @version $Id$
*/
public class FrameAspect extends AbstractCIncludeAspect {
@@ -52,38 +44,15 @@
*/
public void toSAX(RendererAspectContext context, Layout layout, PortalService service, ContentHandler handler)
throws SAXException {
- PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
-
if (!(layout instanceof FrameLayout)) {
throw new SAXException("Wrong layout type, FrameLayout expected: " + layout.getClass().getName());
}
- String source = (String)layout.getTemporaryAttribute(config.aspectName);
+ String source = (String)layout.getTemporaryAttribute("frame");
if (source == null) {
source = ((FrameLayout) layout).getSource();
}
this.createCInclude(source, handler);
- }
-
- protected static class PreparedConfiguration {
- public String aspectName;
- public String store;
-
- public void takeValues(PreparedConfiguration from) {
- this.aspectName = from.aspectName;
- this.store = from.store;
- }
- }
-
- /**
- * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
- */
- public Object prepareConfiguration(Parameters configuration)
- throws ParameterException {
- PreparedConfiguration pc = new PreparedConfiguration();
- pc.aspectName = configuration.getParameter("aspect-name", "frame");
- pc.store = configuration.getParameter("store");
- return pc;
}
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java?rev=332303&r1=332302&r2=332303&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java Thu Nov 10 06:57:31 2005
@@ -129,6 +129,4 @@
this.enableFullScreen = this.portalService.getConfigurationAsBoolean(PortalService.CONFIGURATION_FULL_SCREEN_ENABLED, true);
this.enableMaximized = this.portalService.getConfigurationAsBoolean(PortalService.CONFIGURATION_MAXIMIZED_ENABLED, true);
}
-
-
}
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=332303&r1=332302&r2=332303&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 Thu Nov 10 06:57:31 2005
@@ -81,7 +81,6 @@
* </composite>
* </pre>
*
- *
* <h2>Applicable to:</h2>
* <ul>
* <li>{@link org.apache.cocoon.portal.layout.CompositeLayout}</li>
@@ -189,7 +188,7 @@
}
}
- /*
+ /**
* Generate the sub navigation for non-selected tabs
* @param context
* @param layout
@@ -259,14 +258,12 @@
}
protected class TabPreparedConfiguration extends PreparedConfiguration {
- public String store;
public boolean showAllNav = false;
public boolean includeSelected = false;
public String childTagName;
public void takeValues(TabPreparedConfiguration from) {
super.takeValues(from);
- this.store = from.store;
this.showAllNav = from.showAllNav;
this.includeSelected = from.includeSelected;
this.childTagName = from.childTagName;
@@ -280,7 +277,6 @@
throws ParameterException {
TabPreparedConfiguration pc = new TabPreparedConfiguration();
pc.takeValues((PreparedConfiguration)super.prepareConfiguration(configuration));
- pc.store = configuration.getParameter("store");
pc.childTagName = configuration.getParameter("child-tag-name", "");
if (!pc.childTagName.equals("")) {
pc.showAllNav = true;