You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by aw...@apache.org on 2007/05/16 01:42:49 UTC
svn commit: r538387 [3/13] - in /myfaces/trinidad/trunk:
plugins/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/
trinidad/
trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/
trinidad/trini...
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java Tue May 15 16:42:41 2007
@@ -193,8 +193,6 @@
RenderingContext arc
)
{
- if (_styleClassMap != null)
- return _styleClassMap;
return _baseSkin.getStyleClassMap(arc);
}
@@ -636,7 +634,6 @@
private SkinImpl _baseSkin;
private String _styleSheetName;
private String _bundleName;
- private Map<String, String> _styleClassMap;
// Now that we look into possibly multiple ResourceBundles
// to find a translation (eg. the local bundle, a component
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java Tue May 15 16:42:41 2007
@@ -425,9 +425,6 @@
@Override
public Object getProperty(Object key)
{
- if (_properties == null)
- return null;
-
return _properties.get(key);
}
@@ -435,14 +432,11 @@
* Sets a value for the specified property key.
*/
@Override
- synchronized public void setProperty(
+ public void setProperty(
Object key,
Object value
)
{
- if (_properties == null)
- _properties = new ConcurrentHashMap<Object, Object>();
-
_properties.put(key, value);
}
@@ -655,7 +649,7 @@
private StyleSheetEntry[] _extensionStyleSheets;
// HashMap of Skin properties
- private ConcurrentHashMap<Object, Object> _properties;
+ private ConcurrentHashMap<Object, Object> _properties= new ConcurrentHashMap<Object, Object>();
// Map of property to class type
private static final Map<String, Class<?>> _PROPERTY_CLASS_TYPE_MAP;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleProvider.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleProvider.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleProvider.java Tue May 15 16:42:41 2007
@@ -232,6 +232,12 @@
@Override
public boolean equals(Object o)
{
+ if (o == this)
+ return true;
+
+ if (!(o instanceof ProviderKey))
+ return false;
+
ProviderKey key = (ProviderKey)o;
return (_equals(_skin, key._skin) &&
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CSSStyle.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CSSStyle.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CSSStyle.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CSSStyle.java Tue May 15 16:42:41 2007
@@ -188,4 +188,5 @@
// Default length for inline string buffer
private static final int _DEFAULT_BUFFER_SIZE = 100;
+ private static final long serialVersionUID = 1L;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java Tue May 15 16:42:41 2007
@@ -809,16 +809,14 @@
// We explicitly wrap the NameResolver in a CachingNameResolver
// since that conveniently handles checking for modifications to
// dependent (imported) files.
- if (!(resolver instanceof CachingNameResolver))
- {
- // The default storage for cached files is a bit large,
- // so we use a smaller hash table. Also, always enable
- // modification checking.
- resolver = new CachingNameResolver(resolver,
- new Hashtable<Object, InputStreamProvider>(17),
- true);
- }
-
+ // The default storage for cached files is a bit large,
+ // so we use a smaller hash table. Also, always enable
+ // modification checking.
+ // FIXME: Should probably be a ConcurrentHashMap
+ resolver = new CachingNameResolver(resolver,
+ new Hashtable<Object, InputStreamProvider>(17),
+ true);
+
_resolver = resolver;
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java Tue May 15 16:42:41 2007
@@ -443,10 +443,13 @@
String namespace,
Map<String, String> afSelectorMap)
{
+ if (selector == null)
+ return null;
+
int afIndex = selector.indexOf(namespace);
- // null or no namespace in the selector, so just return null
- if ((selector == null) || (afIndex == -1))
+ // no namespace in the selector, so just return null
+ if (afIndex == -1)
return null;
ArrayList<String> afUnmappedSelectorList = new ArrayList<String>();
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java Tue May 15 16:42:41 2007
@@ -717,12 +717,12 @@
private static Color _getSharedColor(int rgb)
{
- Color sharedColor = _sColorCache.get(new Integer(rgb));
+ Color sharedColor = _sColorCache.get(Integer.valueOf(rgb));
if (sharedColor == null)
{
sharedColor = new Color(rgb);
- _sColorCache.put(new Integer(rgb), sharedColor);
+ _sColorCache.put(Integer.valueOf(rgb), sharedColor);
}
return sharedColor;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/FontProxy.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/FontProxy.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/FontProxy.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/FontProxy.java Tue May 15 16:42:41 2007
@@ -103,8 +103,8 @@
return (
(_style == stub._style) &&
(_size == stub._size) &&
- ((_name == stub._name) || // _name maybe null
- ((_name != null) && _name.equalsIgnoreCase(stub._name)))
+ (((_name == null) && (stub._name == null)) || // _name maybe null
+ ((_name != null) && _name.equalsIgnoreCase(stub._name)))
);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java Tue May 15 16:42:41 2007
@@ -33,7 +33,7 @@
public PropertyNode(String name, String value)
{
- if (name == null || name == "")
+ if (name == null || "".equals(name))
throw new IllegalArgumentException("PropertyNode's name cannot be null or the empty string." +
"name is '" + name + "' and value is '"+ value + "'");
_name = name;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java Tue May 15 16:42:41 2007
@@ -304,6 +304,7 @@
// must be transient because UIComponent is not Serializable.
private transient final UIComponent _facet;
private final String _findId;
+ private static final long serialVersionUID = 1L;
}
private static final String _REGION_TYPE_ATTRIBUTE =
@@ -311,4 +312,5 @@
private static final String _RELOCATED_FACETS_ATTRIBUTE =
"org.apache.myfaces.trinidadinternal.taglib.RegionTag.facets.relocated";
private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(ComponentRefTag.class);
-}
+
+}
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java Tue May 15 16:42:41 2007
@@ -175,11 +175,11 @@
{
_updateLoopStatus();
_propertyReplacementMap = new HashMap<String, Object>(9, 1);
- _propertyReplacementMap.put("begin", new Integer(_currentBegin));
- _propertyReplacementMap.put("end", new Integer(_currentEnd));
- _propertyReplacementMap.put("step", new Integer(_currentStep));
- _propertyReplacementMap.put("count", new Integer(_currentCount));
- _propertyReplacementMap.put("index", new Integer(_currentIndex));
+ _propertyReplacementMap.put("begin", Integer.valueOf(_currentBegin));
+ _propertyReplacementMap.put("end", Integer.valueOf(_currentEnd));
+ _propertyReplacementMap.put("step", Integer.valueOf(_currentStep));
+ _propertyReplacementMap.put("count", Integer.valueOf(_currentCount));
+ _propertyReplacementMap.put("index", Integer.valueOf(_currentIndex));
_propertyReplacementMap.put("current", _varReplacement);
_propertyReplacementMap.put(
"first",
@@ -230,8 +230,8 @@
"last",
(_isLast)? Boolean.TRUE:Boolean.FALSE);
}
- _propertyReplacementMap.put("count", new Integer(_currentCount));
- _propertyReplacementMap.put("index", new Integer(_currentIndex));
+ _propertyReplacementMap.put("count", Integer.valueOf(_currentCount));
+ _propertyReplacementMap.put("index", Integer.valueOf(_currentIndex));
_propertyReplacementMap.put("current", _varReplacement);
}
@@ -337,10 +337,11 @@
}
}
//pu: This is our own check - c:forEach behavior un-defined & unpredictable.
- if (_var == _varStatus)
+ if ((_var != null) &&
+ _var.equals(_varStatus))
{
throw new JspTagException(
- "'var' and 'varStatus' must not have same value");
+ "'var' and 'varStatus' should not have same value");
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/VirtualAttributeUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/VirtualAttributeUtils.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/VirtualAttributeUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/VirtualAttributeUtils.java Tue May 15 16:42:41 2007
@@ -45,7 +45,7 @@
if (accessKeyIndex != StringUtils.MNEMONIC_INDEX_NONE)
{
bean.setProperty(accessKeyKey,
- new Character(text.charAt(accessKeyIndex + 1)));
+ Character.valueOf(text.charAt(accessKeyIndex + 1)));
}
// set the stripped text on the node using the appropriate attribute name
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeUtils.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeUtils.java Tue May 15 16:42:41 2007
@@ -120,7 +120,7 @@
// set the acesskey on the node
node.setAttributeValue(
ACCESS_KEY_ATTR,
- new Character(embeddedText.charAt(accessKeyIndex + 1)));
+ Character.valueOf(embeddedText.charAt(accessKeyIndex + 1)));
}
// set the stripped text on the node using the appropriate attribute name
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderedNodeRenderingContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderedNodeRenderingContext.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderedNodeRenderingContext.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderedNodeRenderingContext.java Tue May 15 16:42:41 2007
@@ -147,7 +147,7 @@
Object key
)
{
- if (namespace != UIConstants.MARLIN_NAMESPACE)
+ if (!UIConstants.MARLIN_NAMESPACE.equals(namespace))
{
return _properties.get(namespace, key);
}
@@ -167,7 +167,7 @@
Object value
)
{
- if (namespace != UIConstants.MARLIN_NAMESPACE)
+ if (!UIConstants.MARLIN_NAMESPACE.equals(namespace))
{
_properties.put(namespace, key, value);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java Tue May 15 16:42:41 2007
@@ -341,7 +341,7 @@
if (o == null)
{
- if (ImageConstants.TECATE_NAMESPACE == namespace)
+ if (ImageConstants.TECATE_NAMESPACE.equals(namespace))
{
if (ImageConstants.IMAGE_PROVIDER_PROPERTY == key)
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java Tue May 15 16:42:41 2007
@@ -109,7 +109,7 @@
{
if (BaseLafRenderer.supportsScripting(context))
{
- String returnScript = ((Boolean.TRUE == returnVal)
+ String returnScript = (Boolean.TRUE.equals(returnVal)
? TRUE_RETURN_SCRIPT
: FALSE_RETURN_SCRIPT);
@@ -466,7 +466,7 @@
*/
public void setParameters(Parameter[] parameters)
{
- _parameters = parameters;
+ _parameters = parameters == null ? null : parameters.clone();
}
/**
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java Tue May 15 16:42:41 2007
@@ -319,7 +319,7 @@
*/
public final void setTargets(String[] partialTargets)
{
- _targets = partialTargets;
+ _targets = (partialTargets == null) ? null : partialTargets.clone();
}
/**
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java Tue May 15 16:42:41 2007
@@ -144,7 +144,7 @@
catch (CloneNotSupportedException cnse)
{
// Should never reach here
- return null;
+ throw new IllegalStateException();
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java Tue May 15 16:42:41 2007
@@ -94,7 +94,7 @@
if (context == null)
{
- value = super.getAttributeValue(context, attrKey);
+ value = super.getAttributeValue(null, attrKey);
}
else
{
@@ -122,7 +122,7 @@
if (context == null)
{
- count = super.getIndexedChildCount(context);
+ count = super.getIndexedChildCount(null);
}
else
{
@@ -169,7 +169,7 @@
if (context == null)
{
- child = createWrappedNode(super.getIndexedChild(context, childIndex),
+ child = createWrappedNode(super.getIndexedChild(null, childIndex),
_data,
_current);
}
@@ -203,7 +203,7 @@
if (context == null)
{
- child = createWrappedNode(super.getNamedChild(context, childName),
+ child = createWrappedNode(super.getNamedChild(null, childName),
_data,
_current);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java Tue May 15 16:42:41 2007
@@ -49,7 +49,7 @@
total = _first.size(context);
if (_second != null)
- return total += _second.size(context);
+ return total + _second.size(context);
return total;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AccessKeyBoundValue.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AccessKeyBoundValue.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AccessKeyBoundValue.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AccessKeyBoundValue.java Tue May 15 16:42:41 2007
@@ -71,7 +71,7 @@
if (accessKeyIndex == StringUtils.MNEMONIC_INDEX_NONE)
return null;
- return new Character(embeddedTextString.charAt(accessKeyIndex + 1));
+ return Character.valueOf(embeddedTextString.charAt(accessKeyIndex + 1));
}
else
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/EscapedTextFactory.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/EscapedTextFactory.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/EscapedTextFactory.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/EscapedTextFactory.java Tue May 15 16:42:41 2007
@@ -39,7 +39,7 @@
String baseText
)
{
- if (HTML_MIME_TYPE == mimeType)
+ if (HTML_MIME_TYPE.equals(mimeType))
{
String escapedText = HTMLEscapes.escapeText(baseText);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelExtension.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelExtension.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelExtension.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelExtension.java Tue May 15 16:42:41 2007
@@ -278,7 +278,7 @@
* @deprecated This class comes from the old Java 1.2 UIX codebase and should not be used anymore.
*/
@Deprecated
- private class RendererManagerProxy extends RendererManager
+ static private class RendererManagerProxy extends RendererManager
{
public RendererManagerProxy(
RendererManager rendererManager,
@@ -359,7 +359,7 @@
* @deprecated This class comes from the old Java 1.2 UIX codebase and should not be used anymore.
*/
@Deprecated
- private class RendererFactoryProxy implements RendererFactory
+ static private class RendererFactoryProxy implements RendererFactory
{
// Note: It might make sense for RendererFactoryProxy to
// extend RendererFactoryImpl, rather than creating a
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafConstants.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafConstants.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafConstants.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafConstants.java Tue May 15 16:42:41 2007
@@ -37,13 +37,13 @@
public static final char URI_DELIMITER = '/';
/** The Integer 0 */
- public static final Number ZERO = new Integer(0);
+ public static final Number ZERO = Integer.valueOf(0);
/** The Integer 1 */
- public static final Number ONE = new Integer(1);
+ public static final Number ONE = Integer.valueOf(1);
/** The Integer 2 */
- public static final Number TWO = new Integer(2);
+ public static final Number TWO = Integer.valueOf(2);
/** Value indicating the value was not found in the collection */
public static final Object NOT_FOUND = new Object();
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java Tue May 15 16:42:41 2007
@@ -1093,5 +1093,5 @@
private static final String _BASE_IMAGE_URI_PROPERTY = "baseImageURI";
- private static final Integer _UNSELECTED_INDEX = new Integer(-1);
+ private static final Integer _UNSELECTED_INDEX = Integer.valueOf(-1);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java Tue May 15 16:42:41 2007
@@ -522,7 +522,12 @@
if (UIConstants.FACET_PORTLET.equals(
context.getRendererManager().getFacet()) ||
(context.getPartialPageContext() != null))
- return (((Math.abs((new Random()).nextInt())) % 90) + 1) * 100;
+ {
+ synchronized (_STARTING_ID_COUNT)
+ {
+ return (Math.abs(_STARTING_ID_COUNT.nextInt() % 90) + 1) * 100;
+ }
+ }
return 0;
}
@@ -538,7 +543,7 @@
return getCharacter(charObj);
}
- static public char CHAR_UNDEFINED = (char) -1;
+ static public final char CHAR_UNDEFINED = (char) -1;
static public char getCharacter(Object charObj)
{
@@ -1132,5 +1137,6 @@
// the resources under this directory.
private static final String _BASE_DIRECTORY = "META-INF";
+ private static final Random _STARTING_ID_COUNT = new Random();
private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(BaseLafUtils.class);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java Tue May 15 16:42:41 2007
@@ -86,7 +86,7 @@
{
return _getEmailRendererManager();
}
- else if (_EDITABLE_FACET == facet)
+ else if (_EDITABLE_FACET.equals(facet))
{
return _getEditableRendererManager();
}
@@ -159,7 +159,7 @@
{
return _createEmailFactory();
}
- else if (_EDITABLE_FACET == facet)
+ else if (_EDITABLE_FACET.equals(facet))
{
return getDefaultFactory();
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java Tue May 15 16:42:41 2007
@@ -119,6 +119,8 @@
)
throws IOException
{
+ assert node != null;
+
boolean hasLink = (destination != null);
Object longDesc = getLongDesc(context, node);
String imageStyle = getImageStyle(context, node);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PanelTabbedRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PanelTabbedRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PanelTabbedRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PanelTabbedRenderer.java Tue May 15 16:42:41 2007
@@ -68,7 +68,7 @@
int resolvedSelectedIndex = _getResolvedSelectedIndex(context, node);
SubTabBarUtils.setSelectedIndex(
context,
- new Integer(resolvedSelectedIndex));
+ Integer.valueOf(resolvedSelectedIndex));
if (-1 != resolvedSelectedIndex)
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/MessageBoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/MessageBoxRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/MessageBoxRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/MessageBoxRenderer.java Tue May 15 16:42:41 2007
@@ -128,10 +128,11 @@
MarlinBean text = new MarlinBean(STYLED_TEXT_NAME);
RenderingContext arc = RenderingContext.getCurrentInstance();
FacesContext fContext = context.getFacesContext();
- icon.renderIcon(fContext, arc, null);
-
if (icon != null)
- writer.write(" ");
+ {
+ icon.renderIcon(fContext, arc, null);
+ writer.writeText(NBSP_STRING, null);
+ }
String messageKey = _MESSAGE_TYPE_KEYS[messageType];
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PanelTabbedRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PanelTabbedRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PanelTabbedRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PanelTabbedRenderer.java Tue May 15 16:42:41 2007
@@ -59,7 +59,7 @@
{
SubTabBarUtils.setSelectedIndex(
context,
- new Integer(_getResolvedSelectedIndex(context, node)));
+ Integer.valueOf(_getResolvedSelectedIndex(context, node)));
Renderer subTabBarRenderer =
context.getRendererManager().getRenderer(
MARLIN_NAMESPACE, SUB_TAB_BAR_NAME);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/BorderLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/BorderLayoutRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/BorderLayoutRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/BorderLayoutRenderer.java Tue May 15 16:42:41 2007
@@ -643,6 +643,6 @@
hasRenderedNamedChild(context, node, INNER_END_CHILD));
}
- private static final Integer _ZERO = new Integer(0);
+ private static final Integer _ZERO = Integer.valueOf(0);
private static final Object _HAS_SIDE_NODES = new Object();
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java Tue May 15 16:42:41 2007
@@ -93,8 +93,8 @@
}
else if ( value != null)
{
- boolean immediate = Boolean.TRUE.equals(
- attributes.get(UIXCommand.IMMEDIATE_KEY));
+ boolean immediate = Boolean.TRUE.equals(
+ attributes.get("immediate"));
String validate = immediate?"0":"1";
value = value.toString() + '[' + validate + ']';
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java Tue May 15 16:42:41 2007
@@ -381,7 +381,7 @@
* @deprecated
*/
@Deprecated
- public static MutableUINode PDA_SPACE = new HTMLWebBean("div");
+ public static final MutableUINode PDA_SPACE = new HTMLWebBean("div");
static{
MarlinBean spacer = new MarlinBean(SPACER_NAME);
spacer.setAttributeValue(WIDTH_ATTR, "1");
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java Tue May 15 16:42:41 2007
@@ -209,7 +209,7 @@
boolean isDisabled)
{
this(id, text, shortDesc, destination, onClick,
- targetFrame, accessKey, isSelected, isDisabled, new Integer(0), null);
+ targetFrame, accessKey, isSelected, isDisabled, Integer.valueOf(0), null);
}
public LinkDataObject(Object id,
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java Tue May 15 16:42:41 2007
@@ -1993,8 +1993,8 @@
String endParam;
if (indexNames != null)
{
- Long startNum = new Long(start);
- Long endNum = new Long(start + currVisible - 1);
+ Long startNum = Long.valueOf(start);
+ Long endNum = Long.valueOf(start + currVisible - 1);
Object o = indexNames.selectValue(context, startNum);
if (o != null)
startParam = o.toString();
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java Tue May 15 16:42:41 2007
@@ -99,7 +99,7 @@
newCount = globalCount.intValue();
compID.append(newCount++);
}
- countHash.put(baseid, new Integer(newCount));
+ countHash.put(baseid, Integer.valueOf(newCount));
context.setProperty(UIConstants.MARLIN_NAMESPACE, _EXT_KEY, countHash);
idExt = compID.toString();
context.setLocalProperty(_EXT_KEY, idExt);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java Tue May 15 16:42:41 2007
@@ -74,7 +74,7 @@
value = (Boolean)skin.getProperty(_IMAGE_BUTTON_KEY);
if (value != null)
- return (Boolean.TRUE == value);
+ return (Boolean.TRUE.equals(value));
// we fetch different icons if we are in the
// right-to-left reading direction. context.getIcon takes care of
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java Tue May 15 16:42:41 2007
@@ -68,7 +68,8 @@
if (_name == null || _value == null)
return null;
- return new SkinPropertyNode(_selector, _name, _value);
+ // _selector was never set: a bug?
+ return new SkinPropertyNode(/*_selector*/null, _name, _value);
}
@Override
@@ -100,7 +101,7 @@
}
// Name/value of the property
- private String _selector;
+ // private String _selector;
private String _name;
private String _value;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JavaIntrospector.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JavaIntrospector.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JavaIntrospector.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JavaIntrospector.java Tue May 15 16:42:41 2007
@@ -257,7 +257,10 @@
*/
public static String[] getBeanInfoSearchPath()
{
- return _sSearchPath;
+ if (_sSearchPath == null)
+ return null;
+
+ return _sSearchPath.clone();
}
@@ -270,7 +273,7 @@
String path[]
)
{
- _sSearchPath = path;
+ _sSearchPath = path == null ? null : path.clone();
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/TokenCache.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/TokenCache.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/TokenCache.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/TokenCache.java Tue May 15 16:42:41 2007
@@ -40,7 +40,7 @@
/**
* Character guaranteed to not be used in tokens
*/
- static public char SEPARATOR_CHAR = '.';
+ static public final char SEPARATOR_CHAR = '.';
/**
* Gets a TokenCache from the session, creating it if needed.
@@ -124,11 +124,15 @@
token = _getNextToken();
assert(_removed == null);
+ // NOTE: this put() has a side-effect that can result
+ // in _removed being non-null afterwards
_cache.put(token, token);
remove = _removed;
_removed = null;
}
+ // This looks like "remove" must be null - given the
+ // assert above.
if (remove != null)
targetStore.remove(remove);
@@ -224,6 +228,7 @@
static private final boolean _USE_SESSION_TO_SEED_ID = true;
static private final int _DEFAULT_SIZE = 15;
+ static private final long serialVersionUID = 1L;
static private final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(TokenCache.class);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java Tue May 15 16:42:41 2007
@@ -218,7 +218,7 @@
* and handle them correctly.
*/
@SuppressWarnings("deprecation")
- private class MonitorRedirectServletResponse
+ static private class MonitorRedirectServletResponse
extends HttpServletResponseWrapper
{
public MonitorRedirectServletResponse(HttpServletResponse response,
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimal-golden.xml?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimal-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimal-golden.xml Tue May 15 16:42:41 2007
@@ -32,8 +32,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -73,8 +73,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -114,8 +114,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -155,8 +155,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -196,8 +196,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -237,8 +237,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -278,8 +278,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -319,8 +319,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -360,8 +360,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(1);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -401,8 +401,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -442,8 +442,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -484,8 +484,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalIE-golden.xml?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalIE-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalIE-golden.xml Tue May 15 16:42:41 2007
@@ -32,8 +32,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -73,8 +73,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -114,8 +114,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -155,8 +155,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -196,8 +196,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -237,8 +237,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -278,8 +278,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -319,8 +319,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -360,8 +360,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(1);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -401,8 +401,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -442,8 +442,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -484,8 +484,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalIERtl-golden.xml?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalIERtl-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalIERtl-golden.xml Tue May 15 16:42:41 2007
@@ -32,8 +32,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -73,8 +73,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -114,8 +114,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -155,8 +155,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -196,8 +196,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -237,8 +237,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -278,8 +278,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -319,8 +319,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -360,8 +360,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(1);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -401,8 +401,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -442,8 +442,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -484,8 +484,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>Unable to load SVG plugin. Please install the plugin from <a href=\'#\' onclick=\"window.open(\'http://www.adobe.com/svg/viewer/install/main.html\')\">Adobe</a><H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalInacc-golden.xml?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalInacc-golden.xml Tue May 15 16:42:41 2007
@@ -32,8 +32,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -73,8 +73,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -114,8 +114,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -155,8 +155,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -196,8 +196,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -237,8 +237,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -278,8 +278,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -319,8 +319,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -360,8 +360,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(1);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -401,8 +401,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -442,8 +442,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>
@@ -484,8 +484,8 @@
apacheChart.setTooltipsVisible(true);
apacheChart.setMaxPrecision(0);
apacheChart.setFormName('formId');
-apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>\n ');
-apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>\n ');
+apacheChart.setErrorHtml('<H4>This component needs an SVG enabled browser like Internet Explorer, Firefox 1.5+ or Opera 9.0+<H4>');
+apacheChart.setStatusHtml('<H4><H4>Please Wait. Attempting to load SVG document...</H4><H4>');
apacheChart.draw();
</script>