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 [2/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/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java Tue May 15 16:42:41 2007
@@ -142,9 +142,9 @@
// be sufficient, and behavior will still be correct even
// if it was somehow not (we'll just spend more time re-getting the
// RenderKit)
- if (renderKitId != _renderKitId)
+ if (renderKitId != _cachedRenderKitId)
{
- _renderKitId = renderKitId;
+ _cachedRenderKitId = renderKitId;
_kit = _base.getRenderKit();
}
}
@@ -233,7 +233,9 @@
private final FacesContext _base;
private final ExternalContext _external;
- private String _renderKitId;
+ // An Object, not a String, so that FindBugs won't complain
+ // about this usage of instance equality
+ private Object _cachedRenderKitId;
private RenderKit _kit;
static private final String _CONFIG_IN_CONTEXT = FacesContextFactoryImpl.class.getName()+".CONFIG_IN_CONTEXT";
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java Tue May 15 16:42:41 2007
@@ -28,7 +28,7 @@
public class RequestContextBean extends FacesBeanImpl
{
- static public Type TYPE = new Type();
+ static public final Type TYPE = new Type();
static public final PropertyKey PAGE_FLOW_SCOPE_LIFETIME_KEY =
TYPE.registerKey("process-scope-lifetime",
Integer.class,
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java Tue May 15 16:42:41 2007
@@ -101,7 +101,7 @@
return _bean;
}
- private RequestContextBean _bean;
+ private volatile RequestContextBean _bean;
private PageResolver _pageResolver;
private PageFlowScopeProvider _pageFlowScopeProvider;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/BaseConverter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/BaseConverter.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/BaseConverter.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/BaseConverter.java Tue May 15 16:42:41 2007
@@ -50,17 +50,17 @@
// identity-equality is used since these are all final classes:
if ((targetType == Integer.class) || (targetType == Integer.TYPE))
- return new Integer(num.intValue());
+ return Integer.valueOf(num.intValue());
if ((targetType == Byte.class) || (targetType == Byte.TYPE))
- return new Byte(num.byteValue());
+ return Byte.valueOf(num.byteValue());
if ((targetType == Double.class) || (targetType == Double.TYPE))
- return new Double(num.doubleValue());
+ return Double.valueOf(num.doubleValue());
if ((targetType == Float.class) || (targetType == Float.TYPE))
- return new Float(num.floatValue());
+ return Float.valueOf(num.floatValue());
if ((targetType == Long.class) || (targetType == Long.TYPE))
- return new Long(num.longValue());
+ return Long.valueOf(num.longValue());
if ((targetType == Short.class) || (targetType == Short.TYPE))
- return new Short(num.shortValue());
+ return Short.valueOf(num.shortValue());
if (targetType == BigDecimal.class)
return new BigDecimal(num.doubleValue());
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java Tue May 15 16:42:41 2007
@@ -430,7 +430,7 @@
{
try
{
- DateFormat format = getDateFormat(context, datePattern, false);
+ DateFormat format = getDateFormat(context, null, false);
if ((format != null) && (format instanceof SimpleDateFormat))
{
datePattern = ((SimpleDateFormat) format).toPattern();
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.java Tue May 15 16:42:41 2007
@@ -192,7 +192,8 @@
}
//cache the result of the search
- _localeSpecificServlets.put(desiredLocale, servletLocation);
+ if (servletLocation != null)
+ _localeSpecificServlets.put(desiredLocale, servletLocation);
}
return servletLocation;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.java Tue May 15 16:42:41 2007
@@ -60,7 +60,7 @@
/**
* Implementation of ImageType.getProperty().
*/
- public Object getProperty(Object key)
+ synchronized public Object getProperty(Object key)
{
Object value = _properties.get(key);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/CompositeButtonKey.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/CompositeButtonKey.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/CompositeButtonKey.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/CompositeButtonKey.java Tue May 15 16:42:41 2007
@@ -420,7 +420,7 @@
)
{
if (value != ACCESS_KEY_UNDEFINED)
- properties.put(key, new Character(value));
+ properties.put(key, Character.valueOf(value));
}
// Returns the default Foreground
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java Tue May 15 16:42:41 2007
@@ -1809,8 +1809,8 @@
private static final String _SIMPLIFIED_CHINESE_DIRECTORY = "zhs";
private static final String _TRADITIONAL_CHINESE_DIRECTORY = "zht";
- private static final Integer _TEST_WIDTH = new Integer(23);
- private static final Integer _TEST_HEIGHT = new Integer(32);
+ private static final Integer _TEST_WIDTH = Integer.valueOf(23);
+ private static final Integer _TEST_HEIGHT = Integer.valueOf(32);
// Configuration property to test whether GIF support is enabled.
private static final String _GIF_ENABLED = "gifEnabled";
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FlippedIconKey.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FlippedIconKey.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FlippedIconKey.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FlippedIconKey.java Tue May 15 16:42:41 2007
@@ -86,6 +86,9 @@
if (this == o)
return true;
+ if (!(o instanceof FlippedIconKey))
+ return false;
+
FlippedIconKey key = (FlippedIconKey)o;
return (_source.equals(key._source) );
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/GifEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/GifEncoder.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/GifEncoder.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/GifEncoder.java Tue May 15 16:42:41 2007
@@ -333,7 +333,7 @@
int sqnc = 0; // the prefix string of colors
int newcol = 0; // the new color
int sqnc_newcol = 0; // concatenation of the above
- Integer fsqnc_newcol = new Integer(0);
+ Integer fsqnc_newcol = null;
@@ -516,7 +516,7 @@
private static final int _MAXIMUM_COLOR_TABLE_SIZE = 256;
private static final int _NO_COLOR = -2;
private static final int _TRANSPARENT_COLOR = -1;
- private static final byte[] _HEADER = new String("GIF89a").getBytes();
+ private static final byte[] _HEADER = "GIF89a".getBytes();
// under this alpha value, pixels are taken to be transparent
private static final int _TRANSPARENCY_THRESHHOLD = 1;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/OctreeNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/OctreeNode.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/OctreeNode.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/OctreeNode.java Tue May 15 16:42:41 2007
@@ -156,7 +156,6 @@
private OctreeNode(OctreeNode p)
{
this(p._getTree());
- _parent=p;
_level = p._getLevel()+1;
p._incChildren();
}
@@ -213,10 +212,6 @@
private int _children; // how many leaves are filled
private OctreeNode[] _leaf; // 8 children of node
private int _pixels; // how many pixels have passed through this node
- // -= Simon Lessard =-
- // FIXME: Never read locally
- @SuppressWarnings("unused")
- private OctreeNode _parent; // parent node in tree
private int _level; // where does this node lie in the tree?
private OctreeNode _next; // next node at this level
private int _maxLevel; // lowest permissible depth at this node
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/OracleGIFEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/OracleGIFEncoder.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/OracleGIFEncoder.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/OracleGIFEncoder.java Tue May 15 16:42:41 2007
@@ -22,8 +22,6 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-
/**
* ImageEncoder implementation for the Oracle GIF encoder.
*
@@ -38,25 +36,6 @@
public void encodeImage(Image image, OutputStream out)
throws IOException
{
- // We need to create a new GIFEncoder instance for each encoding
- if(_REPORT_TIMING)
- {
- System.gc();
- _lastTime = System.currentTimeMillis();
- }
-
GifEncoder.encode(image, out); // pass through the encoder
-
- if (_REPORT_TIMING && _LOG.isInfo())
- {
- // System.out.println(Timing.getElapsedString(_lastTime) +
- // " secs to encode gif");
- _LOG.info("ELAPSED_TIME_ENCODING_GIF", (System.currentTimeMillis()-_lastTime) / 1000.0);
-
- }
}
-
- private static final boolean _REPORT_TIMING = false;
- private long _lastTime=0;
- private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(OracleGIFEncoder.class);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/PNGEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/PNGEncoder.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/PNGEncoder.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/PNGEncoder.java Tue May 15 16:42:41 2007
@@ -285,12 +285,10 @@
int count = colors.size();
byte[] data = new byte[count * 3];
- Iterator<Color> e = colors.keySet().iterator();
-
- while (e.hasNext())
+ for (Map.Entry<Color, Integer> entry : colors.entrySet())
{
- Color color = e.next();
- int index = colors.get(color).intValue() * 3;
+ Color color = entry.getKey();
+ int index = entry.getValue().intValue() * 3;
int rgb = color.getRGB();
data[index] = _getRed(rgb);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/CompositeButtonPainter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/CompositeButtonPainter.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/CompositeButtonPainter.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/CompositeButtonPainter.java Tue May 15 16:42:41 2007
@@ -122,7 +122,7 @@
bottomInset += halfInsets;
// If we've got an extra pixel, tack it on the top
- if ((vertInsets % 2) == 1)
+ if ((vertInsets % 2) != 0)
topInset++;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/SourceUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/SourceUtils.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/SourceUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/SourceUtils.java Tue May 15 16:42:41 2007
@@ -115,7 +115,7 @@
String source = (String) properties.get(ImageConstants.SOURCE_KEY);
if (source != null)
- source += ("for source icon " + source);
+ message += ("for source icon " + source);
_LOG.warning(message, t);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/CompositeButtonParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/CompositeButtonParser.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/CompositeButtonParser.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/CompositeButtonParser.java Tue May 15 16:42:41 2007
@@ -77,7 +77,7 @@
if (index != -1)
{
- accessKey = new Character(text.charAt(index));
+ accessKey = Character.valueOf(text.charAt(index));
setProperty(ImageConstants.ACCESS_KEY_KEY, accessKey);
}
}
@@ -140,7 +140,7 @@
if ((value == null) || (value.length() == 0))
return null;
- return new Character(value.charAt(0));
+ return Character.valueOf(value.charAt(0));
}
/**
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/DebugResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/DebugResponseWriter.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/DebugResponseWriter.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/DebugResponseWriter.java Tue May 15 16:42:41 2007
@@ -72,7 +72,7 @@
{
_LOG.warning("ELEMENTS_NOT_CLOSED");
for (int i = _elementStack.size() - 1; i >=0; i--)
- _LOG.warning(_elementStack.elementAt(i).toString());
+ _LOG.warning(_elementStack.elementAt(i));
}
}
@@ -222,7 +222,7 @@
// For non HTML mark up, do not check for duplicate ids Bug#4340857
if (_elementStack.size() > 0)
{
- if(_elementStack.peek().toString().indexOf(":") == -1)
+ if(_elementStack.peek().indexOf(":") == -1)
_checkDuplicateIds(value);
}
else
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java Tue May 15 16:42:41 2007
@@ -199,10 +199,12 @@
Class<?> valueClass = value.getClass();
// See what attribute we were involved in
+ // FIXME: delete the _currAttr code, which is unused and contrary
+ // to the JSF spec
String currAttr = _currAttr;
if (currAttr != null)
{
- if (currAttr == name)
+ if (currAttr.equals(name))
{
_writeValue(valueClass, value, true);
return;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java Tue May 15 16:42:41 2007
@@ -52,7 +52,8 @@
String encoding) throws UnsupportedEncodingException
{
_out = out;
- _contentType = contentType;
+ // Ignored: getContentType() always identifies this as XHTML
+ //_contentType = contentType;
_encoding = encoding;
CaboHttpUtils.validateEncoding(encoding);
}
@@ -469,10 +470,6 @@
private boolean _dontEscape;
private Writer _out;
- // -= Simon Lessard =-
- // FIXME: Never read locally
- @SuppressWarnings("unused")
- private String _contentType;
private String _encoding;
// holds an element that will only be started if it has attributes
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java Tue May 15 16:42:41 2007
@@ -110,17 +110,10 @@
super();
// Init the essential maps
- if (_treeModelMap == null)
- _treeModelMap = new HashMap<String, TreeModel>();
-
- if (_viewIdFocusPathMapMap == null)
- _viewIdFocusPathMapMap = new HashMap<Object, Map<String, List<Object>>>();
-
- if (_nodeFocusPathMapMap == null)
- _nodeFocusPathMapMap = new HashMap<Object, Map<Object, List<Object>>>();
-
- if (_idNodeMapMap == null)
- _idNodeMapMap = new HashMap<Object, Map<String, Object>>();
+ _treeModelMap = new HashMap<String, TreeModel>();
+ _viewIdFocusPathMapMap = new HashMap<Object, Map<String, List<Object>>>();
+ _nodeFocusPathMapMap = new HashMap<Object, Map<Object, List<Object>>>();
+ _idNodeMapMap = new HashMap<Object, Map<String, Object>>();
}
/**
@@ -957,6 +950,7 @@
private String _localModelUri = null;
// Root Menu model's Session map key
+ // FIXME: this is static, but written to from instances!
private static String _rootModelKey = null;
// Nodes
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java Tue May 15 16:42:41 2007
@@ -42,7 +42,7 @@
*/
public MenuNode()
{
- _nodeSysId = (new Integer(System.identityHashCode(this))).toString();
+ _nodeSysId = Integer.valueOf(System.identityHashCode(this)).toString();
}
/**
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java Tue May 15 16:42:41 2007
@@ -263,7 +263,6 @@
private ResourceBundle _bundle;
private Locale _locale;
private List<String> _values;
- Object retVal = null;
public _BundleMap(ResourceBundle bundle)
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java Tue May 15 16:42:41 2007
@@ -91,33 +91,33 @@
* The default output mode; if no output mode is set, or the requested
* output mode is not available, this output mode will be used.
*/
- static public String OUTPUT_MODE_DEFAULT = "default";
+ static public final String OUTPUT_MODE_DEFAULT = "default";
/**
* A portlet output mode; when supported, this output mode should
* result in a version of page content optimized for use in portlets.
*/
- static public String OUTPUT_MODE_PORTLET = "portlet";
+ static public final String OUTPUT_MODE_PORTLET = "portlet";
/**
* A printable output mode; when supported, this output mode should
* result in a version of a page designed for printouts.
*/
- static public String OUTPUT_MODE_PRINTABLE = "printable";
+ static public final String OUTPUT_MODE_PRINTABLE = "printable";
/**
* An e-mail output mode; when supported, this output mode should
* result in a version of page content optimized for use in e-mail.
*/
- static public String OUTPUT_MODE_EMAIL = "email";
+ static public final String OUTPUT_MODE_EMAIL = "email";
- static public String RETURN_PARAM = "rtrn";
+ static public final String RETURN_PARAM = "rtrn";
/**
* RenderKit ID for an internal and not-fully-functional kit
* that contains a base set of renderers.
*/
- static public String BASE_RENDER_KIT_ID = "org.apache.myfaces.trinidadinternal.core";
+ static public final String BASE_RENDER_KIT_ID = "org.apache.myfaces.trinidadinternal.core";
static public String getId()
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java Tue May 15 16:42:41 2007
@@ -459,14 +459,14 @@
String stateStyleClass,
boolean overflow) throws IOException
{
- if(stateStyleClass == _STATE_PARENT)
+ if (_STATE_PARENT.equals(stateStyleClass))
{
_renderJoin(context,
arc,
SkinSelectors.AF_TRAIN_PARENT_JOIN_STYLE_CLASS,
null);
}
- else if(overflow)
+ else if (overflow)
{
_renderJoin(context,
arc,
@@ -506,7 +506,7 @@
String stateStyleClass,
boolean overflow) throws IOException
{
- if(stateStyleClass == _STATE_PARENT)
+ if (_STATE_PARENT.equals(stateStyleClass))
{
_renderJoinIconBlock(context,
arc,
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java Tue May 15 16:42:41 2007
@@ -452,7 +452,7 @@
RequestContext requestContext = RequestContext.getCurrentInstance();
String preferredSkin = requestContext.getSkinFamily();
if (preferredSkin != null)
- comment += (" (" + preferredSkin.toString() + ")");
+ comment += (" (" + preferredSkin + ")");
}
context.getResponseWriter().writeComment(comment);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java Tue May 15 16:42:41 2007
@@ -1546,7 +1546,7 @@
private static final int _HALF_MAX_CHOICE_ITEMS = _MAX_CHOICE_ITEMS / 2;
- private static final int _MILLIS_IN_DAY = 1000 * 60 * 60 * 24;
+ private static final long _MILLIS_IN_DAY = 1000L * 60 * 60 * 24;
private static final long _MIN_TIME;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java Tue May 15 16:42:41 2007
@@ -110,7 +110,7 @@
if (accessKey != CHAR_UNDEFINED)
{
rw.writeAttribute("accesskey",
- new Character(accessKey),
+ Character.valueOf(accessKey),
"accessKey");
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java Tue May 15 16:42:41 2007
@@ -81,7 +81,7 @@
delegateRendererEnd(context, arc, component, bean, _html);
}
- private class Head extends HeadRenderer
+ static private class Head extends HeadRenderer
{
public Head(FacesBean.Type type)
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java Tue May 15 16:42:41 2007
@@ -1100,7 +1100,7 @@
// generate the hidden form field for this needed item
_renderHiddenField(writer, currName, neededValue);
- fData.addRenderedValue(currName.toString());
+ fData.addRenderedValue(currName);
}
}
@@ -1121,12 +1121,12 @@
writer.writeText(XhtmlUtils.getJSIdentifier(fData.getName()),
null);
writer.writeText("Names=[\"", null);
- writer.writeText(neededValues.get(0).toString(), null);
+ writer.writeText(neededValues.get(0), null);
for (int i = 1; i < realNeededIndex; i++)
{
writer.writeText("\",\"", null);
- writer.writeText(neededValues.get(i).toString(), null);
+ writer.writeText(neededValues.get(i), null);
}
writer.writeText("\"];", null);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java Tue May 15 16:42:41 2007
@@ -121,7 +121,7 @@
if (accessKey != CHAR_UNDEFINED)
{
rw.writeAttribute("accesskey",
- new Character(accessKey),
+ Character.valueOf(accessKey),
"accessKey");
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java Tue May 15 16:42:41 2007
@@ -99,7 +99,7 @@
if (accessKey != CHAR_UNDEFINED)
{
rw.writeAttribute("accesskey",
- new Character(accessKey),
+ Character.valueOf(accessKey),
"accessKey");
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java Tue May 15 16:42:41 2007
@@ -894,14 +894,14 @@
}
else if ( intHeight < Integer.MAX_VALUE )
{
- return IntegerUtils.getString(intHeight - controlData.height).toString();
+ return IntegerUtils.getString(intHeight - controlData.height);
}
}
if (useMinHeight)
{
return IntegerUtils.getString(playerData.minHeight.intValue() -
- controlData.height).toString();
+ controlData.height);
}
return height;
@@ -1568,7 +1568,7 @@
new MediaRenderer.ControlData(null, // all controls is the default
false, // no autosize
_QT_CONTROL_HEIGHT, // extra height
- new Integer(275)); // preferred width
+ Integer.valueOf(275)); // preferred width
private static final MediaRenderer.PlayerData _QUICKTIME_PLAYER_DATA =
new MediaRenderer.PlayerData(
@@ -1612,7 +1612,7 @@
CoreMedia.CONTROLS_MINIMAL, new MediaRenderer.ControlData(null, // all controls default
false, // no autosize
_QT_CONTROL_HEIGHT,
- new Integer(18)), // play button only
+ Integer.valueOf(18)), // play button only
CoreMedia.CONTROLS_TYPICAL, _QUICKTIME_ALL_CONTROL_DATA,
CoreMedia.CONTROLS_ALL, _QUICKTIME_ALL_CONTROL_DATA,
}),
@@ -1656,7 +1656,7 @@
//
// preferred width of WMP showing all controls
- private static final Number _WMP_ALL_CONTROLS_WIDTH = new Integer(275);
+ private static final Number _WMP_ALL_CONTROLS_WIDTH = Integer.valueOf(275);
private static final Number _WMP_MINIMAL_CONTROLS_WIDTH =
72;
@@ -1749,13 +1749,13 @@
//
// Meta Data for the Real Player
//
- private static final Number _REAL_MINIMAL_WIDTH = new Integer(44);
+ private static final Number _REAL_MINIMAL_WIDTH = Integer.valueOf(44);
private static final int _REAL_MINIMAL_HEIGHT = 26;
- private static final Number _REAL_TYPICAL_WIDTH = new Integer(220);
+ private static final Number _REAL_TYPICAL_WIDTH = Integer.valueOf(220);
private static final int _REAL_TYPICAL_HEIGHT = 36;
- private static final Number _REAL_ALL_WIDTH = new Integer(375);
+ private static final Number _REAL_ALL_WIDTH = Integer.valueOf(375);
private static final int _REAL_ALL_HEIGHT = 100;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java Tue May 15 16:42:41 2007
@@ -576,7 +576,6 @@
String destination = toString(itemData.get("destination"));
boolean immediate = false;
boolean partialSubmit = false;
- Object old = null;
if (destination == null)
{
immediate = getBooleanFromProperty(itemData.get("immediate"));
@@ -593,7 +592,7 @@
// Find the params up front, and save them off -
// getOnClick() doesn't have access to the UIComponent
String extraParams = AutoSubmitUtils.getParameters(commandChild);
- old = arc.getProperties().put(_EXTRA_SUBMIT_PARAMS_KEY, extraParams);
+ arc.getProperties().put(_EXTRA_SUBMIT_PARAMS_KEY, extraParams);
}
rw.startElement("a", commandChild); // linkElement
@@ -643,10 +642,8 @@
if (destination == null)
{
- // Restore any old params, though really, how could that happen??
- arc.getProperties().put(_EXTRA_SUBMIT_PARAMS_KEY, old);
-
arc.setCurrentClientId(null);
+ arc.getProperties().remove(_EXTRA_SUBMIT_PARAMS_KEY);
}
}
@@ -928,9 +925,6 @@
String destination = toString(itemData.get("destination"));
boolean immediate = false;
boolean partialSubmit = false;
- // -= Simon =-
- // FIXME: _EXTRA_SUBMIT_PARAMS_KEY is never restored to its old value
- Object old = null;
if (destination == null)
{
immediate = getBooleanFromProperty(itemData.get("immediate"));
@@ -947,7 +941,7 @@
// Find the params up front, and save them off -
// getOnClick() doesn't have access to the UIComponent
String extraParams = AutoSubmitUtils.getParameters(commandChild);
- old = arc.getProperties().put(_EXTRA_SUBMIT_PARAMS_KEY, extraParams);
+ arc.getProperties().put(_EXTRA_SUBMIT_PARAMS_KEY, extraParams);
}
_renderCommandChildId(context, commandChild);
String selectionScript;
@@ -963,7 +957,7 @@
else
{
String encodedDestination =
- context.getExternalContext().encodeActionURL(destination.toString());
+ context.getExternalContext().encodeActionURL(destination);
String targetFrame = toString(itemData.get("targetFrame"));
StringBuilder sb = new StringBuilder();
if ( (targetFrame != null) && !Boolean.FALSE.equals(
@@ -984,6 +978,11 @@
selectionScript = sb.toString();
}
rw.writeAttribute("value", selectionScript, null);
+
+ if (destination == null)
+ {
+ arc.getProperties().remove(_EXTRA_SUBMIT_PARAMS_KEY);
+ }
}
rw.write(toString(itemData.get("text")));
@@ -1396,7 +1395,7 @@
return isOnFocusPath;
}
- private class NavItemData
+ static private class NavItemData
{
NavItemData()
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java Tue May 15 16:42:41 2007
@@ -141,7 +141,7 @@
if (accessKey != CHAR_UNDEFINED)
{
rw.writeAttribute("accesskey",
- new Character(accessKey),
+ Character.valueOf(accessKey),
"accessKey");
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.java Tue May 15 16:42:41 2007
@@ -95,7 +95,7 @@
else
{
if (value != null)
- rw.write(value.toString());
+ rw.write(value);
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java Tue May 15 16:42:41 2007
@@ -418,7 +418,8 @@
// (note the page developer can specify a rows value higher than is actually
// needed so we must take that into account)
actualRows =
- (int)Math.max(actualRows, Math.ceil(totalFormItemCount / actualColumns));
+ (int)Math.max(actualRows, Math.ceil(
+ ((double) totalFormItemCount) / actualColumns));
// test the first guess and keep trying more rows until it fits:
int visibleItemsLength = visibleItems.size();
@@ -595,7 +596,7 @@
rw.startElement("tr", null); // the outer row
int currentItemIndex = 0;
int visibleItemsLength = visibleItems.size();
- String outerColumnWidth = Math.floor(100 / actualColumns) + "%";
+ String outerColumnWidth = Math.floor(((double) 100) / actualColumns) + "%";
for (int col=0; col<actualColumns; col++)
{
rw.startElement("td", null); // the outer column
@@ -850,7 +851,7 @@
rw.endElement("tr"); // form item row
}
- private class FormWidths
+ static private class FormWidths
{
FormWidths(
String mainLabelWidth,
@@ -898,7 +899,7 @@
String _overallWidth;
}
- private class FormItem
+ static private class FormItem
{
FormItem(UIComponent child, int size, boolean group)
{
@@ -927,7 +928,7 @@
private boolean _group;
}
- private class FormItemInfo
+ static private class FormItemInfo
{
FormItemInfo()
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java Tue May 15 16:42:41 2007
@@ -20,6 +20,8 @@
import java.io.IOException;
+import java.util.List;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -77,10 +79,9 @@
String messageType = getMessageType(bean);
String text = getText(arc, bean, messageType);
- String[] headerElementArray = XhtmlConstants.HEADER_ELEMENT;
- String headerElement = (size < headerElementArray.length)
- ? headerElementArray[size]
- : headerElementArray[headerElementArray.length-1];
+ List<String> headerElementList = XhtmlConstants.HEADER_ELEMENTS;
+ String headerElement = headerElementList.get(
+ Math.min(size, headerElementList.size() - 1));
ResponseWriter writer = context.getResponseWriter();
writer.startElement("div", component);
@@ -303,7 +304,7 @@
)throws IOException
{
arc.getProperties().put(HEADER_NEST_LEVEL,
- new Integer(getHeaderNestLevel(arc) + 1));
+ Integer.valueOf(getHeaderNestLevel(arc) + 1));
}
protected static void decrementHeaderNestLevel(
@@ -314,7 +315,7 @@
assert (headerNestLevel > 0):"cannot decrement header nest level";
arc.getProperties().put(HEADER_NEST_LEVEL,
- new Integer(headerNestLevel - 1));
+ Integer.valueOf(headerNestLevel - 1));
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java Tue May 15 16:42:41 2007
@@ -826,7 +826,7 @@
// return immediately if the start of the next range is not available.
if (maxUnknown)
{
- if (!isRowAvailable(component, (int)blockStart - 1));
+ if (!isRowAvailable(component, (int)blockStart - 1))
return selectedIndex;
}
@@ -1317,9 +1317,9 @@
{
// make up an id to use for the initial focus.
String focus = "-focus";
- StringBuffer buffer = new StringBuffer(baseId.length()+
- focus.length());
- buffer.append(baseId.toString());
+ StringBuilder buffer = new StringBuilder(baseId.length()+
+ focus.length());
+ buffer.append(baseId);
buffer.append(focus);
id = buffer.toString();
// set the new id on the rendering context so that the body
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java Tue May 15 16:42:41 2007
@@ -110,7 +110,7 @@
}
- private class DetailRenderer extends ShowDetailRenderer
+ static private class DetailRenderer extends ShowDetailRenderer
{
public DetailRenderer(FacesBean.Type type)
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java Tue May 15 16:42:41 2007
@@ -663,7 +663,7 @@
private PropertyKey _chooseIdKey;
- private static final Integer _DEFAULT_COLUMNS = new Integer(10);
+ private static final Integer _DEFAULT_COLUMNS = Integer.valueOf(10);
private static final String _BLUR_PREFIX = "_dfb(this";
private static final String _FOCUS_PREFIX = "_dff(this";
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java Tue May 15 16:42:41 2007
@@ -318,5 +318,5 @@
private static String _SPINBOX_REPEAT_JS = "_spinboxRepeat";
private static String _CLEAR_SPINBOX_JS = "_clearSpinbox();";
- private static Integer _DEFAULT_COLUMNS = new Integer(1);
+ private static Integer _DEFAULT_COLUMNS = Integer.valueOf(1);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java Tue May 15 16:42:41 2007
@@ -396,7 +396,7 @@
// the text to the number of columns
if (textValue != null)
{
- String textString = textValue.toString();
+ String textString = textValue;
int textLength = textString.length();
if (textLength > 0)
@@ -653,7 +653,7 @@
if (onchange == null)
onchange = auto;
else if (auto != null)
- onchange = XhtmlUtils.getChainedJS(onchange, auto, true).toString();
+ onchange = XhtmlUtils.getChainedJS(onchange, auto, true);
}
if (isTextArea(bean))
@@ -858,8 +858,8 @@
private PropertyKey _maximumLengthKey;
private PropertyKey _onselectKey;
- static private final Integer _DEFAULT_PDA_COLUMNS = new Integer(11);
- static private final Integer _DEFAULT_COLUMNS = new Integer(30);
+ static private final Integer _DEFAULT_PDA_COLUMNS = Integer.valueOf(11);
+ static private final Integer _DEFAULT_COLUMNS = Integer.valueOf(30);
static private final String _SECRET_KEYDOWN_SCRIPT =
"return _clearPassword(this, event);";
static private final int _MAX_COLUMNS = 500;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java Tue May 15 16:42:41 2007
@@ -118,7 +118,7 @@
if (onClick == null)
onClick = auto;
else if (auto != null)
- onClick = XhtmlUtils.getChainedJS(onClick, auto, true).toString();
+ onClick = XhtmlUtils.getChainedJS(onClick, auto, true);
}
return onClick;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SingleStepButtonBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SingleStepButtonBarRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SingleStepButtonBarRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SingleStepButtonBarRenderer.java Tue May 15 16:42:41 2007
@@ -107,8 +107,6 @@
UIComponent component,
FacesBean bean) throws IOException
{
- ResponseWriter rw = context.getResponseWriter();
-
long currentValue = getSelectedStep(bean);
// get max value
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java Tue May 15 16:42:41 2007
@@ -20,6 +20,9 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderKit;
+import java.util.Arrays;
+import java.util.List;
+
public final class XhtmlConstants
{
private XhtmlConstants(){}
@@ -218,13 +221,14 @@
// ===================== End of copy from UIConstants =======================
- public static String STYLES_CACHE_DIRECTORY = "/adf/styles/cache/";
- public static String OUTPUT_MODE_PORTLET = FACET_PORTLET;
+ public static final String STYLES_CACHE_DIRECTORY = "/adf/styles/cache/";
+ public static final String OUTPUT_MODE_PORTLET = FACET_PORTLET;
// ============= Html elements ================
public static final String DIV_ELEMENT = "div";
- public static final String[] HEADER_ELEMENT = {"h1", "h2", "h3",
- "h4", "h5", "h6"};
+ public static final List<String> HEADER_ELEMENTS =
+ Arrays.asList(new String[]{"h1", "h2", "h3",
+ "h4", "h5", "h6"});
public static final String LINK_ELEMENT = "a";
public static final String PARAGRAPH_ELEMENT = "p";
public static final String SCRIPT_ELEMENT = "script";
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java Tue May 15 16:42:41 2007
@@ -91,8 +91,8 @@
Object[] dependencies)
{
_name = name;
- _functions = functions;
- _dependencies = dependencies;
+ _functions = (functions == null) ? null : functions.clone();
+ _dependencies = (dependencies == null) ? null : dependencies.clone();
_actualLibrary = _getAlias(name);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java Tue May 15 16:42:41 2007
@@ -43,8 +43,8 @@
Object[] dependencies)
{
_libraryName = libraryName;
- _functions = functions;
- _dependencies = dependencies;
+ _functions = (functions == null) ? null : functions.clone();
+ _dependencies = (dependencies == null) ? null : dependencies.clone();
}
@Override
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java Tue May 15 16:42:41 2007
@@ -92,9 +92,6 @@
static private Scriptlet _sCharSetsScriptlet;
static private Scriptlet _sShuttleScriptlet;
static private Scriptlet _sTableProxyScriptlet;
- // FIXME: Never read
- @SuppressWarnings("unused")
- static private Scriptlet _sDiagrammerScriptlet;
static private Scriptlet _sColorFormatScriptlet;
static private Scriptlet _sColorFieldFormatScriptlet;
static private Scriptlet _sDateFieldFormatScriptlet;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/BandingData.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/BandingData.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/BandingData.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/BandingData.java Tue May 15 16:42:41 2007
@@ -78,11 +78,11 @@
boolean band = false;
if (_rowBanding > 0)
{
- band = ((row / _rowBanding) % 2) == 1;
+ band = ((row / _rowBanding) % 2) != 0;
}
if (_colBanding > 0)
{
- band |= (((physicalColumn / _colBanding) % 2) == 1);
+ band |= (((physicalColumn / _colBanding) % 2) != 0);
}
return band;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java Tue May 15 16:42:41 2007
@@ -346,7 +346,7 @@
*/
public final boolean hasSelectAll()
{
- return (_rowSelection == Boolean.TRUE);
+ return (Boolean.TRUE.equals(_rowSelection));
}
public final boolean hasSelection()
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/ScriptRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/ScriptRenderer.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/ScriptRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/ScriptRenderer.java Tue May 15 16:42:41 2007
@@ -127,7 +127,7 @@
// TODO: change the default, as very few scripts actually
// write content
- return Boolean.TRUE.equals(bean);
+ return Boolean.TRUE.equals(o);
}
private PropertyKey _sourceKey;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java Tue May 15 16:42:41 2007
@@ -144,7 +144,7 @@
if ( (pprTargets != null) && (pprTargets.length > 0) )
{
String[] pprTargetsNew = new String[pprTargets.length + 1];
- pprTargetsNew = pprTargets;
+ System.arraycopy(pprTargets, 0, pprTargetsNew, 0, pprTargets.length);
pprTargetsNew[pprTargets.length] = compId;
encodedPartialTargets =
PartialPageRendererUtils.encodePartialTargets(pprTargetsNew);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java Tue May 15 16:42:41 2007
@@ -89,7 +89,7 @@
static public String getLocale()
{
String path = ((HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest()).getPathInfo();
- String locStr = new String();
+ String locStr = "";
int locIndex = path.indexOf("LocaleElements")+ "LocaleElements_".length();
int index = path.indexOf(_VERSION);
@@ -128,12 +128,11 @@
ClassLoaderUtils.getResource("META-INF/adf-faces-version.txt");
if (resource != null)
{
- InputStream in = null;
-
+ BufferedReader br = null;
try
{
- in = resource.openStream();
- BufferedReader br = new BufferedReader(new InputStreamReader(in));
+ InputStream in = resource.openStream();
+ br = new BufferedReader(new InputStreamReader(in));
version = br.readLine();
}
catch (IOException e)
@@ -142,8 +141,8 @@
}
finally
{
- if (in != null)
- in.close();
+ if (br != null)
+ br.close();
}
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java Tue May 15 16:42:41 2007
@@ -155,23 +155,6 @@
public static final Object DISABLE_STANDARDS_MODE =
"disableStandardsMode";
-
- /**
- * Create a Configuration with a name. The name must be
- * non-null. The Configuration must be registered (with
- * the <code>register()</code> method) before it is used.
- * <p>
- * @see #register
- */
- public Configuration(String name)
- {
- if (name == null)
- throw new NullPointerException();
-
- _name = name;
- }
-
-
/**
* Return a URI for a UIX directory.
* @param key the key used to identify the directory
@@ -220,9 +203,4 @@
Configuration()
{
}
-
- // -= Simon Lessard =-
- // FIXME: Never read locally
- @SuppressWarnings("unused")
- private String _name;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java Tue May 15 16:42:41 2007
@@ -33,37 +33,6 @@
public class ConfigurationImpl extends Configuration
{
/**
- * Creates a default ConfigurationImpl. The configuration
- * must be registered (with register()) before being used.
- */
- public ConfigurationImpl(String name)
- {
- super(name);
- }
-
-
- /**
- * Creates a default ConfigurationImpl. The configuration
- * must be registered (with register()) before being used.
- */
- public ConfigurationImpl(String name, ConfigurationImpl base)
- {
- super(name);
-
- if (base != null)
- {
- _paths.putAll(base._paths);
- _uris.putAll(base._uris);
- _resolvedURIs.putAll(base._resolvedURIs);
- _resolvedPaths.putAll(base._resolvedPaths);
- _properties.putAll(base._properties);
- _debug = base._debug;
- }
- }
-
-
-
- /**
* Returns whether the configuration is in debug mode.
*/
@Override
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java Tue May 15 16:42:41 2007
@@ -24,18 +24,13 @@
/**
* Configuration class that works off of a RequestContext.
- *
- * @todo Support context-relative and server-relative URLs
- * for the OHW servlet.
*/
public class ContextBasedConfiguration extends ConfigurationImpl
{
- static public final String CONFIGURATION_NAME = "_CBC";
-
public ContextBasedConfiguration(FacesContext fContext,
RequestContext context)
{
- super(CONFIGURATION_NAME);
+ super();
putProperty(SKIN_FAMILY,
context.getSkinFamily());
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java Tue May 15 16:42:41 2007
@@ -310,7 +310,7 @@
String valueText = value.toString();
if (valueText.length() != 0)
{
- return new Character(valueText.charAt(0));
+ return Character.valueOf(valueText.charAt(0));
}
}
}
@@ -329,12 +329,12 @@
}
else if (value instanceof Number)
{
- return new Byte(((Number)value).byteValue());
+ return Byte.valueOf(((Number)value).byteValue());
}
else
{
byte byteValue = Byte.parseByte(value.toString());
- return new Byte(byteValue);
+ return Byte.valueOf(byteValue);
}
}
@@ -352,12 +352,12 @@
}
else if (value instanceof Number)
{
- return new Short(((Number)value).shortValue());
+ return Short.valueOf(((Number)value).shortValue());
}
else
{
short shortValue = Short.parseShort(value.toString());
- return new Short(shortValue);
+ return Short.valueOf(shortValue);
}
}
@@ -408,12 +408,12 @@
}
else if (value instanceof Number)
{
- return new Long(((Number)value).longValue());
+ return Long.valueOf(((Number)value).longValue());
}
else
{
long longValue = Long.parseLong(value.toString());
- return new Long(longValue);
+ return Long.valueOf(longValue);
}
}
@@ -431,12 +431,12 @@
}
else if (value instanceof Number)
{
- return new Float(((Number)value).floatValue());
+ return Float.valueOf(((Number)value).floatValue());
}
else
{
float floatValue = Float.parseFloat(value.toString());
- return new Float(floatValue);
+ return Float.valueOf(floatValue);
}
}
@@ -454,12 +454,12 @@
}
else if (value instanceof Number)
{
- return new Double(((Number)value).doubleValue());
+ return Double.valueOf(((Number)value).doubleValue());
}
else
{
double doubleValue = Double.parseDouble(value.toString());
- return new Double(doubleValue);
+ return Double.valueOf(doubleValue);
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DateFormatContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DateFormatContext.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DateFormatContext.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DateFormatContext.java Tue May 15 16:42:41 2007
@@ -51,7 +51,7 @@
if (obj == this)
return true;
- if (obj == null)
+ if (!(obj instanceof DateFormatContext))
return false;
DateFormatContext dfc = (DateFormatContext) obj;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DecimalFormatContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DecimalFormatContext.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DecimalFormatContext.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DecimalFormatContext.java Tue May 15 16:42:41 2007
@@ -60,8 +60,8 @@
{
if (obj == this)
return true;
-
- if (obj == null)
+
+ if (!(obj instanceof DecimalFormatContext))
return false;
DecimalFormatContext dfc = (DecimalFormatContext) obj;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContextImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContextImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContextImpl.java Tue May 15 16:42:41 2007
@@ -379,7 +379,7 @@
if (obj == this)
return true;
- if (obj == null)
+ if (!(obj instanceof LocaleContextImpl))
return false;
LocaleContextImpl that = (LocaleContextImpl)obj;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java Tue May 15 16:42:41 2007
@@ -125,7 +125,7 @@
if (qSepIndex < tokenLength)
{
String qString = currToken.substring(qSepIndex, tokenLength);
- qString.trim();
+ qString = qString.trim();
if (qString.length() > 0)
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java Tue May 15 16:42:41 2007
@@ -809,7 +809,7 @@
throw new IOException();
}
- String filenameBuffer = null;
+ StringBuilder filenameBuffer = null;
while (tokenizer.hasMoreTokens())
{
final String keyValue = tokenizer.nextToken().trim();
@@ -821,19 +821,19 @@
{
if (filenameBuffer == null)
{
- filenameBuffer = keyValue;
+ filenameBuffer = new StringBuilder(keyValue);
// Don't quit on the first semicolon - keep appending
}
else
{
- filenameBuffer = filenameBuffer + ";" + keyValue;
+ filenameBuffer.append(";").append(keyValue);
}
}
}
if (filenameBuffer != null)
{
- _filename = _extractFilename(filenameBuffer);
+ _filename = _extractFilename(filenameBuffer.toString());
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceSupport.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceSupport.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceSupport.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceSupport.java Tue May 15 16:42:41 2007
@@ -135,10 +135,10 @@
_contextPos++;
// Extend the array if necessary
- if (_contextPos >= max) {
+ if (_contextPos >= max)
+ {
Context newContexts[] = new Context[max*2];
System.arraycopy(_contexts, 0, newContexts, 0, max);
- max *= 2;
_contexts = newContexts;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java Tue May 15 16:42:41 2007
@@ -216,18 +216,18 @@
int[] targetTypes)
{
- if (type == _AT_AGENT)
+ if (_AT_AGENT.equals(type))
_selectorAgents = targetTypes;
- else if (type == _AT_PLATFORM)
+ else if (_AT_PLATFORM.equals(type))
_selectorPlatforms = targetTypes;
}
private void _resetAtRuleTargetTypes(
String type)
{
- if (type == _AT_AGENT)
+ if (_AT_AGENT.equals(type))
_selectorAgents = null;
- else if (type == _AT_PLATFORM)
+ else if (_AT_PLATFORM.equals(type))
_selectorPlatforms = null;
}
@@ -336,7 +336,7 @@
String[] typeArray = types.split(",");
List<Integer> list = new ArrayList<Integer>();
- if (type == _AT_AGENT)
+ if (_AT_AGENT.equals(type))
{
for (int i=0; i < typeArray.length; i++)
{
@@ -346,7 +346,7 @@
list.add(agentInt);
}
}
- else if (type == _AT_PLATFORM)
+ else if (_AT_PLATFORM.equals(type))
{
for (int i=0; i < typeArray.length; i++)
{