You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/07/04 00:03:31 UTC
svn commit: r673836 [2/8] - in /myfaces/tomahawk/trunk:
core/src/main/java/org/apache/myfaces/custom/buffer/
core/src/main/java/org/apache/myfaces/custom/calendar/
core/src/main/java/org/apache/myfaces/custom/captcha/
core/src/main/java/org/apache/myfa...
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/captcha/util/ColorGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/captcha/util/ColorGenerator.java?rev=673836&r1=673835&r2=673836&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/captcha/util/ColorGenerator.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/captcha/util/ColorGenerator.java Thu Jul 3 15:03:29 2008
@@ -1,77 +1,77 @@
-/*
- * 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.captcha.util;
-
-import java.awt.Color;
-
-/**
- * This class is responsible for generating CAPTCHA random color...
- */
-public class ColorGenerator {
-
- private final static int COLOR_DEGREES = 255;
- private final static int COLOR_GENERATOR_DELTA = 127;
-
- /**
- * This method is used for generating a random color.
- * @param startFrom -> the color that we should be away from.
- * @return the new color.
- */
- public static Color generateRandomColor(Color startFrom) {
-
- /* if the startingFrom color is null, then generate a new random color. */
- if (startFrom == null)
- {
- return new Color((int) (Math.random() * COLOR_DEGREES), (int) (Math
- .random() * COLOR_DEGREES),
- (int) (Math.random() * COLOR_DEGREES));
- }
-
- /* try to avoid the startFrom color. */
- int startingRed = (startFrom.getRed() >= 128) ? 0 : 128;
- int startingGreen = (startFrom.getGreen() >= 128) ? 0 : 128;
- int startingBlue = (startFrom.getBlue() >= 128) ? 0 : 128;
-
- // generate the new random colors.
- int newRandomRed = (int) (Math.random() * (startingRed + COLOR_GENERATOR_DELTA));
- int newRandomGreen = (int) (Math.random() * (startingGreen + COLOR_GENERATOR_DELTA));
- int newRandomBlue = (int) (Math.random() * (startingBlue + COLOR_GENERATOR_DELTA));
-
- /*
- * If the newly generated color is less than the starting color
- * then add the starting color to it.
- */
- if (newRandomRed < startingRed)
- {
- newRandomRed += startingRed;
- }
-
- if (newRandomGreen < startingGreen)
- {
- newRandomGreen += startingGreen;
- }
-
- if (newRandomBlue < startingBlue)
- {
- newRandomBlue += startingBlue;
- }
-
- return new Color(newRandomRed, newRandomGreen, newRandomBlue);
- }
-}
+/*
+ * 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.captcha.util;
+
+import java.awt.Color;
+
+/**
+ * This class is responsible for generating CAPTCHA random color...
+ */
+public class ColorGenerator {
+
+ private final static int COLOR_DEGREES = 255;
+ private final static int COLOR_GENERATOR_DELTA = 127;
+
+ /**
+ * This method is used for generating a random color.
+ * @param startFrom -> the color that we should be away from.
+ * @return the new color.
+ */
+ public static Color generateRandomColor(Color startFrom) {
+
+ /* if the startingFrom color is null, then generate a new random color. */
+ if (startFrom == null)
+ {
+ return new Color((int) (Math.random() * COLOR_DEGREES), (int) (Math
+ .random() * COLOR_DEGREES),
+ (int) (Math.random() * COLOR_DEGREES));
+ }
+
+ /* try to avoid the startFrom color. */
+ int startingRed = (startFrom.getRed() >= 128) ? 0 : 128;
+ int startingGreen = (startFrom.getGreen() >= 128) ? 0 : 128;
+ int startingBlue = (startFrom.getBlue() >= 128) ? 0 : 128;
+
+ // generate the new random colors.
+ int newRandomRed = (int) (Math.random() * (startingRed + COLOR_GENERATOR_DELTA));
+ int newRandomGreen = (int) (Math.random() * (startingGreen + COLOR_GENERATOR_DELTA));
+ int newRandomBlue = (int) (Math.random() * (startingBlue + COLOR_GENERATOR_DELTA));
+
+ /*
+ * If the newly generated color is less than the starting color
+ * then add the starting color to it.
+ */
+ if (newRandomRed < startingRed)
+ {
+ newRandomRed += startingRed;
+ }
+
+ if (newRandomGreen < startingGreen)
+ {
+ newRandomGreen += startingGreen;
+ }
+
+ if (newRandomBlue < startingBlue)
+ {
+ newRandomBlue += startingBlue;
+ }
+
+ return new Color(newRandomRed, newRandomGreen, newRandomBlue);
+ }
+}
Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/captcha/util/ColorGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/checkbox/AbstractHtmlCheckbox.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/checkbox/AbstractHtmlCheckbox.java?rev=673836&r1=673835&r2=673836&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/checkbox/AbstractHtmlCheckbox.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/checkbox/AbstractHtmlCheckbox.java Thu Jul 3 15:03:29 2008
@@ -1,72 +1,72 @@
-/*
- * 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.checkbox;
-
-import javax.faces.component.UIComponentBase;
-
-import org.apache.myfaces.component.UserRoleAware;
-
-/**
- * Renders a HTML input of type "checkbox".
- * The associated SelectItem comes from an extended selectManyCheckbox
- * component with layout "spread". The selectManyCheckbox is
- * referenced by the "for" attribute.
- *
- * All HTML pass-through attributes for this input
- * are taken from the associated selectManyCheckbox.
- *
- * Unless otherwise specified, all attributes accept static values or EL expressions.
- *
- * @JSFComponent
- * name = "t:checkbox"
- * class = "org.apache.myfaces.custom.checkbox.HtmlCheckbox"
- * tagClass = "org.apache.myfaces.custom.checkbox.HtmlCheckboxTag"
- *
- * @author Manfred Geiler (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public abstract class AbstractHtmlCheckbox
- extends UIComponentBase implements UserRoleAware
-{
-
- public static final String FOR_ATTR = "for".intern();
- public static final String INDEX_ATTR = "index".intern();
-
- public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlCheckbox";
- public static final String COMPONENT_FAMILY = "org.apache.myfaces.Checkbox";
- private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.Checkbox";
-
- /**
- * id of the referenced extended selectManyCheckbox component
- *
- * @JSFProperty
- * required="true"
- */
- public abstract String getFor();
-
- /**
- * n-th SelectItem of referenced UISelectMany starting with 0.
- *
- * @JSFProperty
- * defaultValue = "Integer.MIN_VALUE"
- * required="true"
- */
- public abstract int getIndex();
-
-}
+/*
+ * 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.checkbox;
+
+import javax.faces.component.UIComponentBase;
+
+import org.apache.myfaces.component.UserRoleAware;
+
+/**
+ * Renders a HTML input of type "checkbox".
+ * The associated SelectItem comes from an extended selectManyCheckbox
+ * component with layout "spread". The selectManyCheckbox is
+ * referenced by the "for" attribute.
+ *
+ * All HTML pass-through attributes for this input
+ * are taken from the associated selectManyCheckbox.
+ *
+ * Unless otherwise specified, all attributes accept static values or EL expressions.
+ *
+ * @JSFComponent
+ * name = "t:checkbox"
+ * class = "org.apache.myfaces.custom.checkbox.HtmlCheckbox"
+ * tagClass = "org.apache.myfaces.custom.checkbox.HtmlCheckboxTag"
+ *
+ * @author Manfred Geiler (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public abstract class AbstractHtmlCheckbox
+ extends UIComponentBase implements UserRoleAware
+{
+
+ public static final String FOR_ATTR = "for".intern();
+ public static final String INDEX_ATTR = "index".intern();
+
+ public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlCheckbox";
+ public static final String COMPONENT_FAMILY = "org.apache.myfaces.Checkbox";
+ private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.Checkbox";
+
+ /**
+ * id of the referenced extended selectManyCheckbox component
+ *
+ * @JSFProperty
+ * required="true"
+ */
+ public abstract String getFor();
+
+ /**
+ * n-th SelectItem of referenced UISelectMany starting with 0.
+ *
+ * @JSFProperty
+ * defaultValue = "Integer.MIN_VALUE"
+ * required="true"
+ */
+ public abstract int getIndex();
+
+}
Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/checkbox/AbstractHtmlCheckbox.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/AbstractHtmlCollapsiblePanel.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/AbstractHtmlCollapsiblePanel.java?rev=673836&r1=673835&r2=673836&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/AbstractHtmlCollapsiblePanel.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/AbstractHtmlCollapsiblePanel.java Thu Jul 3 15:03:29 2008
@@ -1,289 +1,289 @@
-/*
- * 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.collapsiblepanel;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-
-import org.apache.myfaces.component.EventAware;
-import org.apache.myfaces.component.StyleAware;
-import org.apache.myfaces.component.UniversalProperties;
-import org.apache.myfaces.component.UserRoleAware;
-
-/**
- * A component which just renders as a single icon (with optional label) when "collapsed", hiding all child components.
- *
- * When open, the child components can be seen.
- *
- * The title attribute defines the label shown for the collapsible panel.
- *
- * @JSFComponent
- * name = "t:collapsiblePanel"
- * class = "org.apache.myfaces.custom.collapsiblepanel.HtmlCollapsiblePanel"
- * tagClass = "org.apache.myfaces.custom.collapsiblepanel.HtmlCollapsiblePanelTag"
- *
- * @JSFJspProperty name = "converter" tagExcluded = "true"
- * @author Kalle Korhonen (latest modification by $Author$)
- * @version $Revision$ $Date$
- *
- */
-public abstract class AbstractHtmlCollapsiblePanel extends UIInput
- implements StyleAware, UniversalProperties, EventAware,
- UserRoleAware
-{
- public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlCollapsiblePanel";
- public static final String COMPONENT_FAMILY = "javax.faces.Panel";
- private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.CollapsiblePanel";
-
- private static final String HEADER_FACET_NAME = "header";
-
- private static final String CLOSED_CONTENT_FACET_NAME = "closedContent";
-
- private boolean _currentlyCollapsed;
-
- public void setCurrentlyCollapsed(boolean collapsed)
- {
- _currentlyCollapsed = collapsed;
- }
-
- public boolean isCurrentlyCollapsed()
- {
- return _currentlyCollapsed;
- }
-
- public void setHeader(UIComponent header)
- {
- getFacets().put(HEADER_FACET_NAME, header);
- }
-
- /**
- * @JSFFacet
- */
- public UIComponent getHeader()
- {
- return (UIComponent) getFacets().get(HEADER_FACET_NAME);
- }
-
- public void setClosedContent(UIComponent closedContent)
- {
- getFacets().put(CLOSED_CONTENT_FACET_NAME, closedContent);
- }
-
- /**
- * @JSFFacet
- */
- public UIComponent getClosedContent()
- {
- return (UIComponent) getFacets().get(CLOSED_CONTENT_FACET_NAME);
- }
-
- //private static final Log log = LogFactory.getLog(HtmlCollapsiblePanel.class);
-
- public void processDecodes(FacesContext context)
- {
- if (context == null) throw new NullPointerException("context");
-
- initialiseVars(context);
-
- if (!isRendered()) return;
-
- try
- {
- decode(context);
- }
- catch (RuntimeException e)
- {
- context.renderResponse();
- throw e;
- }
-
- UIComponent headerComponent = getFacet("header");
-
- if(headerComponent != null)
- {
- for (Iterator it = headerComponent.getChildren().iterator(); it.hasNext(); )
- {
- UIComponent child = (UIComponent)it.next();
-
- child.processDecodes(context);
- }
- }
-
- if(isCurrentlyCollapsed())
- {
- UIComponent component = getFacet("closedContent");
-
- if(component != null)
- {
- component.processDecodes(context);
- }
- }
- else
- {
- for (Iterator it = getChildren().iterator(); it.hasNext(); )
- {
- UIComponent child = (UIComponent)it.next();
- child.processDecodes(context);
- }
- }
-
- removeVars(context);
- }
-
- public String getClientId(FacesContext context)
- {
- return super.getClientId(context);
- }
-
- public void processUpdates(FacesContext context)
- {
- initialiseVars(context);
-
- super.processUpdates(context);
-
- removeVars(context);
- }
-
- private void initialiseVars(FacesContext context)
- {
- if(getVar()!=null)
- {
- context.getExternalContext().getRequestMap().put(getVar(),
- Boolean.valueOf(isCollapsed()));
- }
-
- if(getTitleVar()!=null)
- {
- context.getExternalContext().getRequestMap().put(getTitleVar(),
- getTitle());
- }
- }
-
- private void removeVars(FacesContext context)
- {
- if(getVar()!=null)
- {
- context.getExternalContext().getRequestMap().remove(getVar());
- }
-
- if(getTitleVar()!=null)
- {
- context.getExternalContext().getRequestMap().remove(getTitleVar());
- }
- }
-
- public void processValidators(FacesContext context)
- {
- initialiseVars(context);
-
- super.processValidators(context);
-
- removeVars(context);
- }
-
- public void encodeChildren(FacesContext context) throws IOException
- {
- initialiseVars(context);
-
- super.encodeChildren(context);
-
- removeVars(context);
- }
-
- public void updateModel(FacesContext context)
- {
- super.updateModel(context);
- }
-
- public boolean isCollapsed()
- {
- return isCollapsed(getValue());
- }
-
- public static boolean isCollapsed(Object collapsedValue)
- {
- Object value = collapsedValue;
-
- if(value instanceof Boolean)
- {
- return ((Boolean) value).booleanValue();
- }
- else if (value instanceof String)
- {
- return Boolean.valueOf((String) value).booleanValue();
- }
-
- return true;
- }
-
- /**
- * The variable which you can use to check for the collapsed
- * state of the enclosing component. This is especially useful
- * for custom headers you define in a facet with name 'header'.
- *
- * @JSFProperty
- */
- public abstract String getVar();
-
- /**
- * This variable is defined to hold the value of the title
- * component - you can use it for accessing this value in
- * custom headers you define in a facet with name 'header'.
- *
- * @JSFProperty
- */
- public abstract String getTitleVar();
-
- /**
- * @JSFProperty tagExcluded = "true"
- */
- public MethodBinding getValidator(){
- return super.getValidator();
- }
-
- /**
- * @JSFProperty tagExcluded = "true"
- */
- public MethodBinding getValueChangeListener()
- {
- return super.getValueChangeListener();
- }
-
- /**
- * @JSFProperty tagExcluded = "true"
- */
- public boolean isImmediate()
- {
- return super.isImmediate();
- }
-
- /**
- * @JSFProperty tagExcluded = "true"
- */
- public boolean isRequired()
- {
- return super.isRequired();
- }
-
-}
+/*
+ * 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.collapsiblepanel;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+import javax.faces.el.MethodBinding;
+
+import org.apache.myfaces.component.EventAware;
+import org.apache.myfaces.component.StyleAware;
+import org.apache.myfaces.component.UniversalProperties;
+import org.apache.myfaces.component.UserRoleAware;
+
+/**
+ * A component which just renders as a single icon (with optional label) when "collapsed", hiding all child components.
+ *
+ * When open, the child components can be seen.
+ *
+ * The title attribute defines the label shown for the collapsible panel.
+ *
+ * @JSFComponent
+ * name = "t:collapsiblePanel"
+ * class = "org.apache.myfaces.custom.collapsiblepanel.HtmlCollapsiblePanel"
+ * tagClass = "org.apache.myfaces.custom.collapsiblepanel.HtmlCollapsiblePanelTag"
+ *
+ * @JSFJspProperty name = "converter" tagExcluded = "true"
+ * @author Kalle Korhonen (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ *
+ */
+public abstract class AbstractHtmlCollapsiblePanel extends UIInput
+ implements StyleAware, UniversalProperties, EventAware,
+ UserRoleAware
+{
+ public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlCollapsiblePanel";
+ public static final String COMPONENT_FAMILY = "javax.faces.Panel";
+ private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.CollapsiblePanel";
+
+ private static final String HEADER_FACET_NAME = "header";
+
+ private static final String CLOSED_CONTENT_FACET_NAME = "closedContent";
+
+ private boolean _currentlyCollapsed;
+
+ public void setCurrentlyCollapsed(boolean collapsed)
+ {
+ _currentlyCollapsed = collapsed;
+ }
+
+ public boolean isCurrentlyCollapsed()
+ {
+ return _currentlyCollapsed;
+ }
+
+ public void setHeader(UIComponent header)
+ {
+ getFacets().put(HEADER_FACET_NAME, header);
+ }
+
+ /**
+ * @JSFFacet
+ */
+ public UIComponent getHeader()
+ {
+ return (UIComponent) getFacets().get(HEADER_FACET_NAME);
+ }
+
+ public void setClosedContent(UIComponent closedContent)
+ {
+ getFacets().put(CLOSED_CONTENT_FACET_NAME, closedContent);
+ }
+
+ /**
+ * @JSFFacet
+ */
+ public UIComponent getClosedContent()
+ {
+ return (UIComponent) getFacets().get(CLOSED_CONTENT_FACET_NAME);
+ }
+
+ //private static final Log log = LogFactory.getLog(HtmlCollapsiblePanel.class);
+
+ public void processDecodes(FacesContext context)
+ {
+ if (context == null) throw new NullPointerException("context");
+
+ initialiseVars(context);
+
+ if (!isRendered()) return;
+
+ try
+ {
+ decode(context);
+ }
+ catch (RuntimeException e)
+ {
+ context.renderResponse();
+ throw e;
+ }
+
+ UIComponent headerComponent = getFacet("header");
+
+ if(headerComponent != null)
+ {
+ for (Iterator it = headerComponent.getChildren().iterator(); it.hasNext(); )
+ {
+ UIComponent child = (UIComponent)it.next();
+
+ child.processDecodes(context);
+ }
+ }
+
+ if(isCurrentlyCollapsed())
+ {
+ UIComponent component = getFacet("closedContent");
+
+ if(component != null)
+ {
+ component.processDecodes(context);
+ }
+ }
+ else
+ {
+ for (Iterator it = getChildren().iterator(); it.hasNext(); )
+ {
+ UIComponent child = (UIComponent)it.next();
+ child.processDecodes(context);
+ }
+ }
+
+ removeVars(context);
+ }
+
+ public String getClientId(FacesContext context)
+ {
+ return super.getClientId(context);
+ }
+
+ public void processUpdates(FacesContext context)
+ {
+ initialiseVars(context);
+
+ super.processUpdates(context);
+
+ removeVars(context);
+ }
+
+ private void initialiseVars(FacesContext context)
+ {
+ if(getVar()!=null)
+ {
+ context.getExternalContext().getRequestMap().put(getVar(),
+ Boolean.valueOf(isCollapsed()));
+ }
+
+ if(getTitleVar()!=null)
+ {
+ context.getExternalContext().getRequestMap().put(getTitleVar(),
+ getTitle());
+ }
+ }
+
+ private void removeVars(FacesContext context)
+ {
+ if(getVar()!=null)
+ {
+ context.getExternalContext().getRequestMap().remove(getVar());
+ }
+
+ if(getTitleVar()!=null)
+ {
+ context.getExternalContext().getRequestMap().remove(getTitleVar());
+ }
+ }
+
+ public void processValidators(FacesContext context)
+ {
+ initialiseVars(context);
+
+ super.processValidators(context);
+
+ removeVars(context);
+ }
+
+ public void encodeChildren(FacesContext context) throws IOException
+ {
+ initialiseVars(context);
+
+ super.encodeChildren(context);
+
+ removeVars(context);
+ }
+
+ public void updateModel(FacesContext context)
+ {
+ super.updateModel(context);
+ }
+
+ public boolean isCollapsed()
+ {
+ return isCollapsed(getValue());
+ }
+
+ public static boolean isCollapsed(Object collapsedValue)
+ {
+ Object value = collapsedValue;
+
+ if(value instanceof Boolean)
+ {
+ return ((Boolean) value).booleanValue();
+ }
+ else if (value instanceof String)
+ {
+ return Boolean.valueOf((String) value).booleanValue();
+ }
+
+ return true;
+ }
+
+ /**
+ * The variable which you can use to check for the collapsed
+ * state of the enclosing component. This is especially useful
+ * for custom headers you define in a facet with name 'header'.
+ *
+ * @JSFProperty
+ */
+ public abstract String getVar();
+
+ /**
+ * This variable is defined to hold the value of the title
+ * component - you can use it for accessing this value in
+ * custom headers you define in a facet with name 'header'.
+ *
+ * @JSFProperty
+ */
+ public abstract String getTitleVar();
+
+ /**
+ * @JSFProperty tagExcluded = "true"
+ */
+ public MethodBinding getValidator(){
+ return super.getValidator();
+ }
+
+ /**
+ * @JSFProperty tagExcluded = "true"
+ */
+ public MethodBinding getValueChangeListener()
+ {
+ return super.getValueChangeListener();
+ }
+
+ /**
+ * @JSFProperty tagExcluded = "true"
+ */
+ public boolean isImmediate()
+ {
+ return super.isImmediate();
+ }
+
+ /**
+ * @JSFProperty tagExcluded = "true"
+ */
+ public boolean isRequired()
+ {
+ return super.isRequired();
+ }
+
+}
Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/AbstractHtmlCollapsiblePanel.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/AbstractHtmlSimpleColumn.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/AbstractHtmlSimpleColumn.java?rev=673836&r1=673835&r2=673836&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/AbstractHtmlSimpleColumn.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/AbstractHtmlSimpleColumn.java Thu Jul 3 15:03:29 2008
@@ -1,92 +1,92 @@
-/*
- * 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.column;
-
-import javax.faces.component.UIColumn;
-
-/**
- * A tag that extend h:column to provide HTML passthrough attributes.
- * Tag t:column can be used instead of h:column in a t:datatable.
- * It provides HTML passthrough attributes for header (th), footer
- * (td) and row cells (td). Unless otherwise specified, all
- * attributes accept static values or EL expressions.
- *
- * @JSFComponent
- * name = "t:column"
- * class = "org.apache.myfaces.custom.column.HtmlSimpleColumn"
- * tagClass = "org.apache.myfaces.custom.column.HtmlColumnTag"
- *
- * @author Mathias Broekelmann (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public abstract class AbstractHtmlSimpleColumn extends UIColumn implements HtmlColumn
-{
- public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlColumn";
-
-
- public boolean isGroupByValueSet()
- {
- return getGroupByValue() != null;
- }
-
- /**
- * This attribute tells the datatable to group by data in this column
- *
- * @JSFProperty
- * defaultValue = "false"
- */
- public abstract boolean isGroupBy();
-
-
- /**
- * Optional - Allows you configure where to get the value to
- * check for the group change condition. Default: all children
- * of the column cell will be checked
- *
- * @JSFProperty
- */
- public abstract Object getGroupByValue();
-
- /**
- * This attribute tells the datatable to make this column the
- * default sorted, when sortable=true
- *
- * @JSFProperty
- * defaultValue = "false"
- */
- public abstract boolean isDefaultSorted();
-
- /**
- * This attribute makes this column automaticaly sortable
- * by a row object's property
- *
- * @JSFProperty
- * defaultValue = "false"
- */
- public abstract boolean isSortable();
-
- /**
- * This attribute tells row object's property by which
- * sorting will be performed on this column
- *
- * @JSFProperty
- */
- public abstract String getSortPropertyName();
-
-}
+/*
+ * 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.column;
+
+import javax.faces.component.UIColumn;
+
+/**
+ * A tag that extend h:column to provide HTML passthrough attributes.
+ * Tag t:column can be used instead of h:column in a t:datatable.
+ * It provides HTML passthrough attributes for header (th), footer
+ * (td) and row cells (td). Unless otherwise specified, all
+ * attributes accept static values or EL expressions.
+ *
+ * @JSFComponent
+ * name = "t:column"
+ * class = "org.apache.myfaces.custom.column.HtmlSimpleColumn"
+ * tagClass = "org.apache.myfaces.custom.column.HtmlColumnTag"
+ *
+ * @author Mathias Broekelmann (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public abstract class AbstractHtmlSimpleColumn extends UIColumn implements HtmlColumn
+{
+ public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlColumn";
+
+
+ public boolean isGroupByValueSet()
+ {
+ return getGroupByValue() != null;
+ }
+
+ /**
+ * This attribute tells the datatable to group by data in this column
+ *
+ * @JSFProperty
+ * defaultValue = "false"
+ */
+ public abstract boolean isGroupBy();
+
+
+ /**
+ * Optional - Allows you configure where to get the value to
+ * check for the group change condition. Default: all children
+ * of the column cell will be checked
+ *
+ * @JSFProperty
+ */
+ public abstract Object getGroupByValue();
+
+ /**
+ * This attribute tells the datatable to make this column the
+ * default sorted, when sortable=true
+ *
+ * @JSFProperty
+ * defaultValue = "false"
+ */
+ public abstract boolean isDefaultSorted();
+
+ /**
+ * This attribute makes this column automaticaly sortable
+ * by a row object's property
+ *
+ * @JSFProperty
+ * defaultValue = "false"
+ */
+ public abstract boolean isSortable();
+
+ /**
+ * This attribute tells row object's property by which
+ * sorting will be performed on this column
+ *
+ * @JSFProperty
+ */
+ public abstract String getSortPropertyName();
+
+}
Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/column/AbstractHtmlSimpleColumn.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/AbstractHtmlColumns.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/AbstractHtmlColumns.java?rev=673836&r1=673835&r2=673836&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/AbstractHtmlColumns.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/AbstractHtmlColumns.java Thu Jul 3 15:03:29 2008
@@ -1,105 +1,105 @@
-/*
- * 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.crosstable;
-
-import org.apache.myfaces.custom.column.HtmlColumn;
-
-
-/**
- * The tag allows dynamic columns in a datatable.
- *
- * The UIColumns component is used below a t:datatable to create a
- * dynamic count of columns. It is used like a UIData component
- * which iterates through a datamodel to create the columns.
- *
- * Unless otherwise specified, all attributes accept static values or EL expressions.
- *
- * @JSFComponent
- * name = "t:columns"
- * class = "org.apache.myfaces.custom.crosstable.HtmlColumns"
- * tagClass = "org.apache.myfaces.custom.crosstable.HtmlColumnsTag"
- * implements = "org.apache.myfaces.custom.column.HtmlColumn"
- * defaultRendererType = ""
- *
- * @author Mathias Broekelmann (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public abstract class AbstractHtmlColumns extends UIColumns implements HtmlColumn {
-
- public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlColumns";
-
- /**
- * This attribute tells the datatable to group by data in this column
- *
- * @JSFProperty
- * defaultValue = "false"
- */
- public abstract boolean isGroupBy();
-
- /**
- * Optional - Allows you configure where to get the value to
- * check for the group change condition. Default: all children
- * of the column cell will be checked
- *
- * @JSFProperty
- */
- public abstract Object getGroupByValue();
-
- /**
- * This attribute tells the datatable to make this column the
- * default sorted, when sortable=true
- *
- * @JSFProperty
- * defaultValue = "false"
- */
- public abstract boolean isDefaultSorted();
-
- /**
- * This attribute makes this column automaticaly sortable
- * by a row object's property
- *
- * @JSFProperty
- * defaultValue = "false"
- */
- public abstract boolean isSortable();
-
- /**
- * This attribute tells row object's property by which
- * sorting will be performed on this column
- *
- * @JSFProperty
- */
- public abstract String getSortPropertyName();
-
- // the following are not implemented, but are in the HtmlColumn interface
- public String getColspan() {return null;}
- public void setColspan(String colspan) {}
- public String getHeadercolspan() {return null;}
- public void setHeadercolspan(String headercolspan) {}
- public String getFootercolspan() {return null;}
- public void setFootercolspan(String footercolspan) {}
-
- public String getColumnId() {
- return null;
- }
-
- public void setColumnId(String columnId) {
- }
-
-}
+/*
+ * 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.crosstable;
+
+import org.apache.myfaces.custom.column.HtmlColumn;
+
+
+/**
+ * The tag allows dynamic columns in a datatable.
+ *
+ * The UIColumns component is used below a t:datatable to create a
+ * dynamic count of columns. It is used like a UIData component
+ * which iterates through a datamodel to create the columns.
+ *
+ * Unless otherwise specified, all attributes accept static values or EL expressions.
+ *
+ * @JSFComponent
+ * name = "t:columns"
+ * class = "org.apache.myfaces.custom.crosstable.HtmlColumns"
+ * tagClass = "org.apache.myfaces.custom.crosstable.HtmlColumnsTag"
+ * implements = "org.apache.myfaces.custom.column.HtmlColumn"
+ * defaultRendererType = ""
+ *
+ * @author Mathias Broekelmann (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public abstract class AbstractHtmlColumns extends UIColumns implements HtmlColumn {
+
+ public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlColumns";
+
+ /**
+ * This attribute tells the datatable to group by data in this column
+ *
+ * @JSFProperty
+ * defaultValue = "false"
+ */
+ public abstract boolean isGroupBy();
+
+ /**
+ * Optional - Allows you configure where to get the value to
+ * check for the group change condition. Default: all children
+ * of the column cell will be checked
+ *
+ * @JSFProperty
+ */
+ public abstract Object getGroupByValue();
+
+ /**
+ * This attribute tells the datatable to make this column the
+ * default sorted, when sortable=true
+ *
+ * @JSFProperty
+ * defaultValue = "false"
+ */
+ public abstract boolean isDefaultSorted();
+
+ /**
+ * This attribute makes this column automaticaly sortable
+ * by a row object's property
+ *
+ * @JSFProperty
+ * defaultValue = "false"
+ */
+ public abstract boolean isSortable();
+
+ /**
+ * This attribute tells row object's property by which
+ * sorting will be performed on this column
+ *
+ * @JSFProperty
+ */
+ public abstract String getSortPropertyName();
+
+ // the following are not implemented, but are in the HtmlColumn interface
+ public String getColspan() {return null;}
+ public void setColspan(String colspan) {}
+ public String getHeadercolspan() {return null;}
+ public void setHeadercolspan(String headercolspan) {}
+ public String getFootercolspan() {return null;}
+ public void setFootercolspan(String footercolspan) {}
+
+ public String getColumnId() {
+ return null;
+ }
+
+ public void setColumnId(String columnId) {
+ }
+
+}
Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/AbstractHtmlColumns.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/dojo/DojoWidget.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/dojo/DojoWidget.java?rev=673836&r1=673835&r2=673836&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/dojo/DojoWidget.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/dojo/DojoWidget.java Thu Jul 3 15:03:29 2008
@@ -1,62 +1,62 @@
-/*
- * 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.dojo;
-
-/**
- * Basic dojo interface
- * which has to implement
- * certain methods regarding the dojo widgets
- *
- * for now the interfaces are very limited and only
- * have to implement the variable binding properties
- *
- *
- * @author werpu
- *
- */
-public interface DojoWidget {
- /**
- * getter for an explizit widget
- * var
- * @return
- */
- public String getWidgetVar();
-
- /**
- *
- * @param widgetVar
- */
- public void setWidgetVar(String widgetVar);
-
-
- /**
- * forces the internal widget id onto the given value
- *
- * @param forceIt
- */
- public void setWidgetId(String widgetId);
-
- /**
- *
- * @return the enforced widgetid
- */
- public String getWidgetId();
-}
+/*
+ * 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.dojo;
+
+/**
+ * Basic dojo interface
+ * which has to implement
+ * certain methods regarding the dojo widgets
+ *
+ * for now the interfaces are very limited and only
+ * have to implement the variable binding properties
+ *
+ *
+ * @author werpu
+ *
+ */
+public interface DojoWidget {
+ /**
+ * getter for an explizit widget
+ * var
+ * @return
+ */
+ public String getWidgetVar();
+
+ /**
+ *
+ * @param widgetVar
+ */
+ public void setWidgetVar(String widgetVar);
+
+
+ /**
+ * forces the internal widget id onto the given value
+ *
+ * @param forceIt
+ */
+ public void setWidgetId(String widgetId);
+
+ /**
+ *
+ * @return the enforced widgetid
+ */
+ public String getWidgetId();
+}
Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/dojo/DojoWidget.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java?rev=673836&r1=673835&r2=673836&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java Thu Jul 3 15:03:29 2008
@@ -1,27 +1,27 @@
-/*
- * 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.fileupload;
-
-import java.io.File;
-
-public abstract class DiskStorageStrategy extends StorageStrategy {
-
- public abstract File getTempFile();
-
-}
+/*
+ * 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.fileupload;
+
+import java.io.File;
+
+public abstract class DiskStorageStrategy extends StorageStrategy {
+
+ public abstract File getTempFile();
+
+}
Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/StorageStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/StorageStrategy.java?rev=673836&r1=673835&r2=673836&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/StorageStrategy.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/StorageStrategy.java Thu Jul 3 15:03:29 2008
@@ -1,26 +1,26 @@
-/*
- * 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.fileupload;
-
-import java.io.Serializable;
-
-public abstract class StorageStrategy implements Serializable{
-
- public abstract void deleteFileContents();
-}
+/*
+ * 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.fileupload;
+
+import java.io.Serializable;
+
+public abstract class StorageStrategy implements Serializable{
+
+ public abstract void deleteFileContents();
+}
Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/StorageStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/picklist/AbstractHtmlSelectManyPicklist.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/picklist/AbstractHtmlSelectManyPicklist.java?rev=673836&r1=673835&r2=673836&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/picklist/AbstractHtmlSelectManyPicklist.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/picklist/AbstractHtmlSelectManyPicklist.java Thu Jul 3 15:03:29 2008
@@ -1,91 +1,91 @@
-/*
- * 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.picklist;
-
-import org.apache.myfaces.component.html.ext.HtmlSelectManyListbox;
-
-/**
- * A picklist component that allows to select items from one list to another
- * <p>
- * In other words, is a selection component where a set of items
- * can be selected from a list that contains all the available items to a list
- * that contains the selected items.
- * </p>
- * <p>
- * The component is based on the t:selectManyListbox component, so it contains
- * the same attributes. Soon, more specific attributes will be added.
- * </p>
- *
- * @JSFComponent
- * name = "t:selectManyPicklist"
- * class = "org.apache.myfaces.custom.picklist.HtmlSelectManyPicklist"
- * tagClass = "org.apache.myfaces.custom.picklist.HtmlSelectManyPicklistTag"
- *
- * @author Bruno Aranda (latest modification by $Author: lu4242 $)
- * @version $Revision: 667663 $ $Date: 2008-06-14 00:53:17 +0300 (Sat, 14 Jun 2008) $
- */
-public abstract class AbstractHtmlSelectManyPicklist extends HtmlSelectManyListbox
-{
- public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectManyPicklist";
- public static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.PicklistRenderer";
-
- /**
- * Define the text that goes inside the add button
- *
- * @JSFProperty
- */
- public abstract String getAddButtonText();
-
- /**
- * Define the text that goes inside the remove button
- *
- * @JSFProperty
- */
- public abstract String getRemoveButtonText();
-
- /**
- * CSS style to be applied to the button
- *
- * @JSFProperty
- */
- public abstract String getAddButtonStyle();
-
- /**
- * CSS style to be applied to the button
- *
- * @JSFProperty
- */
- public abstract String getRemoveButtonStyle();
-
- /**
- * CSS styleClass to be applied to the button
- *
- * @JSFProperty
- */
- public abstract String getAddButtonStyleClass();
-
- /**
- * CSS styleClass to be applied to the button
- *
- * @JSFProperty
- */
- public abstract String getRemoveButtonStyleClass();
-
-}
+/*
+ * 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.picklist;
+
+import org.apache.myfaces.component.html.ext.HtmlSelectManyListbox;
+
+/**
+ * A picklist component that allows to select items from one list to another
+ * <p>
+ * In other words, is a selection component where a set of items
+ * can be selected from a list that contains all the available items to a list
+ * that contains the selected items.
+ * </p>
+ * <p>
+ * The component is based on the t:selectManyListbox component, so it contains
+ * the same attributes. Soon, more specific attributes will be added.
+ * </p>
+ *
+ * @JSFComponent
+ * name = "t:selectManyPicklist"
+ * class = "org.apache.myfaces.custom.picklist.HtmlSelectManyPicklist"
+ * tagClass = "org.apache.myfaces.custom.picklist.HtmlSelectManyPicklistTag"
+ *
+ * @author Bruno Aranda (latest modification by $Author: lu4242 $)
+ * @version $Revision: 667663 $ $Date: 2008-06-14 00:53:17 +0300 (Sat, 14 Jun 2008) $
+ */
+public abstract class AbstractHtmlSelectManyPicklist extends HtmlSelectManyListbox
+{
+ public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectManyPicklist";
+ public static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.PicklistRenderer";
+
+ /**
+ * Define the text that goes inside the add button
+ *
+ * @JSFProperty
+ */
+ public abstract String getAddButtonText();
+
+ /**
+ * Define the text that goes inside the remove button
+ *
+ * @JSFProperty
+ */
+ public abstract String getRemoveButtonText();
+
+ /**
+ * CSS style to be applied to the button
+ *
+ * @JSFProperty
+ */
+ public abstract String getAddButtonStyle();
+
+ /**
+ * CSS style to be applied to the button
+ *
+ * @JSFProperty
+ */
+ public abstract String getRemoveButtonStyle();
+
+ /**
+ * CSS styleClass to be applied to the button
+ *
+ * @JSFProperty
+ */
+ public abstract String getAddButtonStyleClass();
+
+ /**
+ * CSS styleClass to be applied to the button
+ *
+ * @JSFProperty
+ */
+ public abstract String getRemoveButtonStyleClass();
+
+}
\ No newline at end of file
Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/picklist/AbstractHtmlSelectManyPicklist.java
------------------------------------------------------------------------------
svn:eol-style = native