svn commit: r499303 - in /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet: Stylesheet.java StylesheetFilter.java StylesheetRenderer.java StylesheetTag.java

[im...@apache.org]

Author: imario
Date: Wed Jan 24 00:03:47 2007
New Revision: 499303

URL: http://svn.apache.org/viewvc?view=rev&rev=499303
Log:
preliminary import to get rid of strange formatting

Added:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetFilter.java   (with props)
Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetTag.java

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java?view=diff&rev=499303&r1=499302&r2=499303
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java Wed Jan 24 00:03:47 2007
@@ -18,142 +18,191 @@
  */
 package org.apache.myfaces.custom.stylesheet;
 
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
+
 import javax.faces.component.UIOutput;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
-
 
 /**
  * @author mwessendorf (latest modification by $Author$)
  * @version $Revision$ $Date$
-*/
-
-public class Stylesheet extends UIOutput {
-
-    public static final String COMPONENT_TYPE = "org.apache.myfaces.Stylesheet";
-    public static final String COMPONENT_FAMILY = "javax.faces.Output";
-    private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.Stylesheet";
-
-    private String _path = null;
-    private Boolean _inline = null;
-    private String _media = null;
-    private String _enabledOnUserRole = null;
-    private String _visibleOnUserRole = null;
-
-
-
-    // ------------------------------------------------------------ Constructors
-    public Stylesheet() {
-
-        setRendererType(DEFAULT_RENDERER_TYPE);
-
-    }
-
-
-    public String getFamily() {
-
-        return COMPONENT_FAMILY;
-
-    }
-
-
-    public String getPath() {
-
-        if (_path != null) return _path;
-        ValueBinding vb = getValueBinding("path");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setPath(String path) {
-        this._path = path;
-    }
-
-    /**
-     * @return true if the styles are inlined to the jsp file
-     */
-    public boolean isInline() {
-        if (this._inline != null)
-          return this._inline.booleanValue();
-            ValueBinding vb = getValueBinding("inline");
-            return ((vb != null) ? (Boolean) vb.getValue(getFacesContext())
-                    : Boolean.FALSE).booleanValue();
-      }
-
-    /**
-     * @param inline if true, the css-file is inlined to the jsp file. Default is false.
-     */
-    public void setInline(boolean inline) {
-        this._inline = Boolean.valueOf(inline);
-    }
-
-
-    public String getMedia() {
-        if (this._media != null)
-            return this._media;
-        ValueBinding vb = getValueBinding("media");
-            return ((vb != null) ? (String) vb.getValue(getFacesContext()) : null);
-        }
-
-    public void setMedia(String media) {
-        this._media = media;
-    }
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public String getEnabledOnUserRole()
-    {
-        if (_enabledOnUserRole != null) return _enabledOnUserRole;
-        ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public String getVisibleOnUserRole()
-    {
-        if (_visibleOnUserRole != null) return _visibleOnUserRole;
-        ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public boolean isRendered()
-    {
-        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
-        return super.isRendered();
-    }
-
-
-    public void restoreState(FacesContext context, Object state) {
-
-        Object values[] = (Object[]) state;
-        super.restoreState(context, values[0]);
-        _path = (String) values[1];
-        _inline = (Boolean) values[2];
-        _media = (String) values[3];
-        _enabledOnUserRole = (String) values[4];
-        _visibleOnUserRole = (String) values[5];
-
-    }
+ */
 
-    public Object saveState(FacesContext context) {
+public class Stylesheet extends UIOutput
+{
 
-        Object values[] = new Object[6];
-        values[0] = super.saveState(context);
-        values[1] = _path;
-        values[2] = _inline;
-        values[3] = _media;
-        values[4] = _enabledOnUserRole;
-        values[5] = _visibleOnUserRole;
-        return values;
+	public static final String COMPONENT_TYPE = "org.apache.myfaces.Stylesheet";
+	public static final String COMPONENT_FAMILY = "javax.faces.Output";
+	private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.Stylesheet";
+
+	private String _path = null;
+	private Boolean _filtered = null;
+	private Boolean _inline = null;
+	private String _media = null;
+	private String _enabledOnUserRole = null;
+	private String _visibleOnUserRole = null;
+
+
+	// ------------------------------------------------------------ Constructors
+	public Stylesheet()
+	{
+
+		setRendererType(DEFAULT_RENDERER_TYPE);
+
+	}
+
+
+	public String getFamily()
+	{
+
+		return COMPONENT_FAMILY;
+
+	}
+
+
+	public String getPath()
+	{
+
+		if (_path != null)
+		{
+			return _path;
+		}
+		ValueBinding vb = getValueBinding("path");
+		return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+	}
+
+	public void setPath(String path)
+	{
+		this._path = path;
+	}
+
+	/**
+	 * @return true if the styles are inlined to the jsp file
+	 */
+	public boolean isInline()
+	{
+		if (this._inline != null)
+		{
+			return this._inline.booleanValue();
+		}
+		ValueBinding vb = getValueBinding("inline");
+		return ((vb != null) ? (Boolean) vb.getValue(getFacesContext())
+			: Boolean.FALSE).booleanValue();
+	}
+
+	/**
+	 * @param inline if true, the css-file is inlined to the jsp file. Default is false.
+	 */
+	public void setInline(boolean inline)
+	{
+		this._inline = Boolean.valueOf(inline);
+	}
+
+	/**
+	 * @return true if the stylesheet should be filtered before sending to the browser
+	 */
+	public boolean isFiltered()
+	{
+		if (this._filtered != null)
+		{
+			return this._filtered.booleanValue();
+		}
+		ValueBinding vb = getValueBinding("filtered");
+		return ((vb != null) ? (Boolean) vb.getValue(getFacesContext())
+			: Boolean.FALSE).booleanValue();
+	}
+
+	/**
+	 * @param filtered filter stylesheet if true
+	 */
+	public void setFiltered(boolean filtered)
+	{
+		this._filtered = Boolean.valueOf(filtered);
+	}
+
+	public String getMedia()
+	{
+		if (this._media != null)
+		{
+			return this._media;
+		}
+		ValueBinding vb = getValueBinding("media");
+		return ((vb != null) ? (String) vb.getValue(getFacesContext()) : null);
+	}
+
+	public void setMedia(String media)
+	{
+		this._media = media;
+	}
+
+	public void setEnabledOnUserRole(String enabledOnUserRole)
+	{
+		_enabledOnUserRole = enabledOnUserRole;
+	}
+
+	public String getEnabledOnUserRole()
+	{
+		if (_enabledOnUserRole != null)
+		{
+			return _enabledOnUserRole;
+		}
+		ValueBinding vb = getValueBinding("enabledOnUserRole");
+		return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+	}
+
+	public void setVisibleOnUserRole(String visibleOnUserRole)
+	{
+		_visibleOnUserRole = visibleOnUserRole;
+	}
+
+	public String getVisibleOnUserRole()
+	{
+		if (_visibleOnUserRole != null)
+		{
+			return _visibleOnUserRole;
+		}
+		ValueBinding vb = getValueBinding("visibleOnUserRole");
+		return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+	}
+
+	public boolean isRendered()
+	{
+		if (!UserRoleUtils.isVisibleOnUserRole(this))
+		{
+			return false;
+		}
+		return super.isRendered();
+	}
+
+
+	public void restoreState(FacesContext context, Object state)
+	{
+
+		Object values[] = (Object[]) state;
+		super.restoreState(context, values[0]);
+		_path = (String) values[1];
+		_inline = (Boolean) values[2];
+		_media = (String) values[3];
+		_enabledOnUserRole = (String) values[4];
+		_visibleOnUserRole = (String) values[5];
+		_filtered = (Boolean) values[6];
+	}
+
+	public Object saveState(FacesContext context)
+	{
+
+		Object values[] = new Object[7];
+		values[0] = super.saveState(context);
+		values[1] = _path;
+		values[2] = _inline;
+		values[3] = _media;
+		values[4] = _enabledOnUserRole;
+		values[5] = _visibleOnUserRole;
+		values[6] = _filtered;
+		return values;
 
-    }
+	}
 }

Added: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetFilter.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetFilter.java?view=auto&rev=499303
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetFilter.java (added)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetFilter.java Wed Jan 24 00:03:47 2007
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.custom.stylesheet;
+
+/**
+ * filters a stylesheet
+ * <p/>
+ * This will replace any el expressing of the original stylesheet with its evaluated string form
+ *
+ * @author imario
+ */
+public class StylesheetFilter
+{
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetFilter.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java?view=diff&rev=499303&r1=499302&r2=499303
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java Wed Jan 24 00:03:47 2007
@@ -18,66 +18,65 @@
  */
 package org.apache.myfaces.custom.stylesheet;
 
-import java.io.IOException;
+import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
+import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRenderer;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
-
-import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
-import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRenderer;
+import java.io.IOException;
 
 /**
  * @author mwessendorf (latest modification by $Author$)
  * @version $Revision$ $Date$
-*/
-
-public class StylesheetRenderer extends HtmlRenderer {
-
-     public void encodeEnd(FacesContext context, UIComponent component)
-        throws IOException {
-
-        if ((context == null) || (component == null)) {
-            throw new NullPointerException();
-        }
-        Stylesheet stylesheet = (Stylesheet) component;
-        ResponseWriter writer = context.getResponseWriter();
-
-        if(stylesheet.isInline())
-        {
-          //include as inline css
-          writer.startElement("style", component);
-          writer.writeAttribute("type", "text/css", null);
-          if(stylesheet.getMedia() != null)
-          {
-            writer.writeAttribute("media", stylesheet.getMedia(), null);
-          }
-          //writer.writeText("<!--\n", null);
-          Object text = RendererUtils.loadResourceFile(context, stylesheet.getPath());
-          if (text != null)
-          {
-              writer.writeText(text, null);
-          }
-          //writer.writeText("\n-->", null);
-          writer.endElement("style");
-        }
-        else
-        {
-          //refere as link-element
-          writer.startElement("link", component);
-          writer.writeAttribute("rel", "stylesheet", null);
-          writer.writeAttribute("type", "text/css", null);
-          if(stylesheet.getMedia() != null)
-          {
-            writer.writeAttribute("media", stylesheet.getMedia(), null);
-          }
-          writer.writeURIAttribute
-              ("href",
-               context.getApplication().getViewHandler().getResourceURL(context, stylesheet.getPath()),
-               "path");
-          writer.endElement("link");
-        }
-
-
-    }
+ */
+public class StylesheetRenderer extends HtmlRenderer
+{
+	public void encodeEnd(FacesContext context, UIComponent component)
+		throws IOException
+	{
+
+		if ((context == null) || (component == null))
+		{
+			throw new NullPointerException();
+		}
+		Stylesheet stylesheet = (Stylesheet) component;
+		ResponseWriter writer = context.getResponseWriter();
+
+		if (stylesheet.isInline())
+		{
+			//include as inline css
+			writer.startElement("style", component);
+			writer.writeAttribute("type", "text/css", null);
+			if (stylesheet.getMedia() != null)
+			{
+				writer.writeAttribute("media", stylesheet.getMedia(), null);
+			}
+			//writer.writeText("<!--\n", null);
+			Object text = RendererUtils.loadResourceFile(context, stylesheet.getPath());
+			if (text != null)
+			{
+				writer.writeText(text, null);
+			}
+			//writer.writeText("\n-->", null);
+			writer.endElement("style");
+		}
+		else
+		{
+			//refere as link-element
+			writer.startElement("link", component);
+			writer.writeAttribute("rel", "stylesheet", null);
+			writer.writeAttribute("type", "text/css", null);
+			if (stylesheet.getMedia() != null)
+			{
+				writer.writeAttribute("media", stylesheet.getMedia(), null);
+			}
+
+			writer.writeURIAttribute
+				("href",
+					context.getApplication().getViewHandler().getResourceURL(context, stylesheet.getPath()),
+					"path");
+			writer.endElement("link");
+		}
+	}
 }

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetTag.java?view=diff&rev=499303&r1=499302&r2=499303
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetTag.java Wed Jan 24 00:03:47 2007
@@ -18,89 +18,104 @@
  */
 package org.apache.myfaces.custom.stylesheet;
 
-import javax.faces.component.UIComponent;
-
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlOutputTextTagBase;
 
+import javax.faces.component.UIComponent;
+
 /**
  * @author mwessendorf (latest modification by $Author$)
  * @version $Revision$ $Date$
-*/
-public class StylesheetTag extends HtmlOutputTextTagBase {
-
-
-    private String _path = null;
-    private String _media = null;
-    private boolean _inline = false;
-
-    // User Role support
-    private String _enabledOnUserRole;
-    private String _visibleOnUserRole;
-
-    public String getComponentType() {
-
-        return Stylesheet.COMPONENT_TYPE;
-
-    }
-
-    public String getRendererType() {
-
-        return "org.apache.myfaces.Stylesheet";
-
-    }
-
-
-     public void release() {
-
-        super.release();
-        _path=null;
-        _media=null;
-        _enabledOnUserRole=null;
-        _visibleOnUserRole=null;
-
-
-    }
-
-     /**
-      * overrides setProperties() form UIComponentTag.
-      */
-    protected void setProperties(UIComponent component) {
-
-        super.setProperties(component);
-        setStringProperty(component, "path", _path);
-        setStringProperty(component, "media", _media);
-        setBooleanProperty(component, "inline", Boolean.toString(_inline));
-        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
-        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
-
-    }
-
-    //---------------------------------------------only the Setters
-
-    public void setPath(String path) {
-        this._path = path;
-    }
-    public void setMedia(String media) {
-        this._media = media;
-    }
-    public void setEnabledOnUserRole(String string) {
-        _enabledOnUserRole = string;
-    }
-
-    public void setVisibleOnUserRole(String string) {
-        _visibleOnUserRole = string;
-    }
-
-
-  public boolean isInline()
-  {
-    return _inline;
-  }
-
-
-  public void setInline(boolean inline)
-  {
-    this._inline = inline;
-  }
+ */
+public class StylesheetTag extends HtmlOutputTextTagBase
+{
+
+
+	private String _path = null;
+	private String _media = null;
+	private boolean _inline = false;
+	private boolean _filtered = false;
+
+	// User Role support
+	private String _enabledOnUserRole;
+	private String _visibleOnUserRole;
+
+	public String getComponentType()
+	{
+		return Stylesheet.COMPONENT_TYPE;
+	}
+
+	public String getRendererType()
+	{
+		return "org.apache.myfaces.Stylesheet";
+	}
+
+
+	public void release()
+	{
+		super.release();
+		_path = null;
+		_media = null;
+		_enabledOnUserRole = null;
+		_visibleOnUserRole = null;
+		_inline = false;
+		_filtered = false;
+	}
+
+	/**
+	 * overrides setProperties() form UIComponentTag.
+	 */
+	protected void setProperties(UIComponent component)
+	{
+		super.setProperties(component);
+		setStringProperty(component, "path", _path);
+		setStringProperty(component, "media", _media);
+		setBooleanProperty(component, "inline", Boolean.toString(_inline));
+		setBooleanProperty(component, "filtered", Boolean.toString(_filtered));
+		setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
+		setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
+
+	}
+
+	//---------------------------------------------only the Setters
+
+	public void setPath(String path)
+	{
+		this._path = path;
+	}
+
+	public void setMedia(String media)
+	{
+		this._media = media;
+	}
+
+	public void setEnabledOnUserRole(String string)
+	{
+		_enabledOnUserRole = string;
+	}
+
+	public void setVisibleOnUserRole(String string)
+	{
+		_visibleOnUserRole = string;
+	}
+
+	public boolean isInline()
+	{
+		return _inline;
+	}
+
+	public void setInline(boolean inline)
+	{
+		this._inline = inline;
+	}
+
+	public boolean isFiltered()
+	{
+		return _filtered;
+	}
+
+	public void setFiltered(boolean filtered)
+	{
+		this._filtered = filtered;
+	}
 }