Author: Alex.Kolonitsky
Date: 2009-12-04 15:53:17 -0500 (Fri, 04 Dec 2009)
New Revision: 16073
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/VersionBean.java
root/framework/trunk/impl/src/main/java/org/richfaces/package-info.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/AttributeParametersEncoder.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/Expression.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/InputRendererBase.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/RendererContributor.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/ScriptOptionsContributor.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/Base2WayGradient.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/GradientA.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonDisabledBackgroundImage.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/GradientAlignment.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/package-info.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/package-info.java
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/package-info.java
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AbstractCacheableResource.java
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AnimatedTestResource.java
root/framework/trunk/impl/src/main/java/org/richfaces/resource/CachedResourceImpl.java
root/framework/trunk/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceCodec.java
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceUtils.java
root/framework/trunk/impl/src/main/java/org/richfaces/resource/TestResource2.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/AbstractChainableSkinImpl.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/BasicSkinImpl.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/DefaultSkinImpl.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/DummySkinConfiguration.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinBean.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinImpl.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinPropertyResolver.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinVariableResolver.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/ThemeImpl.java
root/framework/trunk/impl/src/main/java/org/richfaces/skin/package-info.java
root/framework/trunk/impl/src/main/java/org/richfaces/util/CollectionsUtils.java
root/framework/trunk/impl/src/main/java/org/richfaces/util/ReferenceMap.java
root/framework/trunk/impl/src/main/java/org/richfaces/util/RequestStateManager.java
root/framework/trunk/impl/src/main/java/org/richfaces/util/Util.java
root/framework/trunk/impl/src/main/java/org/richfaces/util/package-info.java
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/MethodBindingMethodExpressionAdaptor.java
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/MethodExpressionMethodBindingAdaptor.java
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/SimpleComponentTag.java
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/ValueBindingValueExpressionAdaptor.java
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/package-info.java
Log:
RFPL-195 - Code style policy
Reformatting
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/VersionBean.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/richfaces/VersionBean.java 2009-12-04
20:49:13 UTC (rev 16072)
+++ root/framework/trunk/impl/src/main/java/org/richfaces/VersionBean.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,15 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces;
/**
* Vendor and version information for A4J project
+ *
* @author asmirnov(a)exadel.com (latest modification by $Author$)
* @version $Revision$ $Date$
- *
*/
public class VersionBean {
public static final int MAJOR_VERSION = 4;
@@ -72,13 +70,13 @@
/**
* Class for incapsulate version info.
+ *
* @author asmirnov(a)exadel.com (latest modification by $Author$)
* @version $Revision$ $Date$
- *
*/
public static class Version {
public static final String VERSION_INFO = "v." + MAJOR_VERSION +
'.' + MINOR_VERSION + '.' + REVISION
- + SCM_REVISION;
+ + SCM_REVISION;
public static final String RESOURCE_VERSION_INFO = MAJOR_VERSION + "_"
+ MINOR_VERSION + "_" + REVISION;
public int getMajor() {
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/package-info.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/richfaces/package-info.java 2009-12-04
20:49:13 UTC (rev 16072)
+++ root/framework/trunk/impl/src/main/java/org/richfaces/package-info.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -1,4 +1,3 @@
-
/**
* Base package for RichFaces classes
*/
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/AttributeParametersEncoder.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/AttributeParametersEncoder.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/AttributeParametersEncoder.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,19 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit;
-import java.io.IOException;
-
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import java.io.IOException;
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 30.01.2007
- *
+ * created 30.01.2007
*/
public interface AttributeParametersEncoder {
public void doEncode(FacesContext context, UIComponent component) throws
IOException;
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,25 +19,20 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit;
import org.ajax4jsf.renderkit.AjaxChildrenRenderer;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 18.12.2006
- *
+ * created 18.12.2006
*/
public abstract class CompositeRenderer extends AjaxChildrenRenderer {
private static final Command MERGE_OPTIONS_COMMAND = new Command() {
@@ -93,15 +88,15 @@
}
protected String getScriptContributions(String varString, FacesContext context,
UIComponent component,
- Class<?> acceptableClass) {
+ Class<?> acceptableClass) {
List<String> scriptContributions = new ArrayList<String>();
GET_SCRIPT_CONTRIBUTIONS.execute(renderers.iterator(), context, component,
scriptContributions,
- acceptableClass);
+ acceptableClass);
StringBuffer result = new StringBuffer();
- for (Iterator<String> itr = scriptContributions.iterator(); itr.hasNext();
) {
+ for (Iterator<String> itr = scriptContributions.iterator(); itr.hasNext();)
{
result.append(varString);
result.append(itr.next());
}
@@ -127,7 +122,7 @@
}
public void encodeAttributeParameters(FacesContext context, UIComponent component)
throws IOException {
- for (Iterator<AttributeParametersEncoder> iterator =
parameterEncoders.iterator(); iterator.hasNext(); ) {
+ for (Iterator<AttributeParametersEncoder> iterator =
parameterEncoders.iterator(); iterator.hasNext();) {
AttributeParametersEncoder encoder = iterator.next();
encoder.doEncode(context, component);
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/Expression.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/Expression.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/Expression.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,14 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit;
/**
* @author Nick Belaevski - mailto:nbelaevski@exadel.com
- * created 20.06.2007
- *
+ * created 20.06.2007
*/
public class Expression {
private Object expression;
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/InputRendererBase.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/InputRendererBase.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/InputRendererBase.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,25 +19,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit;
import org.ajax4jsf.renderkit.AjaxComponentRendererBase;
import org.ajax4jsf.util.SelectUtils;
-import java.util.Map;
-
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
+import java.util.Map;
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 23.01.2007
- *
+ * created 23.01.2007
*/
public class InputRendererBase extends AjaxComponentRendererBase {
protected Class getComponentClass() {
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,13 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit;
import org.richfaces.javacc.RichMacroDefinition;
import org.richfaces.json.JSContentHandler;
-
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -33,14 +30,12 @@
import java.io.IOException;
import java.io.StringReader;
import java.io.Writer;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
/**
* @author Nick Belaevski - mailto:nbelaevski@exadel.com created 21.06.2007
- *
*/
public class MacroDefinitionJSContentHandler extends JSContentHandler {
private String epilog;
@@ -80,7 +75,7 @@
List<?> parsedExpressiion = parseExpressiion(string);
boolean isExpression = false;
- for (Iterator<?> iterator = parsedExpressiion.iterator();
iterator.hasNext(); ) {
+ for (Iterator<?> iterator = parsedExpressiion.iterator();
iterator.hasNext();) {
Object next = (Object) iterator.next();
if (next instanceof Expression) {
@@ -96,7 +91,7 @@
boolean first = true;
- for (Iterator<?> iterator = parsedExpressiion.iterator();
iterator.hasNext(); ) {
+ for (Iterator<?> iterator = parsedExpressiion.iterator();
iterator.hasNext();) {
Object next = (Object) iterator.next();
if (next == null) {
@@ -144,7 +139,7 @@
try {
List<?> parsedExpression = parseExpressiion(new String(ch, start,
length));
- for (Iterator<?> iterator = parsedExpression.iterator();
iterator.hasNext(); ) {
+ for (Iterator<?> iterator = parsedExpression.iterator();
iterator.hasNext();) {
Object next = iterator.next();
if (next instanceof Expression) {
@@ -209,8 +204,8 @@
/**
* Writer will not output duplicate commas
- * @author Maksim Kaszynski
*
+ * @author Maksim Kaszynski
*/
static class WellFormedWriter extends FilterWriter {
private char lastChar;
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/RendererContributor.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/RendererContributor.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/RendererContributor.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit;
import javax.faces.component.UIComponent;
@@ -28,8 +26,7 @@
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 18.12.2006
- *
+ * created 18.12.2006
*/
public interface RendererContributor extends ScriptOptionsContributor {
public String getScriptContribution(FacesContext context, UIComponent component);
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,24 +19,20 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit;
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.ScriptStringBase;
import org.ajax4jsf.javascript.ScriptUtils;
+import javax.faces.component.UIComponent;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
-import javax.faces.component.UIComponent;
-
/**
* @author Maksim Kaszynski
- *
*/
public class ScriptOptions extends ScriptStringBase {
protected Map<String, Object> opts = new HashMap<String, Object>();
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/ScriptOptionsContributor.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/ScriptOptionsContributor.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/ScriptOptionsContributor.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit;
import javax.faces.component.UIComponent;
@@ -28,13 +26,13 @@
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 18.12.2006
- *
+ * created 18.12.2006
*/
public interface ScriptOptionsContributor {
/**
* Create script options if component class is known for renderer to contribute
+ *
* @param context
* @param component
* @return Built {@link ScriptOptions} instance or null if component is not
acceptable
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,28 +19,22 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit;
import org.ajax4jsf.io.SAXResponseWriter;
import org.ajax4jsf.renderkit.RendererBase;
-
import org.richfaces.component.TemplateComponent;
-
import org.xml.sax.ContentHandler;
-import java.io.IOException;
-import java.io.Writer;
-
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import java.io.IOException;
+import java.io.Writer;
/**
* @author Nick Belaevski - mailto:nbelaevski@exadel.com
- * created 22.06.2007
- *
+ * created 22.06.2007
*/
public abstract class TemplateEncoderRendererBase extends RendererBase {
public final boolean getRendersChildren() {
@@ -94,7 +88,7 @@
writer.write("var evaluator = ");
writeScriptBody(context, component, true);
writer.write(";\n new Insertion.Top($('" +
component.getClientId(context)
- + "'), evaluator.invoke('getContent',
window).join(''));");
+ + "'), evaluator.invoke('getContent',
window).join(''));");
writer.endElement("script");
}
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/Base2WayGradient.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/Base2WayGradient.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/Base2WayGradient.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -1,4 +1,3 @@
-
/**
*
*/
@@ -13,7 +12,6 @@
/**
* @author asmirnov
- *
*/
public class Base2WayGradient extends BaseGradient {
@@ -147,8 +145,8 @@
protected void drawBackGradient(Graphics2D g2d, Rectangle2D rectangle, BiColor
colors, int height) {
if (colors != null) {
GradientPaint gragient = new GradientPaint(0, (float) (rectangle.getHeight()
- height),
- colors.getBottomColor(), 0, (float)
rectangle.getHeight(),
- colors.getTopColor());
+ colors.getBottomColor(), 0, (float) rectangle.getHeight(),
+ colors.getTopColor());
g2d.setPaint(gragient);
g2d.fill(rectangle);
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -21,16 +21,6 @@
package org.richfaces.renderkit.html;
-import java.awt.Dimension;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-
-import javax.faces.context.FacesContext;
-
import org.ajax4jsf.resource.Java2Dresource;
import org.ajax4jsf.util.HtmlColor;
import org.ajax4jsf.util.HtmlDimensions;
@@ -41,267 +31,273 @@
import org.richfaces.skin.Skin;
import org.richfaces.skin.SkinFactory;
+import javax.faces.context.FacesContext;
+import java.awt.*;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 02.02.2007
- *
+ * created 02.02.2007
*/
public class BaseGradient extends Java2Dresource {
- private final int width;
- private final int height;
- private final int gradientHeight;
- private final String baseColor;
- private final String gradientColor;
- private final boolean horizontal;
+ protected Integer headerBackgroundColor;
+ protected Integer headerGradientColor;
+ protected GradientType gradientType;
- protected Integer headerBackgroundColor;
- protected Integer headerGradientColor;
- protected GradientType gradientType;
+ private final int width;
+ private final int height;
+ private final int gradientHeight;
+ private final String baseColor;
+ private final String gradientColor;
+ private final boolean horizontal;
- private void initialize() {
- FacesContext context = FacesContext.getCurrentInstance();
-
- Integer baseIntColor = null;
- Integer headerIntColor = null;
- String gradientTypeString = null;
+ public BaseGradient(int width, int height, int gradientHeight, String baseColor,
String gradientColor,
+ boolean horizontal) {
+ super(ImageType.PNG);
+ this.width = width;
+ this.height = height;
+ this.gradientHeight = gradientHeight;
+ this.baseColor = baseColor != null ? baseColor : Skin.HEADER_BACKGROUND_COLOR;
+ this.gradientColor = gradientColor != null ? gradientColor :
Skin.HEADER_GRADIENT_COLOR;
+ this.horizontal = horizontal;
- if (baseIntColor == null) {
- baseIntColor = getColorValueParameter(context, baseColor, false);
- }
+ initialize();
+ }
- if (headerIntColor == null) {
- headerIntColor = getColorValueParameter(context, gradientColor, false);
- }
+ public BaseGradient(int width, int height, int gradientHeight) {
+ this(width, height, gradientHeight, null, null, false);
+ }
- if (!(baseIntColor == null && headerIntColor == null)) {
- if (baseIntColor == null) {
- baseIntColor = getColorValueParameter(context, baseColor, true);
- }
+ public BaseGradient(int width, int height, int gradientHeight, String baseColor,
String gradientColor) {
+ this(width, height, gradientHeight, baseColor, gradientColor, false);
+ }
- if (headerIntColor == null) {
- headerIntColor = getColorValueParameter(context, gradientColor, true);
- }
- }
+ public BaseGradient(int width, int height) {
+ this(width, height, height);
+ }
- this.headerBackgroundColor = baseIntColor;
- this.headerGradientColor = headerIntColor;
+ public BaseGradient(int width, int height, String baseColor, String gradientColor) {
+ this(width, height, height, baseColor, gradientColor);
+ }
- if (gradientTypeString == null || gradientTypeString.length() == 0) {
- gradientTypeString = getValueParameter(context, Skin.GRADIENT_TYPE);
- }
+ public BaseGradient() {
+ this(30, 50, 20);
+ }
- this.gradientType = GradientType.getByParameter(gradientTypeString);
- }
-
- public BaseGradient(int width, int height, int gradientHeight, String baseColor, String
gradientColor, boolean horizontal) {
- super(ImageType.PNG);
- this.width = width;
- this.height = height;
- this.gradientHeight = gradientHeight;
- this.baseColor = baseColor != null ? baseColor : Skin.HEADER_BACKGROUND_COLOR;
- this.gradientColor = gradientColor != null ? gradientColor :
Skin.HEADER_GRADIENT_COLOR;
- this.horizontal = horizontal;
+ public BaseGradient(String baseColor, String gradientColor) {
+ this(30, 50, 20, baseColor, gradientColor);
+ }
- initialize();
- }
+ public BaseGradient(int width, int height, int gradientHeight, boolean horizontal) {
+ this(width, height, gradientHeight, null, null, horizontal);
+ }
- public BaseGradient(int width, int height, int gradientHeight) {
- this(width, height, gradientHeight, null, null, false);
- }
+ public BaseGradient(int width, int height, boolean horizontal) {
+ this(width, height, horizontal ? width : height, null, null, horizontal);
+ }
- public BaseGradient(int width, int height, int gradientHeight, String baseColor, String
gradientColor) {
- this(width, height, gradientHeight, baseColor, gradientColor, false);
- }
+ public BaseGradient(int width, int height, String baseColor, String gradientColor,
boolean horizontal) {
+ this(width, height, horizontal ? width : height, baseColor, gradientColor,
horizontal);
+ }
- public BaseGradient(int width, int height) {
- this(width, height, height);
- }
+ public BaseGradient(boolean horizontal) {
+ this(30, 50, 20, null, null, horizontal);
+ }
- public BaseGradient(int width, int height, String baseColor, String gradientColor) {
- this(width, height, height, baseColor, gradientColor);
- }
+ public BaseGradient(String baseColor, String gradientColor, boolean horizontal) {
+ this(30, 50, 20, baseColor, gradientColor, horizontal);
+ }
- public BaseGradient() {
- this(30, 50, 20);
- }
+ private void initialize() {
+ FacesContext context = FacesContext.getCurrentInstance();
- public BaseGradient(String baseColor, String gradientColor) {
- this(30, 50, 20, baseColor, gradientColor);
- }
+ Integer baseIntColor = null;
+ Integer headerIntColor = null;
+ String gradientTypeString = null;
- public BaseGradient(int width, int height, int gradientHeight, boolean horizontal) {
- this(width, height, gradientHeight, null, null, horizontal);
- }
+ if (baseIntColor == null) {
+ baseIntColor = getColorValueParameter(context, baseColor, false);
+ }
- public BaseGradient(int width, int height, boolean horizontal) {
- this(width, height, horizontal ? width : height, null, null, horizontal);
- }
+ if (headerIntColor == null) {
+ headerIntColor = getColorValueParameter(context, gradientColor, false);
+ }
- public BaseGradient(int width, int height, String baseColor, String gradientColor,
boolean horizontal) {
- this(width, height, horizontal ? width : height, baseColor, gradientColor,
horizontal);
- }
+ if (!(baseIntColor == null && headerIntColor == null)) {
+ if (baseIntColor == null) {
+ baseIntColor = getColorValueParameter(context, baseColor, true);
+ }
- public BaseGradient(boolean horizontal) {
- this(30, 50, 20, null, null, horizontal);
- }
+ if (headerIntColor == null) {
+ headerIntColor = getColorValueParameter(context, gradientColor, true);
+ }
+ }
- public BaseGradient(String baseColor, String gradientColor, boolean horizontal) {
- this(30, 50, 20, baseColor, gradientColor, horizontal);
- }
+ this.headerBackgroundColor = baseIntColor;
+ this.headerGradientColor = headerIntColor;
- public Dimension getDimension() {
- return new Dimension(width, height);
- }
+ if (gradientTypeString == null || gradientTypeString.length() == 0) {
+ gradientTypeString = getValueParameter(context, Skin.GRADIENT_TYPE);
+ }
- /**
- * @return the gradientHeight
- */
- protected int getGradientHeight() {
- return gradientHeight;
- }
+ this.gradientType = GradientType.getByParameter(gradientTypeString);
+ }
- /**
- * @return the baseColor
- */
- protected String getBaseColor() {
- return baseColor;
- }
+ public Dimension getDimension() {
+ return new Dimension(width, height);
+ }
- /**
- * @return the gradientColor
- */
- protected String getGradientColor() {
- return gradientColor;
- }
+ /**
+ * @return the gradientHeight
+ */
+ protected int getGradientHeight() {
+ return gradientHeight;
+ }
- /**
- * @return the horizontal
- */
- protected boolean isHorizontal() {
- return horizontal;
- }
+ /**
+ * @return the baseColor
+ */
+ protected String getBaseColor() {
+ return baseColor;
+ }
- protected void drawGradient(Graphics2D g2d, Shape shape, BiColor colors, int height) {
- if (colors != null) {
- GradientPaint gragient = new GradientPaint(0, 0, colors.getTopColor(), 0, height,
colors.getBottomColor());
- g2d.setPaint(gragient);
- g2d.fill(shape);
- }
- }
+ /**
+ * @return the gradientColor
+ */
+ protected String getGradientColor() {
+ return gradientColor;
+ }
- @Override
- protected void paint(Graphics2D graphics2d, Dimension dimension) {
- super.paint(graphics2d, dimension);
+ /**
+ * @return the horizontal
+ */
+ protected boolean isHorizontal() {
+ return horizontal;
+ }
- graphics2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- graphics2d.setRenderingHint(RenderingHints.KEY_DITHERING,
RenderingHints.VALUE_DITHER_ENABLE);
+ protected void drawGradient(Graphics2D g2d, Shape shape, BiColor colors, int height)
{
+ if (colors != null) {
+ GradientPaint gragient = new GradientPaint(0, 0, colors.getTopColor(), 0,
height, colors.getBottomColor());
+ g2d.setPaint(gragient);
+ g2d.fill(shape);
+ }
+ }
- graphics2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION,
RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
- graphics2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING,
RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- graphics2d.setRenderingHint(RenderingHints.KEY_RENDERING,
RenderingHints.VALUE_RENDER_QUALITY);
+ @Override
+ protected void paint(Graphics2D graphics2d, Dimension dimension) {
+ super.paint(graphics2d, dimension);
- paintGradient(graphics2d, dimension);
- }
-
- /**
- * @param g2d
- * @param data
- */
- protected void paintGradient(Graphics2D g2d, Dimension dim) {
- if ((headerBackgroundColor != null || headerGradientColor != null) &&
gradientType != null) {
- BiColor biColor = new GradientType.BiColor(headerBackgroundColor,
headerGradientColor);
+ graphics2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
+ graphics2d.setRenderingHint(RenderingHints.KEY_DITHERING,
RenderingHints.VALUE_DITHER_ENABLE);
- BiColor firstLayer = gradientType.getFirstLayerColors(biColor);
- BiColor secondLayer = gradientType.getSecondLayerColors(biColor);
+ graphics2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION,
+ RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+ graphics2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING,
RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+ graphics2d.setRenderingHint(RenderingHints.KEY_RENDERING,
RenderingHints.VALUE_RENDER_QUALITY);
- if (horizontal) {
- //x -> y, y -> x
- g2d.transform(new AffineTransform(0, 1, 1, 0, 0, 0));
- dim.setSize(dim.height, dim.width);
- }
+ paintGradient(graphics2d, dimension);
+ }
- int localGradientHeight = this.gradientHeight;
- if (localGradientHeight < 0) {
- localGradientHeight = dim.height;
- }
+ /**
+ * @param g2d
+ * @param dim
+ */
+ protected void paintGradient(Graphics2D g2d, Dimension dim) {
+ if ((headerBackgroundColor != null || headerGradientColor != null) &&
gradientType != null) {
+ BiColor biColor = new GradientType.BiColor(headerBackgroundColor,
headerGradientColor);
- Rectangle2D rect = new Rectangle2D.Float(
- 0,
- 0,
- dim.width,
- dim.height);
+ BiColor firstLayer = gradientType.getFirstLayerColors(biColor);
+ BiColor secondLayer = gradientType.getSecondLayerColors(biColor);
- drawGradient(g2d, rect, firstLayer, localGradientHeight);
+ if (horizontal) {
+ //x -> y, y -> x
+ g2d.transform(new AffineTransform(0, 1, 1, 0, 0, 0));
+ dim.setSize(dim.height, dim.width);
+ }
- int smallGradientHeight = localGradientHeight / 2;
+ int localGradientHeight = this.gradientHeight;
+ if (localGradientHeight < 0) {
+ localGradientHeight = dim.height;
+ }
- rect = new Rectangle2D.Float(
- 0,
- 0,
- dim.width,
- smallGradientHeight);
+ Rectangle2D rect = new Rectangle2D.Float(
+ 0,
+ 0,
+ dim.width,
+ dim.height);
- drawGradient(g2d, rect, secondLayer, smallGradientHeight);
- }
- }
+ drawGradient(g2d, rect, firstLayer, localGradientHeight);
- @Override
- protected void readState(FacesContext context, NumericDataInputStream stream) {
- super.readState(context, stream);
+ int smallGradientHeight = localGradientHeight / 2;
- this.headerBackgroundColor = stream.readInt();
- this.headerGradientColor = stream.readInt();
- this.gradientType = GradientType.values()[stream.readByte()];
- }
+ rect = new Rectangle2D.Float(
+ 0,
+ 0,
+ dim.width,
+ smallGradientHeight);
- @Override
- protected void writeState(FacesContext context,
- NumericDataOutputStream stream) {
- super.writeState(context, stream);
+ drawGradient(g2d, rect, secondLayer, smallGradientHeight);
+ }
+ }
- stream.writeInt(this.headerBackgroundColor);
- stream.writeInt(this.headerGradientColor);
- stream.writeByte((byte) this.gradientType.ordinal());
- }
-
- private Integer decodeColor(String value) {
- if (value !=null && value.length() != 0) {
- return Integer.valueOf(HtmlColor.decode(value).getRGB());
- } else {
- return null;
- }
- }
+ @Override
+ protected void readState(FacesContext context, NumericDataInputStream stream) {
+ super.readState(context, stream);
- public boolean isCacheable() {
- return true;
- }
+ this.headerBackgroundColor = stream.readInt();
+ this.headerGradientColor = stream.readInt();
+ this.gradientType = GradientType.values()[stream.readByte()];
+ }
- protected String getValueParameter(FacesContext context, String name) {
- SkinFactory skinFactory = SkinFactory.getInstance();
+ @Override
+ protected void writeState(FacesContext context,
+ NumericDataOutputStream stream) {
+ super.writeState(context, stream);
- Skin skin = skinFactory.getSkin(context);
- String value = (String) skin.getParameter(context, name);
+ stream.writeInt(this.headerBackgroundColor);
+ stream.writeInt(this.headerGradientColor);
+ stream.writeByte((byte) this.gradientType.ordinal());
+ }
- if (value == null || value.length() == 0) {
- skin = skinFactory.getDefaultSkin(context);
- value = (String) skin.getParameter(context, name);
- }
+ private Integer decodeColor(String value) {
+ if (value != null && value.length() != 0) {
+ return Integer.valueOf(HtmlColor.decode(value).getRGB());
+ } else {
+ return null;
+ }
+ }
- return value;
- }
+ public boolean isCacheable() {
+ return true;
+ }
- protected Integer getColorValueParameter(FacesContext context, String name, boolean
useDefault) {
- Skin skin;
- if (useDefault) {
- skin = SkinFactory.getInstance().getDefaultSkin(context);
- } else {
- skin = SkinFactory.getInstance().getSkin(context);
- }
+ protected String getValueParameter(FacesContext context, String name) {
+ SkinFactory skinFactory = SkinFactory.getInstance();
- return decodeColor((String) skin.getParameter(context,name));
- }
+ Skin skin = skinFactory.getSkin(context);
+ String value = (String) skin.getParameter(context, name);
+ if (value == null || value.length() == 0) {
+ skin = skinFactory.getDefaultSkin(context);
+ value = (String) skin.getParameter(context, name);
+ }
+
+ return value;
+ }
+
+ protected Integer getColorValueParameter(FacesContext context, String name, boolean
useDefault) {
+ Skin skin;
+ if (useDefault) {
+ skin = SkinFactory.getInstance().getDefaultSkin(context);
+ } else {
+ skin = SkinFactory.getInstance().getSkin(context);
+ }
+
+ return decodeColor((String) skin.getParameter(context, name));
+ }
+
protected Integer getHeight(FacesContext context, String heightParamName) {
SkinFactory skinFactory = SkinFactory.getInstance();
Skin skin = skinFactory.getSkin(context);
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -21,16 +21,6 @@
package org.richfaces.renderkit.html;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-
-import javax.faces.context.FacesContext;
-
import org.ajax4jsf.resource.Java2Dresource;
import org.ajax4jsf.util.HtmlColor;
import org.ajax4jsf.util.NumericDataInputStream;
@@ -40,216 +30,219 @@
import org.richfaces.skin.Skin;
import org.richfaces.skin.SkinFactory;
+import javax.faces.context.FacesContext;
+import java.awt.*;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 02.02.2007
- *
+ * created 02.02.2007
*/
public class CustomizeableGradient extends Java2Dresource {
- protected Dimension dimension = new Dimension(20, 500);
+ protected Dimension dimension = new Dimension(20, 500);
- protected Integer gradientColor;
- protected Integer baseColor;
- protected Integer gradientHeight = 22;
+ protected Integer gradientColor;
+ protected Integer baseColor;
+ protected Integer gradientHeight = 22;
- protected GradientType gradientType;
- protected GradientAlignment gradientAlignment;
+ protected GradientType gradientType;
+ protected GradientAlignment gradientAlignment;
- public CustomizeableGradient() {
- super(ImageType.PNG);
-
- String gradientTypeString =
safeTrim(getValueParameter(FacesContext.getCurrentInstance(), Skin.GRADIENT_TYPE));
- if (gradientTypeString != null && gradientTypeString.length() != 0) {
- gradientType = GradientType.getByParameter(gradientTypeString);
- }
- }
+ public CustomizeableGradient() {
+ super(ImageType.PNG);
- public Dimension getDimension() {
- return dimension;
- }
+ String gradientTypeString =
safeTrim(getValueParameter(FacesContext.getCurrentInstance(), Skin.GRADIENT_TYPE));
+ if (gradientTypeString != null && gradientTypeString.length() != 0) {
+ gradientType = GradientType.getByParameter(gradientTypeString);
+ }
+ }
- private void drawRectangle(Graphics2D g2d, Rectangle2D rect, BiColor biColor, boolean
useTop) {
- if (biColor != null) {
- Color color = useTop ? biColor.getTopColor() : biColor.getBottomColor();
- g2d.setColor(color);
- g2d.fill(rect);
- }
- }
+ public Dimension getDimension() {
+ return dimension;
+ }
- private void drawGradient(Graphics2D g2d, Rectangle2D rectangle, BiColor colors, int
height) {
- if (colors != null) {
- GradientPaint gragient = new GradientPaint(0, 0, colors.getTopColor(), 0, height,
colors.getBottomColor());
- g2d.setPaint(gragient);
- g2d.fill(rectangle);
- }
- }
+ private void drawRectangle(Graphics2D g2d, Rectangle2D rect, BiColor biColor, boolean
useTop) {
+ if (biColor != null) {
+ Color color = useTop ? biColor.getTopColor() : biColor.getBottomColor();
+ g2d.setColor(color);
+ g2d.fill(rect);
+ }
+ }
- protected void paint(Graphics2D g2d, Dimension dim) {
- g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- g2d.setRenderingHint(RenderingHints.KEY_DITHERING,
RenderingHints.VALUE_DITHER_ENABLE);
+ private void drawGradient(Graphics2D g2d, Rectangle2D rectangle, BiColor colors, int
height) {
+ if (colors != null) {
+ GradientPaint gragient = new GradientPaint(0, 0, colors.getTopColor(), 0,
height, colors.getBottomColor());
+ g2d.setPaint(gragient);
+ g2d.fill(rectangle);
+ }
+ }
- g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION,
RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
- g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING,
RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- g2d.setRenderingHint(RenderingHints.KEY_RENDERING,
RenderingHints.VALUE_RENDER_QUALITY);
+ protected void paint(Graphics2D g2d, Dimension dim) {
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.setRenderingHint(RenderingHints.KEY_DITHERING,
RenderingHints.VALUE_DITHER_ENABLE);
- if ((gradientColor != null || baseColor != null) && gradientType != null
&&
- gradientAlignment != null) {
+ g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION,
RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING,
RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_RENDERING,
RenderingHints.VALUE_RENDER_QUALITY);
- paintGradient(g2d, dim);
- }
- }
+ if ((gradientColor != null || baseColor != null) && gradientType != null
+ && gradientAlignment != null) {
- protected void paintGradient(Graphics2D g2d, Dimension dim) {
- BiColor biColor = new GradientType.BiColor(gradientColor, baseColor);
- BiColor firstLayer = gradientType.getFirstLayerColors(biColor);
- BiColor secondLayer = gradientType.getSecondLayerColors(biColor);
+ paintGradient(g2d, dim);
+ }
+ }
- Rectangle2D rect =
- new Rectangle2D.Float(
- 0,
- 0,
- dim.width,
- dim.height);
+ protected void paintGradient(Graphics2D g2d, Dimension dim) {
+ BiColor biColor = new GradientType.BiColor(gradientColor, baseColor);
+ BiColor firstLayer = gradientType.getFirstLayerColors(biColor);
+ BiColor secondLayer = gradientType.getSecondLayerColors(biColor);
- int topRectangleHeight = gradientAlignment.getTopRectangleHeight(dim.height,
gradientHeight);
- int bottomRectangleHeight = gradientAlignment.getBottomRectangleHeight(dim.height,
gradientHeight);
+ Rectangle2D rect =
+ new Rectangle2D.Float(
+ 0,
+ 0,
+ dim.width,
+ dim.height);
- rect = new Rectangle2D.Float(
- 0,
- 0,
- dim.width,
- topRectangleHeight);
+ int topRectangleHeight = gradientAlignment.getTopRectangleHeight(dim.height,
gradientHeight);
+ int bottomRectangleHeight =
gradientAlignment.getBottomRectangleHeight(dim.height, gradientHeight);
- drawRectangle(g2d, rect, firstLayer, true);
- drawRectangle(g2d, rect, secondLayer, true);
+ rect = new Rectangle2D.Float(
+ 0,
+ 0,
+ dim.width,
+ topRectangleHeight);
- rect = new Rectangle2D.Float(
- 0,
- dim.height - bottomRectangleHeight,
- dim.width,
- dim.height);
+ drawRectangle(g2d, rect, firstLayer, true);
+ drawRectangle(g2d, rect, secondLayer, true);
- drawRectangle(g2d, rect, firstLayer, false);
- drawRectangle(g2d, rect, secondLayer, false);
+ rect = new Rectangle2D.Float(
+ 0,
+ dim.height - bottomRectangleHeight,
+ dim.width,
+ dim.height);
- g2d.transform(AffineTransform.getTranslateInstance(0, topRectangleHeight));
+ drawRectangle(g2d, rect, firstLayer, false);
+ drawRectangle(g2d, rect, secondLayer, false);
- rect = new Rectangle2D.Float(
- 0,
- 0,
- dim.width,
- dim.height);
+ g2d.transform(AffineTransform.getTranslateInstance(0, topRectangleHeight));
- drawGradient(g2d, rect, firstLayer, gradientHeight);
+ rect = new Rectangle2D.Float(
+ 0,
+ 0,
+ dim.width,
+ dim.height);
- rect = new Rectangle2D.Float(
- 0,
- 0,
- dim.width,
- gradientHeight / 2);
+ drawGradient(g2d, rect, firstLayer, gradientHeight);
- drawGradient(g2d, rect, secondLayer, gradientHeight / 2);
- }
-
- private Integer decodeColor(String value) {
- if (value !=null && value.length() != 0) {
- return Integer.valueOf(HtmlColor.decode(value).getRGB());
- } else {
- return null;
- }
- }
+ rect = new Rectangle2D.Float(
+ 0,
+ 0,
+ dim.width,
+ gradientHeight / 2);
- @Override
- protected void readState(FacesContext context, NumericDataInputStream stream) {
- super.readState(context, stream);
+ drawGradient(g2d, rect, secondLayer, gradientHeight / 2);
+ }
- this.baseColor = stream.readIntColor();
- this.gradientColor = stream.readIntColor();
- this.gradientHeight = stream.readInt();
- this.gradientAlignment = GradientAlignment.values()[stream.readByte()];
- this.gradientType = GradientType.values()[stream.readByte()];
- }
+ private Integer decodeColor(String value) {
+ if (value != null && value.length() != 0) {
+ return Integer.valueOf(HtmlColor.decode(value).getRGB());
+ } else {
+ return null;
+ }
+ }
- protected void writeState(FacesContext context,
org.ajax4jsf.util.NumericDataOutputStream stream) {
- super.writeState(context, stream);
-
- stream.writeIntColor(this.baseColor);
- stream.writeIntColor(this.gradientColor);
- stream.writeInt(this.gradientHeight);
- stream.writeByte((byte) this.gradientAlignment.ordinal());
- stream.writeByte((byte) this.gradientType.ordinal());
- };
-
- protected static String safeTrim(String s) {
- return s != null ? s.trim() : null;
- }
+ @Override
+ protected void readState(FacesContext context, NumericDataInputStream stream) {
+ super.readState(context, stream);
- public boolean isCacheable() {
- return true;
- }
+ this.baseColor = stream.readIntColor();
+ this.gradientColor = stream.readIntColor();
+ this.gradientHeight = stream.readInt();
+ this.gradientAlignment = GradientAlignment.values()[stream.readByte()];
+ this.gradientType = GradientType.values()[stream.readByte()];
+ }
- protected String getValueParameter(FacesContext context, String name) {
- SkinFactory skinFactory = SkinFactory.getInstance();
+ protected void writeState(FacesContext context,
org.ajax4jsf.util.NumericDataOutputStream stream) {
+ super.writeState(context, stream);
- Skin skin = skinFactory.getSkin(context);
- String value = (String) skin.getParameter(context, name);
+ stream.writeIntColor(this.baseColor);
+ stream.writeIntColor(this.gradientColor);
+ stream.writeInt(this.gradientHeight);
+ stream.writeByte((byte) this.gradientAlignment.ordinal());
+ stream.writeByte((byte) this.gradientType.ordinal());
+ }
- if (value == null || value.length() == 0) {
- skin = skinFactory.getDefaultSkin(context);
- value = (String) skin.getParameter(context, name);
- }
+ protected static String safeTrim(String s) {
+ return s != null ? s.trim() : null;
+ }
- return value;
- }
+ public boolean isCacheable() {
+ return true;
+ }
- public Integer getGradientColor() {
- return gradientColor;
- }
+ protected String getValueParameter(FacesContext context, String name) {
+ SkinFactory skinFactory = SkinFactory.getInstance();
- public void setGradientColor(Integer headerBackgroundColor) {
- this.gradientColor = headerBackgroundColor;
- }
+ Skin skin = skinFactory.getSkin(context);
+ String value = (String) skin.getParameter(context, name);
- public void setGradientColorString(String colorString) {
- setGradientColor(decodeColor(colorString));
- }
+ if (value == null || value.length() == 0) {
+ skin = skinFactory.getDefaultSkin(context);
+ value = (String) skin.getParameter(context, name);
+ }
- public Integer getBaseColor() {
- return baseColor;
- }
+ return value;
+ }
- public void setBaseColor(Integer headerGradientColor) {
- this.baseColor = headerGradientColor;
- }
-
- public void setBaseColorString(String colorString) {
- setBaseColor(decodeColor(colorString));
- }
-
- public GradientType getGradientType() {
- return gradientType;
- }
+ public Integer getGradientColor() {
+ return gradientColor;
+ }
- public void setGradientType(GradientType gradientType) {
- this.gradientType = gradientType;
- }
+ public void setGradientColor(Integer headerBackgroundColor) {
+ this.gradientColor = headerBackgroundColor;
+ }
- public GradientAlignment getGradientAlignment() {
- return gradientAlignment;
- }
+ public void setGradientColorString(String colorString) {
+ setGradientColor(decodeColor(colorString));
+ }
- public void setGradientAlignment(GradientAlignment gradientAlignment) {
- this.gradientAlignment = gradientAlignment;
- }
+ public Integer getBaseColor() {
+ return baseColor;
+ }
- public Integer getGradientHeight() {
- return gradientHeight;
- }
+ public void setBaseColor(Integer headerGradientColor) {
+ this.baseColor = headerGradientColor;
+ }
- public void setGradientHeight(Integer gradientHeight) {
- this.gradientHeight = gradientHeight;
- }
+ public void setBaseColorString(String colorString) {
+ setBaseColor(decodeColor(colorString));
+ }
+ public GradientType getGradientType() {
+ return gradientType;
+ }
+ public void setGradientType(GradientType gradientType) {
+ this.gradientType = gradientType;
+ }
+
+ public GradientAlignment getGradientAlignment() {
+ return gradientAlignment;
+ }
+
+ public void setGradientAlignment(GradientAlignment gradientAlignment) {
+ this.gradientAlignment = gradientAlignment;
+ }
+
+ public Integer getGradientHeight() {
+ return gradientHeight;
+ }
+
+ public void setGradientHeight(Integer gradientHeight) {
+ this.gradientHeight = gradientHeight;
+ }
+
}
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/GradientA.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/GradientA.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/GradientA.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit.html;
public class GradientA extends BaseGradient {
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -21,18 +21,17 @@
package org.richfaces.renderkit.html.images;
-import java.awt.Dimension;
-
-import javax.faces.context.FacesContext;
-
import org.ajax4jsf.util.NumericDataInputStream;
import org.ajax4jsf.util.NumericDataOutputStream;
import org.richfaces.renderkit.html.BaseGradient;
import org.richfaces.skin.Skin;
+import javax.faces.context.FacesContext;
+import java.awt.*;
+
/**
* Created 23.02.2008
- *
+ *
* @author Nick Belaevski
* @since 3.2
*/
@@ -42,49 +41,49 @@
private static final Dimension DEFAULT_DIMENSION = new Dimension(1, 1);
private Dimension dimension = null;
-
- //TODO - lazy initialize?
- private Integer height = getHeight(FacesContext.getCurrentInstance(),
Skin.GENERAL_SIZE_FONT);
- public BaseControlBackgroundImage(String baseColor, String gradientColor, int width) {
+ //TODO - lazy initialize?
+ private Integer height = getHeight(FacesContext.getCurrentInstance(),
Skin.GENERAL_SIZE_FONT);
+
+ public BaseControlBackgroundImage(String baseColor, String gradientColor, int width)
{
super(width, -1, baseColor, gradientColor);
}
@Override
public Dimension getDimension() {
- if (dimension != null) {
- return dimension;
- }
+ if (dimension != null) {
+ return dimension;
+ }
- return DEFAULT_DIMENSION;
+ return DEFAULT_DIMENSION;
}
-
+
@Override
protected void writeState(FacesContext context,
- NumericDataOutputStream stream) {
- super.writeState(context, stream);
-
- stream.writeInt(this.height);
+ NumericDataOutputStream stream) {
+ super.writeState(context, stream);
+
+ stream.writeInt(this.height);
}
@Override
protected void readState(FacesContext context, NumericDataInputStream stream) {
- super.readState(context, stream);
-
- this.height = stream.readInt();
+ super.readState(context, stream);
+
+ this.height = stream.readInt();
}
@Override
public void restoreState(FacesContext context, Object state) {
- super.restoreState(context, state);
-
- //TODO - create a special method?
- this.gradientType = GradientType.PLAIN;
+ super.restoreState(context, state);
+
+ //TODO - create a special method?
+ this.gradientType = GradientType.PLAIN;
}
@Override
public Object saveState(FacesContext context) {
- return super.saveState(context);
+ return super.saveState(context);
}
-
+
}
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -25,12 +25,13 @@
/**
* Created 23.02.2008
+ *
* @author Nick Belaevski
* @since 3.2
*/
public class ButtonBackgroundImage extends BaseControlBackgroundImage {
- public ButtonBackgroundImage() {
- super(Skin.HEADER_GRADIENT_COLOR, Skin.HEADER_BACKGROUND_COLOR, 1);
- }
+ public ButtonBackgroundImage() {
+ super(Skin.HEADER_GRADIENT_COLOR, Skin.HEADER_BACKGROUND_COLOR, 1);
+ }
}
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonDisabledBackgroundImage.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonDisabledBackgroundImage.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonDisabledBackgroundImage.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit.html.images;
/**
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/GradientAlignment.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/GradientAlignment.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/GradientAlignment.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,16 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit.html.images;
+import static java.lang.Math.max;
import java.util.Locale;
-import static java.lang.Math.max;
-
/**
* Created 22.04.2008
+ *
* @author Nick Belaevski
* @since 3.2
*/
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,19 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit.html.images;
-import java.awt.Color;
-
+import java.awt.*;
import java.util.Locale;
/**
* @author Nick Belaevski
* mailto:nbelaevski@exadel.com
* created 16.04.2008
- *
*/
public enum GradientType {
GLASS {
@@ -104,7 +100,7 @@
};
private static final BiColor WHITE = new BiColor(new Color(0xff, 0xff, 0xff, (int)
(0.65f * 0xff)),
- new Color(0xff, 0xff, 0xff, (int) (0.20f *
0xff)));
+ new Color(0xff, 0xff, 0xff, (int) (0.20f * 0xff)));
public static final GradientType getByParameter(String string) {
if ((string == null) || (string.length() == 0)) {
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -25,14 +25,15 @@
/**
* Created 23.02.2008
+ *
* @author Nick Belaevski
* @since 3.2
*/
public class InputBackgroundImage extends BaseControlBackgroundImage {
- public InputBackgroundImage() {
- super(Skin.ADDITIONAL_BACKGROUND_COLOR, Skin.CONTROL_BACKGROUND_COLOR, 2000);
- }
+ public InputBackgroundImage() {
+ super(Skin.ADDITIONAL_BACKGROUND_COLOR, Skin.CONTROL_BACKGROUND_COLOR, 2000);
+ }
}
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit.html.images;
import org.richfaces.skin.Skin;
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.renderkit.html.images;
import org.richfaces.skin.Skin;
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/package-info.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/package-info.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/package-info.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -1,4 +1,3 @@
-
/**
* Control and background images
*/
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/package-info.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/package-info.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/package-info.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -1,4 +1,3 @@
-
/**
* HTML-specific renderer classes
*/
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/package-info.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/package-info.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/package-info.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -1,4 +1,3 @@
-
/**
* Classes participating in components rendering
*/
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,39 +19,31 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.resource;
import org.ajax4jsf.resource.InternetResource;
-
import org.richfaces.context.SingletonsContext;
import org.richfaces.log.RichfacesLogger;
+import static org.richfaces.resource.ResourceUtils.millisToSecond;
+import static org.richfaces.resource.ResourceUtils.secondToMillis;
import org.richfaces.util.Util;
-
import org.slf4j.Logger;
-import static org.richfaces.resource.ResourceUtils.*;
-
+import javax.faces.FacesException;
+import javax.faces.component.StateHolder;
+import javax.faces.context.FacesContext;
import java.io.IOException;
import java.io.InputStream;
-
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
-
import java.text.MessageFormat;
-
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import javax.faces.FacesException;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
-
/**
* @author Nick Belaevski
* @since 4.0
@@ -75,6 +67,7 @@
/**
* <b>IMPORTANT:</b> this method returned TTL in RF 3.x, now it returns
expiration time
+ *
* @return Returns the expired.
*/
protected Date getExpires(FacesContext context) {
@@ -87,6 +80,7 @@
/**
* TODO optimize/review?
+ *
* @return Returns the lastModified.
*/
@Override
@@ -211,13 +205,13 @@
String resourceVersion = getVersion();
String resourceUri = ResourceHandlerImpl.RICHFACES_RESOURCE_IDENTIFIER
- + resourceCodec.encodeResource(resourceName, resourceData,
resourceVersion);
+ + resourceCodec.encodeResource(resourceName, resourceData, resourceVersion);
resourceUri = Util.encodeResourceURL(context, resourceUri);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(MessageFormat.format("Request path for {0} resource is:
{1}", String.valueOf(resourceName),
- String.valueOf(resourceUri)));
+ String.valueOf(resourceUri)));
}
return resourceUri;
@@ -335,7 +329,8 @@
}
@Override
- public void connect() throws IOException {}
+ public void connect() throws IOException {
+ }
@Override
public int getContentLength() {
@@ -385,7 +380,6 @@
}
}
-
private class MyURLStreamHandler extends URLStreamHandler {
@Override
protected URLConnection openConnection(URL u) throws IOException {
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AbstractCacheableResource.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AbstractCacheableResource.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AbstractCacheableResource.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,21 +19,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.resource;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.util.Util;
-
import org.slf4j.Logger;
-import java.util.Date;
-import java.util.Map;
-
import javax.faces.application.Resource;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
+import java.util.Date;
+import java.util.Map;
/**
* @author Nick Belaevski
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AnimatedTestResource.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AnimatedTestResource.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/resource/AnimatedTestResource.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,22 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.resource;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.GraphicsEnvironment;
-import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
+import org.w3c.dom.Node;
import javax.imageio.IIOImage;
import javax.imageio.ImageIO;
@@ -44,9 +31,15 @@
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.metadata.IIOMetadataNode;
import javax.imageio.stream.ImageOutputStream;
+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
-import org.w3c.dom.Node;
-
public class AnimatedTestResource extends TestResource2 {
private static final int DELAY_TIME = 50;
private static final int FRAMES_COUNT = 10;
@@ -110,11 +103,11 @@
ImageWriteParam defaultImageWriteParam =
sequenceCapableImageWriter.getDefaultWriteParam();
ImageTypeSpecifier imageTypeSpecifier =
ImageTypeSpecifier.createFromBufferedImageType(image.getType());
IIOMetadata imageMetaData =
sequenceCapableImageWriter.getDefaultImageMetadata(imageTypeSpecifier,
- defaultImageWriteParam);
+ defaultImageWriteParam);
String metaFormatName = imageMetaData.getNativeMetadataFormatName();
Node root = imageMetaData.getAsTree(metaFormatName);
IIOMetadataNode graphicsControlExtensionNode = (IIOMetadataNode)
getOrCreateChild(root,
-
"GraphicControlExtension");
+ "GraphicControlExtension");
//
http://java.sun.com/javase/6/docs/api/javax/imageio/metadata/doc-files/gi...
graphicsControlExtensionNode.setAttribute("disposalMethod",
"none");
@@ -132,17 +125,17 @@
byte numLoops = (byte) (loopContinuously ? 0x0 : 0x1);
- netscapeExtension.setUserObject(new byte[] {0x1, numLoops, 0x0});
+ netscapeExtension.setUserObject(new byte[]{0x1, numLoops, 0x0});
applicationExtensionsNode.appendChild(netscapeExtension);
imageMetaData.setFromTree(metaFormatName, root);
sequenceCapableImageWriter.prepareWriteSequence(null);
for (int i = 1; i <= FRAMES_COUNT; i++) {
g2d.setPaint(new GradientPaint(0, i * dimension.height / FRAMES_COUNT,
Color.WHITE, 0,
- dimension.height, getColor()));
+ dimension.height, getColor()));
g2d.fillRect(0, 0, dimension.width, dimension.height);
sequenceCapableImageWriter.writeToSequence(new IIOImage(image, null,
imageMetaData),
- defaultImageWriteParam);
+ defaultImageWriteParam);
}
sequenceCapableImageWriter.endWriteSequence();
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/resource/CachedResourceImpl.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/resource/CachedResourceImpl.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/resource/CachedResourceImpl.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,17 +19,22 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.resource;
+import org.ajax4jsf.io.ByteBuffer;
+import org.ajax4jsf.io.FastBufferInputStream;
+import org.ajax4jsf.io.FastBufferOutputStream;
+import org.richfaces.log.RichfacesLogger;
+import static org.richfaces.resource.ResourceUtils.secondToMillis;
+import org.richfaces.util.Util;
+import org.slf4j.Logger;
+
+import javax.faces.application.Resource;
+import javax.faces.context.FacesContext;
import java.io.IOException;
import java.io.InputStream;
-
import java.net.URL;
-
import java.text.MessageFormat;
-
import java.util.Date;
import java.util.HashMap;
import java.util.Locale;
@@ -38,20 +43,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.faces.application.Resource;
-import javax.faces.context.FacesContext;
-
-import org.ajax4jsf.io.ByteBuffer;
-import org.ajax4jsf.io.FastBufferInputStream;
-import org.ajax4jsf.io.FastBufferOutputStream;
-
-import org.richfaces.log.RichfacesLogger;
-import org.richfaces.util.Util;
-
-import org.slf4j.Logger;
-
-import static org.richfaces.resource.ResourceUtils.*;
-
/**
* @author Nick Belaevski
* @since 4.0
@@ -132,7 +123,7 @@
// ttl = expireTime - currentTime
// CACHE_EXPIRATION_COEFFICIENT * ttl + currentTime
this.expired = new Date((long) (CACHE_EXPIRATION_COEFFICIENT *
expiredFromHeader.getTime()
- + (1 - CACHE_EXPIRATION_COEFFICIENT) *
currentTime));
+ + (1 - CACHE_EXPIRATION_COEFFICIENT) * currentTime));
} else {
// TODO throw exception or modify headers?
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.resource;
import org.richfaces.util.Util;
@@ -28,7 +26,8 @@
final class DefaultResourceCodec implements ResourceCodec {
private static final ResourceCodec CODEC = new DefaultResourceCodec();
- private DefaultResourceCodec() {}
+ private DefaultResourceCodec() {
+ }
public String decodeResourceName(String resourceKey) {
return Util.getResourceName(resourceKey);
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceCodec.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceCodec.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceCodec.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -1,4 +1,3 @@
-
/**
*
*/
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,46 +19,36 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.resource;
import org.ajax4jsf.cache.Cache;
import org.ajax4jsf.cache.CacheManager;
-
import org.richfaces.context.AttributesContext;
import org.richfaces.context.SingletonsContext;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.util.RequestStateManager.BooleanRequestStateVariable;
import org.richfaces.util.Util;
-
import org.slf4j.Logger;
+import javax.faces.application.ProjectStage;
+import javax.faces.application.Resource;
+import javax.faces.application.ResourceHandler;
+import javax.faces.component.StateHolder;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-
import java.net.URL;
-
import java.text.MessageFormat;
-
import java.util.Date;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
-import javax.faces.application.ProjectStage;
-import javax.faces.application.Resource;
-import javax.faces.application.ResourceHandler;
-import javax.faces.component.StateHolder;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-
-import javax.imageio.ImageIO;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* @author Nick Belaevski
* @since 4.0
@@ -122,7 +112,7 @@
Object oldCodec = applicationMap.put(RESOURCE_CODEC_ATTRIBUTE_NAME, codec);
if ((oldCodec != null) && (codec != null) &&
!oldCodec.equals(codec)
- && facesContext.isProjectStage(ProjectStage.Development)) {
+ && facesContext.isProjectStage(ProjectStage.Development)) {
LOGGER.warn("Resource codec should be typically set once per application
lifetime");
}
}
@@ -271,9 +261,9 @@
}
if ((existingVersion != null) && (requestedVersion != null)
- && !existingVersion.equals(requestedVersion)) {
+ && !existingVersion.equals(requestedVersion)) {
logResourceProblem(context, null, "Resource {0} of version
{1} was not found", resourceName,
- requestedVersion);
+ requestedVersion);
sendResourceNotFound(context);
return;
@@ -321,7 +311,7 @@
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(new MessageFormat(
"Storing {0} resource in cache until {1,date,dd
MMM yyyy HH:mm:ss zzz}", Locale.US).
- format(new Object[] {resourceKey,
cacheExpirationDate}));
+ format(new Object[]{resourceKey,
cacheExpirationDate}));
}
cache.put(resourceKey, cachedResource, cacheExpirationDate);
@@ -431,6 +421,7 @@
/**
* Should be called only if {@link #isResourceExists(String)} returns
<code>true</code>
+ *
* @param resourceName
* @return
*/
@@ -448,7 +439,7 @@
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(MessageFormat.format("Successfully created
instance of {0} resource",
- resourceName));
+ resourceName));
}
} else {
throw new ClassCastException(resourceClass.getName());
@@ -466,7 +457,7 @@
Resource result;
if ((resourceName != null) && ((libraryName == null) ||
(libraryName.length() == 0))
- && isResourceExists(resourceName)) {
+ && isResourceExists(resourceName)) {
result = createHandlerDependentResource(resourceName);
} else {
result = defaultHandler.createResource(resourceName, libraryName,
contentType);
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceUtils.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceUtils.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceUtils.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.resource;
import java.util.regex.Matcher;
@@ -35,7 +33,8 @@
private static final String QUOTED_STRING_REGEX =
"(?:\\\\[\\x00-\\x7F]|[^\"\\\\])+";
private static final Pattern ETAG_PATTERN =
Pattern.compile("(?:W/)?\"(" + QUOTED_STRING_REGEX +
")\"(?:,\\s*)?");
- private ResourceUtils() {}
+ private ResourceUtils() {
+ }
public static String formatWeakTag(String eTag) {
String formattedTag = formatTag(eTag);
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/resource/TestResource2.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/resource/TestResource2.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/resource/TestResource2.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -21,13 +21,6 @@
package org.richfaces.resource;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-
-import javax.faces.context.FacesContext;
-
import org.ajax4jsf.resource.Java2Dresource;
import org.ajax4jsf.util.HtmlColor;
import org.ajax4jsf.util.NumericDataInputStream;
@@ -36,6 +29,9 @@
import org.richfaces.skin.Skin;
import org.richfaces.skin.SkinFactory;
+import javax.faces.context.FacesContext;
+import java.awt.*;
+
public class TestResource2 extends Java2Dresource {
private static final int MASK_FOR_COLOR_WITHOUT_ALPHA_CHANNEL = 0x00FFFFFF;
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/skin/AbstractChainableSkinImpl.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/skin/AbstractChainableSkinImpl.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/skin/AbstractChainableSkinImpl.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,16 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.skin;
import org.ajax4jsf.Messages;
-import java.util.Map;
-
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
+import java.util.Map;
/**
* @author nick belaevski
@@ -42,6 +39,7 @@
// won't be caught
return impl.getParameter(context, name);
}
+
public Object doLocalCall(FacesContext context, AbstractChainableSkinImpl impl,
String name) {
return impl.localResolveSkinParameter(context, name);
}
@@ -50,9 +48,11 @@
private Object wrapBoolean(boolean value) {
return value ? Boolean.TRUE : null;
}
+
public Object doExternalCall(FacesContext context, Skin impl, String name) {
return wrapBoolean(impl.containsProperty(name));
}
+
public Object doLocalCall(FacesContext context, AbstractChainableSkinImpl impl,
String name) {
return wrapBoolean(impl.localContainsProperty(context, name));
}
@@ -105,7 +105,7 @@
}
protected Object resolveSkinParameter(FacesContext context, String name) {
- int[] singleInt = new int[] {0};
+ int[] singleInt = new int[]{0};
Object resolvedParameter = resolveSkinParameter(context, name, singleInt);
while (resolvedParameter instanceof String) {
@@ -130,7 +130,7 @@
* @see org.richfaces.skin.Skin#containsProperty(java.lang.String)
*/
public boolean containsProperty(String name) {
- return containsProperty(FacesContext.getCurrentInstance(), name, new int[] {0});
+ return containsProperty(FacesContext.getCurrentInstance(), name, new int[]{0});
}
@Override
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -21,10 +21,9 @@
package org.richfaces.skin;
+import javax.faces.context.FacesContext;
import java.util.Map;
-import javax.faces.context.FacesContext;
-
/**
* @author nick belaevski
* @since 3.2
@@ -33,26 +32,26 @@
public class BaseSkinImpl extends AbstractChainableSkinImpl {
private SkinFactoryImpl factoryImpl;
-
+
BaseSkinImpl(Map properties, SkinFactoryImpl factory) {
- super(properties);
-
- this.factoryImpl = factory;
+ super(properties);
+
+ this.factoryImpl = factory;
}
protected Skin getBaseSkin(FacesContext context) {
- Object object = getLocalParameter(context, Skin.BASE_SKIN);
- Skin skin = null;
-
- if (object != null) {
- skin = factoryImpl.getSkinByName(context, object, true);
- }
-
- if (skin == null) {
- skin = factoryImpl.getDefaultSkin(context);
- }
+ Object object = getLocalParameter(context, Skin.BASE_SKIN);
+ Skin skin = null;
- return skin;
+ if (object != null) {
+ skin = factoryImpl.getSkinByName(context, object, true);
+ }
+
+ if (skin == null) {
+ skin = factoryImpl.getDefaultSkin(context);
+ }
+
+ return skin;
}
}
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/BasicSkinImpl.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/skin/BasicSkinImpl.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/skin/BasicSkinImpl.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,28 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.skin;
+import javax.el.ValueExpression;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import javax.el.ValueExpression;
-
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-
/**
* Singleton ( in respect as collection of different skins ) for produce
* instances properties for all used skins.
*
* @author shura (latest modification by $Author: alexsmirnov $)
* @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:41 $
- *
*/
public abstract class BasicSkinImpl implements Skin {
public static final String RENDER_KIT_PARAMETER = "render.kit";
@@ -99,6 +94,7 @@
/**
* Calculate concrete value for property - if it stored as @see ValueBinding ,
* return interpreted value.
+ *
* @param context
* @param property
* @return
@@ -120,7 +116,7 @@
protected int computeHashCode(FacesContext context) {
int hash = 0;
- for (Iterator iter = skinParams.keySet().iterator(); iter.hasNext(); ) {
+ for (Iterator iter = skinParams.keySet().iterator(); iter.hasNext();) {
String key = (String) iter.next();
Object parameter = getLocalParameter(context, key);
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/DefaultSkinImpl.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/skin/DefaultSkinImpl.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/skin/DefaultSkinImpl.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,14 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.skin;
+import javax.faces.context.FacesContext;
import java.util.Map;
-import javax.faces.context.FacesContext;
-
/**
* @author nick belaevski
* @since 3.2
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/skin/DummySkinConfiguration.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/skin/DummySkinConfiguration.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/skin/DummySkinConfiguration.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,15 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.skin;
import javax.faces.context.FacesContext;
/**
* @author shura
- *
*/
public class DummySkinConfiguration implements SkinConfiguration {
private Skin skin;
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinBean.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinBean.java 2009-12-04
20:49:13 UTC (rev 16072)
+++ root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinBean.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,14 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.skin;
import javax.faces.context.FacesContext;
-
import java.nio.ByteBuffer;
-
import java.util.AbstractMap;
import java.util.Collections;
import java.util.Set;
@@ -34,7 +30,6 @@
/**
* @author shura (latest modification by $Author: alexsmirnov $)
* @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:40 $
- *
*/
public class SkinBean extends AbstractMap implements Skin {
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,32 +19,24 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.skin;
import org.ajax4jsf.Messages;
import org.ajax4jsf.resource.util.URLToStreamHelper;
import org.ajax4jsf.util.ELUtils;
-
import org.richfaces.log.RichfacesLogger;
-
import org.slf4j.Logger;
import javax.el.ELContext;
import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
-
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
import javax.faces.context.FacesContext;
-
import java.io.IOException;
import java.io.InputStream;
-
import java.net.URL;
-
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -56,9 +48,15 @@
* files.
*
* @author shura
- *
*/
public class SkinFactoryImpl extends SkinFactory {
+ /**
+ * Name of web application init parameter for current default
+ * {@link javax.faces.render.RenderKit } interaction. by default -
+ * org.exadel.chameleon.RENDERKIT_DEFINITION . TODO Possible Values
+ */
+ public static final String RENDER_KIT_PARAMETER =
"org.ajax4jsf.RENDERKIT_DEFINITION";
+
private static final String A4J_BASE_SKIN_PARAMETER =
"org.ajax4jsf.BASE_SKIN";
private static final String A4J_SKIN_PARAMETER = "org.ajax4jsf.SKIN";
@@ -74,15 +72,9 @@
*/
private static final String DEFAULT_SKIN_PATH =
"META-INF/skins/%s.skin.properties";
- /**
- * Name of web application init parameter for current default
- * {@link javax.faces.render.RenderKit } interaction. by default -
- * org.exadel.chameleon.RENDERKIT_DEFINITION . TODO Possible Values
- */
- public static final String RENDER_KIT_PARAMETER =
"org.ajax4jsf.RENDERKIT_DEFINITION";
private static final String[] THEME_PATHS =
{"META-INF/themes/%s.theme.properties", "%s.theme.properties"};
-// private static final String[] DEFAULT_SKIN_PATHS = { DEFAULT_SKIN_PATH };
+ // private static final String[] DEFAULT_SKIN_PATHS = { DEFAULT_SKIN_PATH };
private static final String USER_SKIN_PATH = "%s.skin.properties";
/**
@@ -96,13 +88,13 @@
private String baseSkinName = null;
private ValueExpression skinBinding = null;
-// private Properties defaultSkinProperties = null;
+ // private Properties defaultSkinProperties = null;
private String skinName = null;
// private static final String[] CONFIGURATIONS_PATHS = {
// "META-INF/skins/%s.configuration.properties",
// "%s.configuration.properties" };
-// private static final String[] DEFAULT_CONFIGURATION_PATHS = {
"META-INF/skins/DEFAULT.configuration.properties" };
+ // private static final String[] DEFAULT_CONFIGURATION_PATHS = {
"META-INF/skins/DEFAULT.configuration.properties" };
private Map<String, Skin> skins = new HashMap<String, Skin>();
private Map<String, Skin> baseSkins = new HashMap<String, Skin>();
private Map<String, Properties> sourceProperties = new HashMap<String,
Properties>();
@@ -194,17 +186,17 @@
if ((binding == null) && (skin == null)) {
String currentSkinName =
context.getExternalContext().getInitParameter(useBase
- ? BASE_SKIN_PARAMETER : SKIN_PARAMETER);
+ ? BASE_SKIN_PARAMETER : SKIN_PARAMETER);
if (null == currentSkinName) {
// Check for a old ( deprecated ) parameter name.
currentSkinName =
context.getExternalContext().getInitParameter(useBase
- ? A4J_BASE_SKIN_PARAMETER : A4J_SKIN_PARAMETER);
+ ? A4J_BASE_SKIN_PARAMETER : A4J_SKIN_PARAMETER);
if (null != currentSkinName) {
LOG.warn("Init parameter for a skin name changed to "
- + (useBase ? BASE_SKIN_PARAMETER : SKIN_PARAMETER));
+ + (useBase ? BASE_SKIN_PARAMETER : SKIN_PARAMETER));
}
}
@@ -273,13 +265,12 @@
* append in content to default properties. First, get it from
* META-INF/skins/ , next - from root package. for any place search order
* determined by {@link java.lang.ClassLoader } realisation.
- * @param name
- * name for builded skin.
- * @param defaultProperties
*
+ * @param name name for builded skin.
+ * @param defaultProperties
* @return skin instance for current name
* @throws SkinNotFoundException -
- * if no skin properies found for name.
+ * if no skin properies found for name.
*/
protected Skin buildSkin(FacesContext context, String name, boolean isBase) throws
SkinNotFoundException {
Properties skinParams;
@@ -312,9 +303,7 @@
/**
* @param name
* @param paths
- *
* @return
- *
* @throws SkinNotFoundException
*/
protected Properties loadProperties(String name, String[] paths) throws
SkinNotFoundException {
@@ -398,7 +387,7 @@
properties = loadProperties(name, THEME_PATHS);
} catch (SkinNotFoundException e) {
throw new
ThemeNotFoundException(Messages.getMessage(Messages.THEME_NOT_FOUND_ERROR, name),
- e.getCause());
+ e.getCause());
}
processProperties(facesContext, properties);
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinImpl.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2009-12-04
20:49:13 UTC (rev 16072)
+++ root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -21,11 +21,9 @@
package org.richfaces.skin;
+import javax.faces.context.FacesContext;
import java.util.Map;
-import javax.faces.context.FacesContext;
-
-
/**
* @author nick belaevski
* @since 3.2
@@ -35,23 +33,23 @@
private SkinFactoryImpl factoryImpl;
SkinImpl(Map properties, SkinFactoryImpl factoryImpl) {
- super(properties);
-
- this.factoryImpl = factoryImpl;
+ super(properties);
+
+ this.factoryImpl = factoryImpl;
}
protected Skin getBaseSkin(FacesContext context) {
- Object object = getLocalParameter(context, Skin.BASE_SKIN);
- Skin skin = null;
-
- if (object != null) {
- skin = factoryImpl.getSkinByName(context, object, false);
- }
-
- if (skin == null) {
- skin = factoryImpl.getBaseSkin(context);
- }
+ Object object = getLocalParameter(context, Skin.BASE_SKIN);
+ Skin skin = null;
- return skin;
+ if (object != null) {
+ skin = factoryImpl.getSkinByName(context, object, false);
+ }
+
+ if (skin == null) {
+ skin = factoryImpl.getBaseSkin(context);
+ }
+
+ return skin;
}
}
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinPropertyResolver.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinPropertyResolver.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinPropertyResolver.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,14 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.skin;
import org.ajax4jsf.Messages;
-
import org.richfaces.log.RichfacesLogger;
-
import org.slf4j.Logger;
import javax.faces.context.FacesContext;
@@ -35,9 +31,9 @@
/**
* Resolve Skin propertyes.
+ *
* @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $)
* @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:41 $
- *
*/
public class SkinPropertyResolver extends PropertyResolver {
private static final Logger LOG = RichfacesLogger.APPLICATION.getLogger();
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinVariableResolver.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinVariableResolver.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinVariableResolver.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.skin;
import org.richfaces.VersionBean;
@@ -32,9 +30,9 @@
/**
* Resolve current skin as EL Variable. e.g. #{chameleonSkin['color'] }
#{chameleonSkin.color}
* must be evaluated as Skin.getProperty(context,"color");
+ *
* @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $)
* @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:41 $
- *
*/
public class SkinVariableResolver extends VariableResolver {
public static final String CHAMELEON_VARIABLE_NAME = "vcp";
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/ThemeImpl.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/richfaces/skin/ThemeImpl.java 2009-12-04
20:49:13 UTC (rev 16072)
+++ root/framework/trunk/impl/src/main/java/org/richfaces/skin/ThemeImpl.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -1,18 +1,14 @@
-
/**
*
*/
package org.richfaces.skin;
-import java.util.Properties;
-
import javax.el.ValueExpression;
-
import javax.faces.context.FacesContext;
+import java.util.Properties;
/**
* @author asmirnov
- *
*/
public class ThemeImpl implements Theme {
private final Properties themeProperties;
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/package-info.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/skin/package-info.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/skin/package-info.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -1,4 +1,3 @@
-
/**
* Implementation of RichFaces skinning
*/
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/util/CollectionsUtils.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/util/CollectionsUtils.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/util/CollectionsUtils.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -1,7 +1,6 @@
-
/*
* $Id$
- */
+*/
package org.richfaces.util;
import java.util.Arrays;
@@ -14,8 +13,8 @@
/**
* <p class="changed_added_2_0"></p>
- * @author asmirnov(a)exadel.com
*
+ * @author asmirnov(a)exadel.com
*/
public final class CollectionsUtils {
private CollectionsUtils() {
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/util/ReferenceMap.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/util/ReferenceMap.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/util/ReferenceMap.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,14 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.util;
import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
-
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/util/RequestStateManager.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/util/RequestStateManager.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/util/RequestStateManager.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,15 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.util;
+import javax.faces.context.FacesContext;
import java.util.HashMap;
import java.util.Map;
-import javax.faces.context.FacesContext;
-
/**
* @author Nick Belaevski
* @since 4.0
@@ -35,7 +32,8 @@
public final class RequestStateManager {
private static final String CONTEXT_ATTRIBUTE_NAME =
RequestStateManager.class.getName();
- private RequestStateManager() {}
+ private RequestStateManager() {
+ }
// TODO remove this stuff
public static enum BooleanRequestStateVariable {
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/util/Util.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/richfaces/util/Util.java 2009-12-04
20:49:13 UTC (rev 16072)
+++ root/framework/trunk/impl/src/main/java/org/richfaces/util/Util.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -39,28 +39,33 @@
* GPL Version 2 license.
*/
-
-
package org.richfaces.util;
import org.ajax4jsf.Messages;
import org.ajax4jsf.util.base64.Codec;
-
import org.richfaces.log.RichfacesLogger;
-
import org.slf4j.Logger;
-import java.io.*;
-
+import javax.faces.FacesException;
+import javax.faces.application.ViewHandler;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.StreamCorruptedException;
+import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.nio.channels.WritableByteChannel;
-
import java.text.Format;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
@@ -69,11 +74,6 @@
import java.util.zip.Deflater;
import java.util.zip.Inflater;
-import javax.faces.FacesException;
-import javax.faces.application.ViewHandler;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-
/**
* @author Nick Belaevski
* @since 4.0
@@ -105,7 +105,8 @@
RFC1123_DATE_FORMATTER = format;
}
- private Util() {}
+ private Util() {
+ }
public static String getMappingForRequest(FacesContext context) {
ExternalContext externalContext = context.getExternalContext();
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/util/package-info.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/util/package-info.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/util/package-info.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -1,4 +1,3 @@
-
/**
* Utility classes
*/
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/MethodBindingMethodExpressionAdaptor.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/MethodBindingMethodExpressionAdaptor.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/MethodBindingMethodExpressionAdaptor.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,13 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.webapp.taglib;
import javax.el.ELException;
import javax.el.MethodExpression;
-
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
@@ -34,8 +31,8 @@
/**
* Maps {@link MethodExpression} to {@link MethodBinding}
- * @author Maksim Kaszynski
*
+ * @author Maksim Kaszynski
*/
@SuppressWarnings("deprecation")
public class MethodBindingMethodExpressionAdaptor extends MethodBinding implements
StateHolder {
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/MethodExpressionMethodBindingAdaptor.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/MethodExpressionMethodBindingAdaptor.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/MethodExpressionMethodBindingAdaptor.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,27 +19,22 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.webapp.taglib;
-import java.io.Serializable;
-
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.MethodExpression;
import javax.el.MethodInfo;
-
import javax.faces.FacesException;
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
import javax.faces.el.MethodBinding;
import javax.faces.el.MethodNotFoundException;
+import java.io.Serializable;
/**
* @author Maksim Kaszynski
- *
*/
@SuppressWarnings("deprecation")
public class MethodExpressionMethodBindingAdaptor extends MethodExpression implements
StateHolder, Serializable {
@@ -47,7 +42,8 @@
private MethodBinding binding;
private boolean tranzient;
- public MethodExpressionMethodBindingAdaptor() {}
+ public MethodExpressionMethodBindingAdaptor() {
+ }
public MethodExpressionMethodBindingAdaptor(MethodBinding binding) {
this.binding = binding;
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/SimpleComponentTag.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/SimpleComponentTag.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/SimpleComponentTag.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,13 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.webapp.taglib;
import javax.el.MethodExpression;
import javax.el.ValueExpression;
-
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.component.UIInput;
@@ -33,7 +30,6 @@
/**
* @author Maksim Kaszynski
- *
*/
public class SimpleComponentTag extends UIComponentELTagBase {
private MethodExpression action;
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,17 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.webapp.taglib;
import org.ajax4jsf.Messages;
-
import org.richfaces.component.UIDataAdaptor;
import javax.el.MethodExpression;
import javax.el.ValueExpression;
-
import javax.faces.component.ActionSource2;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
@@ -43,7 +39,6 @@
/**
* @author Maksim Kaszynski
- *
*/
public abstract class UIComponentELTagBase extends UIComponentELTag {
protected void setActionListenerProperty(UIComponent component, MethodExpression
actionListener) {
@@ -54,7 +49,7 @@
actionSource2.addActionListener(new
MethodExpressionActionListener(actionListener));
} else {
throw new
IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE2_ERROR,
- component.getClientId(getFacesContext())));
+ component.getClientId(getFacesContext())));
}
}
}
@@ -67,7 +62,7 @@
actionSource2.setActionExpression(action);
} else {
throw new
IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE2_ERROR,
- component.getClientId(getFacesContext())));
+ component.getClientId(getFacesContext())));
}
}
}
@@ -81,13 +76,13 @@
component.setValueExpression("converter", converter);
} else {
Converter conv =
FacesContext.getCurrentInstance().getApplication().createConverter(
- converter.getExpressionString());
+ converter.getExpressionString());
output.setConverter(conv);
}
} else {
throw new
IllegalArgumentException(Messages.getMessage(Messages.NO_VALUE_HOLDER_ERROR,
- component.getClass().getName()));
+ component.getClass().getName()));
}
}
}
@@ -101,13 +96,13 @@
component.setValueExpression("rowKeyConverter",
converter);
} else {
Converter conv =
FacesContext.getCurrentInstance().getApplication().createConverter(
- converter.getExpressionString());
+ converter.getExpressionString());
data.setRowKeyConverter(conv);
}
} else {
throw new
IllegalArgumentException(Messages.getMessage(Messages.NO_DATA_ADAPTOR,
- component.getClass().getName()));
+ component.getClass().getName()));
}
}
}
@@ -120,7 +115,7 @@
input.addValidator(new MethodExpressionValidator(validator));
} else {
throw new
IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR,
- component.getId()));
+ component.getId()));
}
}
}
@@ -133,7 +128,7 @@
input.addValueChangeListener(new
MethodExpressionValueChangeListener(valueChangeListener));
} else {
throw new
IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR,
- component.getId()));
+ component.getId()));
}
}
}
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/ValueBindingValueExpressionAdaptor.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/ValueBindingValueExpressionAdaptor.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/ValueBindingValueExpressionAdaptor.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -19,13 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.webapp.taglib;
import javax.el.ELException;
import javax.el.ValueExpression;
-
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
@@ -34,7 +31,6 @@
/**
* @author Maksim Kaszynski
- *
*/
@SuppressWarnings("deprecation")
public class ValueBindingValueExpressionAdaptor extends ValueBinding implements
StateHolder {
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/package-info.java
===================================================================
---
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/package-info.java 2009-12-04
20:49:13 UTC (rev 16072)
+++
root/framework/trunk/impl/src/main/java/org/richfaces/webapp/taglib/package-info.java 2009-12-04
20:53:17 UTC (rev 16073)
@@ -1,4 +1,3 @@
-
/**
* Basic tag classes
*/