You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/10/26 22:42:23 UTC
svn commit: r468175 [3/5] - in /incubator/adffaces/trunk/trinidad:
trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/
trinidad-api/src/main/java/org/apache/myfaces...
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/GifEncoder.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/GifEncoder.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/GifEncoder.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/GifEncoder.java Thu Oct 26 15:42:18 2006
@@ -24,7 +24,7 @@
import java.util.Hashtable;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.image.painter.ImageLoader;
@@ -129,7 +129,7 @@
// For non-transparent pixels, we first check to see if the
// color has already been added to the color table. We use an
// the Integer RGB value as our hash key
- Integer colorKey = IntegerUtils.getInteger(color & 0x00ffffff);
+ Integer colorKey = (color & 0x00ffffff);
Integer colorIndexValue = hsh.get(colorKey);
if (colorIndexValue != null)
@@ -151,7 +151,7 @@
globalColorTable[off+2] = _getBlue(color);
// Hash the color->index mapping for fast lookups
- hsh.put(colorKey, IntegerUtils.getInteger(colorIndex));
+ hsh.put(colorKey, colorIndex);
// and Update the index count
lastColorIndex = colorIndex++;
@@ -183,7 +183,7 @@
for (int i = 0x00ff00ff; i < 0x00ffffff; i++)
{
int col = i;
- Integer icol = IntegerUtils.getInteger(col);
+ Integer icol = col;
if (!hsh.containsKey(icol))
{
// add entry to table
@@ -367,14 +367,14 @@
if (sqnc > 0)
{
- fsqnc_newcol = IntegerUtils.getInteger(sqnc_newcol);
+ fsqnc_newcol = sqnc_newcol;
Integer sqnc_newcol_code = hsh.get(fsqnc_newcol);
if (sqnc_newcol_code == null)
{
// string not in table.
// write prefix and add string to table
_writeByte(stream, sqnc-2, info);
- hsh.put(fsqnc_newcol, IntegerUtils.getInteger(code++));
+ hsh.put(fsqnc_newcol, code++);
if ((code-2) > infoCompSizeExp)
{ // increase code length
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/PNGEncoder.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/PNGEncoder.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/PNGEncoder.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/PNGEncoder.java Thu Oct 26 15:42:18 2006
@@ -29,7 +29,7 @@
import java.util.zip.DeflaterOutputStream;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.image.painter.ImageLoader;
@@ -115,13 +115,13 @@
{
// Put the transparent color at index zero.
// Put the old zero index color at the current index.
- colors.put(color, IntegerUtils.getInteger(0));
- colors.put(firstColor, IntegerUtils.getInteger(count));
+ colors.put(color, 0);
+ colors.put(firstColor, count);
transparentColor = color;
}
else
{
- colors.put(color, IntegerUtils.getInteger(count));
+ colors.put(color, count);
}
count++;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ButtonImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ButtonImageRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ButtonImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ButtonImageRenderer.java Thu Oct 26 15:42:18 2006
@@ -22,7 +22,7 @@
import java.util.Map;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.image.ImageConstants;
import org.apache.myfaces.trinidadinternal.image.ImageContext;
@@ -237,7 +237,7 @@
if (index < 0)
return null;
- return IntegerUtils.getInteger(index);
+ return index;
}
private PaintContext _context;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ColorizedIconImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ColorizedIconImageRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ColorizedIconImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ColorizedIconImageRenderer.java Thu Oct 26 15:42:18 2006
@@ -27,8 +27,6 @@
import java.util.Map;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
import org.apache.myfaces.trinidadinternal.image.ImageConstants;
import org.apache.myfaces.trinidadinternal.image.ImageContext;
import org.apache.myfaces.trinidadinternal.image.ImageRenderer;
@@ -93,13 +91,13 @@
if (width != -1)
{
responseProperties.put(ImageConstants.WIDTH_RESPONSE_KEY,
- IntegerUtils.getInteger(width));
+ width);
}
if (height != -1)
{
responseProperties.put(ImageConstants.HEIGHT_RESPONSE_KEY,
- IntegerUtils.getInteger(height));
+ height);
}
// This very strange code is here to work around problems
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/CompositeButtonImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/CompositeButtonImageRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/CompositeButtonImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/CompositeButtonImageRenderer.java Thu Oct 26 15:42:18 2006
@@ -23,8 +23,6 @@
import java.util.Map;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
import org.apache.myfaces.trinidadinternal.image.ImageConstants;
import org.apache.myfaces.trinidadinternal.image.ImageContext;
import org.apache.myfaces.trinidadinternal.image.PainterImageRenderer;
@@ -271,7 +269,7 @@
if (index < 0)
return null;
- return IntegerUtils.getInteger(index);
+ return index;
}
private PaintContext _context;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/FlippedIconImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/FlippedIconImageRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/FlippedIconImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/FlippedIconImageRenderer.java Thu Oct 26 15:42:18 2006
@@ -23,8 +23,6 @@
import java.awt.image.ImageProducer;
import java.util.Map;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
import org.apache.myfaces.trinidadinternal.image.ImageConstants;
import org.apache.myfaces.trinidadinternal.image.ImageContext;
import org.apache.myfaces.trinidadinternal.image.ImageRenderer;
@@ -91,13 +89,13 @@
if (width != -1)
{
responseProperties.put(ImageConstants.WIDTH_RESPONSE_KEY,
- IntegerUtils.getInteger(width));
+ width);
}
if (height != -1)
{
responseProperties.put(ImageConstants.HEIGHT_RESPONSE_KEY,
- IntegerUtils.getInteger(height));
+ height);
}
// This very strange code is here to work around problems
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/util/MapArea.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/util/MapArea.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/util/MapArea.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/util/MapArea.java Thu Oct 26 15:42:18 2006
@@ -19,7 +19,7 @@
import java.awt.Polygon;
import java.awt.Rectangle;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
* MapArea describes an area of an image map.
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/encode/AbstractXMLEncoder.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/encode/AbstractXMLEncoder.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/encode/AbstractXMLEncoder.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/encode/AbstractXMLEncoder.java Thu Oct 26 15:42:18 2006
@@ -23,7 +23,7 @@
import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.image.ImageConstants;
import org.apache.myfaces.trinidadinternal.image.ImageContext;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/BaseImageProviderRequestParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/BaseImageProviderRequestParser.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/BaseImageProviderRequestParser.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/BaseImageProviderRequestParser.java Thu Oct 26 15:42:18 2006
@@ -24,7 +24,6 @@
import org.apache.myfaces.trinidad.util.ArrayMap;
import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -343,9 +342,9 @@
return null;
if (value.equals(XMLConstants.LEFT_TO_RIGHT_DIRECTION))
- return IntegerUtils.getInteger(LocaleUtils.DIRECTION_LEFTTORIGHT);
+ return LocaleUtils.DIRECTION_LEFTTORIGHT;
if (value.equals(XMLConstants.RIGHT_TO_LEFT_DIRECTION))
- return IntegerUtils.getInteger(LocaleUtils.DIRECTION_RIGHTTOLEFT);
+ return LocaleUtils.DIRECTION_RIGHTTOLEFT;
// If it isn't "rtl" or "ltr", it's an error
_LOG.warning(_DIRECTION_ERROR);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/ImageParseUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/ImageParseUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/ImageParseUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/ImageParseUtils.java Thu Oct 26 15:42:18 2006
@@ -18,8 +18,6 @@
import org.xml.sax.Attributes;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
@@ -79,7 +77,7 @@
try
{
- return IntegerUtils.getInteger(Integer.parseInt(value));
+ return Integer.parseInt(value);
}
catch (NumberFormatException e)
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java Thu Oct 26 15:42:18 2006
@@ -26,7 +26,7 @@
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
import org.apache.myfaces.trinidadinternal.share.util.CaboHttpUtils;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java Thu Oct 26 15:42:18 2006
@@ -24,7 +24,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java Thu Oct 26 15:42:18 2006
@@ -47,7 +47,7 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TableSelectManyRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TableUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TreeUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
public class DesktopTableRenderer extends TableRenderer
@@ -716,7 +716,7 @@
writer.startElement(XhtmlConstants.TABLE_ROW_ELEMENT, null);
writer.startElement(XhtmlConstants.TABLE_DATA_ELEMENT, null);
writer.writeAttribute(XhtmlConstants.COLSPAN_ATTRIBUTE,
- IntegerUtils.getInteger(tContext.getActualColumnCount()), null);
+ tContext.getActualColumnCount(), null);
renderStyleClass(context, arc, SkinSelectors.AF_COLUMN_SORTABLE_HEADER_ICON_STYLE_CLASS);
encodeChild(context, header);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java Thu Oct 26 15:42:18 2006
@@ -53,7 +53,7 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TreeTableRenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TreeUtils;
import org.apache.myfaces.trinidad.skin.Icon;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
* Renderer for treeTable
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java Thu Oct 26 15:42:18 2006
@@ -38,7 +38,7 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.RowData;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TableRenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TableUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
public class PdaTableRenderer extends TableRenderer
{
@@ -521,7 +521,7 @@
writer.startElement(XhtmlConstants.TABLE_ROW_ELEMENT, null);
writer.startElement(XhtmlConstants.TABLE_DATA_ELEMENT, null);
writer.writeAttribute(XhtmlConstants.COLSPAN_ATTRIBUTE,
- IntegerUtils.getInteger(tContext.getActualColumnCount()), null);
+ tContext.getActualColumnCount(), null);
renderStyleClass(context, arc, SkinSelectors.AF_COLUMN_SORTABLE_HEADER_ICON_STYLE_CLASS);
encodeChild(context, header);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java Thu Oct 26 15:42:18 2006
@@ -30,7 +30,7 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
public class TrainRenderer
extends XhtmlRenderer
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java Thu Oct 26 15:42:18 2006
@@ -22,7 +22,6 @@
import org.apache.myfaces.trinidadinternal.skin.icon.NullIcon;
import org.apache.myfaces.trinidadinternal.skin.icon.ReferenceIcon;
import org.apache.myfaces.trinidadinternal.skin.icon.TextIcon;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
* Skin implementation for HTML browsers
@@ -99,23 +98,23 @@
SkinSelectors.AF_SELECT_INPUT_COLOR_LAUNCH_ICON_NAME,
new ContextImageIcon("adf/images/cfb.gif",
"adf/images/cfbr.gif",
- IntegerUtils.getInteger(24),
- IntegerUtils.getInteger(24)),
+ 24,
+ 24),
SkinSelectors.AF_SELECT_INPUT_COLOR_SWATCH_OVERLAY_ICON_NAME,
new ContextImageIcon("adf/images/cfso.gif",
"adf/images/cfsor.gif",
- IntegerUtils.getInteger(12),
- IntegerUtils.getInteger(12),
+ 12,
+ 12,
SkinSelectors.AF_SELECT_INPUT_COLOR_SWATCH_OVERLAY_ICON_STYLE_CLASS,
null),
// DateField Icons
SkinSelectors.AF_SELECT_INPUT_DATE_LAUNCH_ICON_NAME,
new ContextImageIcon("adf/images/dfb.gif",
"adf/images/dfbr.gif",
- IntegerUtils.getInteger(19),
- IntegerUtils.getInteger(24)),
+ 19,
+ 24),
// GlobalHeader Icons
SkinSelectors.AF_MENU_BAR_SEPARATOR_ICON_NAME,
@@ -198,8 +197,8 @@
SkinSelectors.AF_SELECT_INPUT_TEXT_BUTTON_ICON_NAME,
new ContextImageIcon("adf/images/lvib.gif",
"adf/images/lvibr.gif",
- IntegerUtils.getInteger(24),
- IntegerUtils.getInteger(24)),
+ 24,
+ 24),
// shuttle's 'Move' alias icon that the
// selectManyShuttle/selectOrderShuttle's move icon keys reference.
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/PdaHtmlSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/PdaHtmlSkin.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/PdaHtmlSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/PdaHtmlSkin.java Thu Oct 26 15:42:18 2006
@@ -20,7 +20,6 @@
import org.apache.myfaces.trinidadinternal.skin.icon.ContextImageIcon;
import org.apache.myfaces.trinidadinternal.skin.icon.NullIcon;
import org.apache.myfaces.trinidadinternal.skin.icon.TextIcon;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
* Skin implementation for HTML browsers
@@ -44,7 +43,7 @@
{
setProperty(SkinProperties.AF_NAVIGATIONPATH_SHOW_LAST_ITEM_PROPERTY_KEY, Boolean.FALSE);
setProperty(SkinProperties.AF_PANELHEADER_INDENT_CONTENT, Boolean.FALSE);
- setProperty(SkinProperties.AF_PANEL_LIST_DEFAULT_COLUMNS, IntegerUtils.getInteger(2));
+ setProperty(SkinProperties.AF_PANEL_LIST_DEFAULT_COLUMNS, 2);
}
// This array contains entries for all of the customizable
@@ -71,31 +70,31 @@
SkinSelectors.AF_SELECT_INPUT_DATE_LAUNCH_ICON_NAME,
new ContextImageIcon("adf/images/dp.gif",
"adf/images/dprtl.gif",
- IntegerUtils.getInteger(17),
- IntegerUtils.getInteger(18)),
+ 17,
+ 18),
SkinSelectors.AF_SELECT_INPUT_TEXT_BUTTON_ICON_NAME,
new ContextImageIcon("adf/images/lovi.gif",
"adf/images/lovirtl.gif",
- IntegerUtils.getInteger(18),
- IntegerUtils.getInteger(18)),
+ 18,
+ 18),
// @todo these need to be green and in adf/images/lovi (these are for
// OraclePdaSkin, but we are sharing for now.
SkinSelectors.AF_COLUMN_UNSORTED_ICON_NAME,
new ContextImageIcon("adf/images/oracle/msrt.gif",
null,
- IntegerUtils.getInteger(16),
- IntegerUtils.getInteger(7)),
+ 16,
+ 7),
SkinSelectors.AF_COLUMN_SORTED_ASCEND_ICON_NAME,
new ContextImageIcon("adf/images/oracle/msrta.gif",
null,
- IntegerUtils.getInteger(9),
- IntegerUtils.getInteger(9)),
+ 9,
+ 9),
SkinSelectors.AF_COLUMN_SORTED_DESCEND_ICON_NAME,
new ContextImageIcon("adf/images/oracle/msrtd.gif",
null,
- IntegerUtils.getInteger(9),
- IntegerUtils.getInteger(9)),
+ 9,
+ 9),
};
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java Thu Oct 26 15:42:18 2006
@@ -22,7 +22,6 @@
import org.apache.myfaces.trinidadinternal.skin.icon.ReferenceIcon;
import org.apache.myfaces.trinidadinternal.skin.icon.TextIcon;
import org.apache.myfaces.trinidadinternal.style.CSSStyle;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
@@ -55,7 +54,7 @@
{
setProperty(SkinProperties.AF_NAVIGATIONPATH_SHOW_LAST_ITEM_PROPERTY_KEY,
Boolean.TRUE);
- setProperty(SkinProperties.AF_PANEL_LIST_DEFAULT_COLUMNS, IntegerUtils.getInteger(3));
+ setProperty(SkinProperties.AF_PANEL_LIST_DEFAULT_COLUMNS, 3);
}
// fully qualified class name of our resource bundle
@@ -202,81 +201,81 @@
SkinSelectors.AF_INPUT_NUMBER_SPINBOX_INCREMENT_ICON_NAME,
new ContextImageIcon("adf/images/spbxup.png",
null,
- IntegerUtils.getInteger(5),
- IntegerUtils.getInteger(5),
+ 5,
+ 5,
null,
spinboxTopStyle),
SkinSelectors.AF_INPUT_NUMBER_SPINBOX_DECREMENT_ICON_NAME,
new ContextImageIcon("adf/images/spbxdn.png",
null,
- IntegerUtils.getInteger(5),
- IntegerUtils.getInteger(5),
+ 5,
+ 5,
null,
spinboxBottomStyle),
SkinSelectors.AF_INPUT_NUMBER_SPINBOX_INCREMENT_DISABLED_ICON_NAME,
new ContextImageIcon("adf/images/spbxupd.png",
null,
- IntegerUtils.getInteger(5),
- IntegerUtils.getInteger(5),
+ 5,
+ 5,
null,
spinboxTopStyle),
SkinSelectors.AF_INPUT_NUMBER_SPINBOX_DECREMENT_DISABLED_ICON_NAME,
new ContextImageIcon("adf/images/spbxdnd.png",
null,
- IntegerUtils.getInteger(5),
- IntegerUtils.getInteger(5),
+ 5,
+ 5,
null,
spinboxBottomStyle),
// checkbox icons
SkinSelectors.AF_SELECT_BOOLEAN_CHECKBOX_DISABLED_CHECKED_ICON_NAME,
new ContextImageIcon("adf/images/checkdc.gif",
null,
- IntegerUtils.getInteger(12),
- IntegerUtils.getInteger(12)),
+ 12,
+ 12),
SkinSelectors.AF_SELECT_BOOLEAN_CHECKBOX_DISABLED_UNCHECKED_ICON_NAME,
new ContextImageIcon("adf/images/checkdn.gif",
null,
- IntegerUtils.getInteger(12),
- IntegerUtils.getInteger(12)),
+ 12,
+ 12),
SkinSelectors.AF_SELECT_BOOLEAN_CHECKBOX_READONLY_CHECKED_ICON_NAME,
new ContextImageIcon( "adf/images/checkrc.gif",
null,
- IntegerUtils.getInteger(12),
- IntegerUtils.getInteger(12)),
+ 12,
+ 12),
SkinSelectors.AF_SELECT_BOOLEAN_CHECKBOX_READONLY_UNCHECKED_ICON_NAME,
new ContextImageIcon("adf/images/checkrn.gif",
null,
- IntegerUtils.getInteger(12),
- IntegerUtils.getInteger(12)),
+ 12,
+ 12),
// radio icons
SkinSelectors.AF_SELECT_BOOLEAN_RADIO_DISABLED_SELECTED_ICON_NAME,
new ContextImageIcon("adf/images/radiods.gif",
null,
- IntegerUtils.getInteger(11),
- IntegerUtils.getInteger(11)),
+ 11,
+ 11),
SkinSelectors.AF_SELECT_BOOLEAN_RADIO_DISABLED_UNSELECTED_ICON_NAME,
new ContextImageIcon("adf/images/radiodn.gif",
null,
- IntegerUtils.getInteger(11),
- IntegerUtils.getInteger(11)),
+ 11,
+ 11),
SkinSelectors.AF_SELECT_BOOLEAN_RADIO_READONLY_SELECTED_ICON_NAME,
new ContextImageIcon( "adf/images/radiors.gif",
null,
- IntegerUtils.getInteger(10),
- IntegerUtils.getInteger(10)),
+ 10,
+ 10),
SkinSelectors.AF_SELECT_BOOLEAN_RADIO_READONLY_UNSELECTED_ICON_NAME,
new ContextImageIcon("adf/images/radiorn.gif",
null,
- IntegerUtils.getInteger(10),
- IntegerUtils.getInteger(10)),
+ 10,
+ 10),
// progressIndicator icons
SkinSelectors.AF_PROGRESS_INDICATOR_INDETERMINATE_ICON_NAME,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java Thu Oct 26 15:42:18 2006
@@ -35,7 +35,7 @@
import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat;
import org.apache.myfaces.trinidad.skin.Icon;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
* Renders the calendar.
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java Thu Oct 26 15:42:18 2006
@@ -37,7 +37,7 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.RenderStage;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TableRenderingContext;
import org.apache.myfaces.trinidad.skin.Icon;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
* @todo Kill the now-strange "compute mode", since we can
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java Thu Oct 26 15:42:18 2006
@@ -15,7 +15,6 @@
*/
package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -24,24 +23,22 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
import java.util.Set;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.validator.Validator;
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.component.UIXEditableValue;
-import org.apache.myfaces.trinidad.convert.ClientConverter;
import org.apache.myfaces.trinidad.context.FormData;
+import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.convert.ClientConverter;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.util.MessageFactory;
import org.apache.myfaces.trinidad.validator.ClientValidator;
-
-import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
* Implementation of FormData from the CoreRenderKit (or,
@@ -426,7 +423,7 @@
String libURI = submitConverter.getClientLibrarySource(context);
String clientScript = submitConverter.getClientScript(context, component);
Collection<String> libRefs = submitConverter.getClientImportNames();
- _addClientScripts(context, rc, libURI, clientScript, libRefs, "Converter()");
+ _addClientScripts(context, rc, libURI, clientScript, libRefs, "TrConverter()");
String converter = submitConverter.getClientConversion(context,
component);
@@ -498,7 +495,7 @@
String libURI = submitValidator.getClientLibrarySource(context);
String clientScript = submitValidator.getClientScript(context, component);
Collection<String> libRefs = submitValidator.getClientImportNames();
- _addClientScripts(context, rc, libURI, clientScript, libRefs, "Validator()");
+ _addClientScripts(context, rc, libURI, clientScript, libRefs, "TrValidator()");
String validator = submitValidator.getClientValidation(context,
component);
@@ -527,7 +524,7 @@
if (validationIndex == null)
{
// the new element was added to the end of our vector
- validationIndex = IntegerUtils.getInteger(validationMap.size());
+ validationIndex = validationMap.size();
// add the new element to our map of strings to indices
validationMap.put(validation, validationIndex);
@@ -551,7 +548,7 @@
if (errorFormatIndex == null)
{
// the new element was added to the end of our vector
- errorFormatIndex = IntegerUtils.getInteger(errorFormatMap.size());
+ errorFormatIndex = errorFormatMap.size();
// add the new element to our map of strings to indices
errorFormatMap.put(errorFormat, errorFormatIndex);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java Thu Oct 26 15:42:18 2006
@@ -27,7 +27,6 @@
import org.apache.myfaces.trinidad.component.core.layout.CorePanelPageHeader;
import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.render.CoreRenderer;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
@@ -175,7 +174,7 @@
if ((rowSpan != 0) || (brandingCount > 0))
{
Integer rowSpanObject = (rowSpan > 1)
- ? IntegerUtils.getInteger(rowSpan)
+ ? rowSpan
: null;
writer.startElement("tr", null);
@@ -459,7 +458,7 @@
writer.startElement("td", null);
if (colSpan > 1)
- writer.writeAttribute("colspan", IntegerUtils.getInteger(colSpan), null);
+ writer.writeAttribute("colspan", colSpan, null);
writer.writeAttribute("width",
"100%", null);
@@ -491,7 +490,7 @@
"100%", null);
if (colSpan > 1)
- writer.writeAttribute("colspan", IntegerUtils.getInteger(colSpan), null);
+ writer.writeAttribute("colspan", colSpan, null);
writer.startElement("table", null);
OutputUtils.renderLayoutTableAttributes(context, arc,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java Thu Oct 26 15:42:18 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
import java.io.IOException;
-
import java.util.HashMap;
import java.util.HashSet;
import java.util.Locale;
@@ -28,10 +27,8 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.core.output.CoreMedia;
-
import org.apache.myfaces.trinidad.context.RenderingContext;
-
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
@@ -334,7 +331,7 @@
writer.endElement("div");
- height = IntegerUtils.getInteger( controlData.height ).toString();
+ height = IntegerUtils.getString(controlData.height);
_render( context,
arc,
component,
@@ -893,13 +890,13 @@
}
else if ( intHeight < Integer.MAX_VALUE )
{
- return IntegerUtils.getInteger(intHeight - controlData.height).toString();
+ return IntegerUtils.getString(intHeight - controlData.height).toString();
}
}
if (useMinHeight)
{
- return IntegerUtils.getInteger(playerData.minHeight.intValue() -
+ return IntegerUtils.getString(playerData.minHeight.intValue() -
controlData.height).toString();
}
@@ -1600,14 +1597,14 @@
},
false, // no autosize
0,
- IntegerUtils.getInteger(0)),
+ 0),
CoreMedia.CONTROLS_NONE_VISIBLE, new MediaRenderer.ControlData(new String[]
{
"controller", "false"
},
false, // no autosize
0,
- IntegerUtils.getInteger(0)),
+ 0),
CoreMedia.CONTROLS_MINIMAL, new MediaRenderer.ControlData(null, // all controls default
false, // no autosize
_QT_CONTROL_HEIGHT,
@@ -1624,14 +1621,14 @@
},
false, // no autosize
0,
- IntegerUtils.getInteger(0)),
+ 0),
CoreMedia.CONTROLS_NONE_VISIBLE, new MediaRenderer.ControlData(new String[]
{
"controller", "false"
},
false, // no autosize
0,
- IntegerUtils.getInteger(0)),
+ 0),
CoreMedia.CONTROLS_MINIMAL, _QUICKTIME_ALL_CONTROL_DATA,
CoreMedia.CONTROLS_TYPICAL, _QUICKTIME_ALL_CONTROL_DATA,
CoreMedia.CONTROLS_ALL, _QUICKTIME_ALL_CONTROL_DATA,
@@ -1658,7 +1655,7 @@
private static final Number _WMP_ALL_CONTROLS_WIDTH = new Integer(275);
private static final Number _WMP_MINIMAL_CONTROLS_WIDTH =
- IntegerUtils.getInteger(72);
+ 72;
private static final int _WMP_MINIMAL_CONTROLS_HEIGHT = 21;
private static final int _WMP_ALL_CONTROLS_HEIGHT = 170;
@@ -1670,7 +1667,7 @@
},
true, // autosizes
0,
- IntegerUtils.getInteger(0));
+ 0);
// =-= bts what about close captioning?
// =-= bts Is unsupported mime types the right way to go, how about supported
@@ -1720,7 +1717,7 @@
"autostart", // autostartParamName
"filename", // sourceParamName
"playcount", // infiniteLoopParamName,
- IntegerUtils.getInteger(0), // infiniteLoopParamValue
+ 0, // infiniteLoopParamValue
"playcount", // playCountParamName
"http://www.microsoft.com/Windows/MediaPlayer/", // pluginsPage
_WMP_CODE_BASE, // <Object> CodeBase
@@ -1746,83 +1743,6 @@
});
//
- // Meta Data for the Windows Media Player 7.1
- //
-
- /* WMP 7.1 is not currently activated in any way in this class.
- private static final String _WMP_7_1_CLASS_ID =
- "clasid:6BF52A52-394A-11D3-B153-00C04F79FAA6";
-
-
- // control data for showing no visible controls on Windows Media Player 7.1
- private static final MediaRenderer.ControlData _WMP_7_1_NONE_VISIBLE_CONTROL_DATA =
- new MediaRenderer.ControlData(new String[]{"uimode", "none"},
- true, // autosizes
- 0,
- IntegerUtils.getInteger(0));
-
- // control data for showing typical controls on Windows Media Player 7.1
- private static final MediaRenderer.ControlData _WMP_7_1_TYPICAL_CONTROL_DATA =
- new MediaRenderer.ControlData(null,// typical is the default
- true, // autosizes
- _WMP_CONTROL_HEIGHT,
- _WMP_ALL_CONTROLS_WIDTH);
-
- //
- // ControlSet shared by all primary content types on WMP 7.1
- //
- private static final MediaRenderer.ControlSet _WINDOWS_7_1_CONTROL_SET = new MediaRenderer.ControlSet(
- new Object[]
- {
- CoreMedia.CONTROLS_NONE, _WMP_7_1_NONE_VISIBLE_CONTROL_DATA,
- CoreMedia.CONTROLS_NONE_VISIBLE, _WMP_7_1_NONE_VISIBLE_CONTROL_DATA,
- CoreMedia.CONTROLS_MINIMAL, new MediaRenderer.ControlData(new String[]{"uimode", "mini"},
- true, // autosizes
- _WMP_CONTROL_HEIGHT,
- _WMP_ALL_CONTROLS_WIDTH),
- CoreMedia.CONTROLS_TYPICAL, _WMP_7_1_TYPICAL_CONTROL_DATA,
- CoreMedia.CONTROLS_ALL, _WMP_7_1_TYPICAL_CONTROL_DATA,
- });
-
- private static final MediaRenderer.PlayerData _WINDOWS_7_1_PLAYER_DATA =
- new MediaRenderer.PlayerData(
- CoreMedia.PLAYER_WINDOWS, // player type
- true, // autostart by default
- "1", // autostartTrueValue
- "0", // autostartFalseValue
- true, // can always autosize
- null, // min player height
- "autostart", // autostartParamName
- "filename", // sourceParamName
- "playcount", // infiniteLoopParamName,
- IntegerUtils.getInteger(0), // infiniteLoopParamValue
- "playcount", // playCountParamName
- "http://www.microsoft.com/Windows/MediaPlayer/", // pluginsPage
- _WMP_CODE_BASE, // <Object> CodeBase
- "application/x-mplayer2", // playerMimeType
- _WMP_7_1_CLASS_ID, // <Object> ClassID
- "application/x-oleobject", // overrideContentType
- null, // wireImageToControlsParamName
- null, // imageWindowControlData
- new Object[]
- {
- "audio", _WINDOWS_7_1_CONTROL_SET,
- "video", _WINDOWS_7_1_CONTROL_SET,
- },
- new String[] // mime-types not supported by Windows Media Player 7.0.1
- {
- _QUICKTIME_MIME_TYPE,
- _QUICKTIME_MIME_TYPE,
- _REAL_AUDIO_MIME_TYPE,
- _REAL_AUDIO_PN_MIME_TYPE,
- _REAL_AUDIO_PLUGIN_MIME_TYPE,
- _REAL_VIDEO_MIME_TYPE,
- _REAL_VIDEO_PN_MIME_TYPE,
- _REAL_VIDEO_PLUGIN_MIME_TYPE,
- });
- */
-
- //
// Meta Data for the Real Player
//
private static final Number _REAL_MINIMAL_WIDTH = new Integer(44);
@@ -1840,7 +1760,7 @@
new MediaRenderer.ControlData(null,
false, // no autosize
0,
- IntegerUtils.getInteger(0));
+ 0);
@@ -1853,7 +1773,7 @@
},
false, // no autosize
0,
- IntegerUtils.getInteger(0));
+ 0);
@@ -1887,7 +1807,7 @@
new MediaRenderer.ControlData(new String[]{"controls", ""},
false, // no autosize
0,
- IntegerUtils.getInteger(0));
+ 0);
private static final MediaRenderer.PlayerData _REAL_PLAYER_DATA =
@@ -2035,13 +1955,13 @@
// Object constants for OS's
//
private static final Integer _WINDOWS_OS =
- IntegerUtils.getInteger(TrinidadAgent.OS_WINDOWS);
+ TrinidadAgent.OS_WINDOWS;
private static final Integer _MAC_OS =
- IntegerUtils.getInteger(TrinidadAgent.OS_MACOS);
+ TrinidadAgent.OS_MACOS;
private static final Integer _SOLARIS_OS =
- IntegerUtils.getInteger(TrinidadAgent.OS_SOLARIS);
+ TrinidadAgent.OS_SOLARIS;
// Preferred Players for Operating Systems
/* CURRENTLY UNUSED
@@ -2070,10 +1990,10 @@
//
private static Object[] _DEFAULT_INNER_SIZES = new Object[]
{
- "audio", new Number[]{IntegerUtils.getInteger(0),
- IntegerUtils.getInteger(0)},
- "video", new Number[]{IntegerUtils.getInteger(200),
- IntegerUtils.getInteger(150)},
+ "audio", new Number[]{0,
+ 0},
+ "video", new Number[]{200,
+ 150},
};
private static final int _DEFAULT_INNER_WIDTH_INDEX = 0;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java Thu Oct 26 15:42:18 2006
@@ -24,10 +24,7 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.core.layout.CorePanelHeader;
-
import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
import org.apache.myfaces.trinidad.skin.Icon;
@@ -362,7 +359,7 @@
else
size = sizeNumber.intValue() + 1;
- setContextHeaderSize(arc, IntegerUtils.getInteger(size));
+ setContextHeaderSize(arc, size);
return size;
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java Thu Oct 26 15:42:18 2006
@@ -29,7 +29,7 @@
import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
public class PanelListRenderer extends XhtmlRenderer
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java Thu Oct 26 15:42:18 2006
@@ -24,7 +24,7 @@
import org.apache.myfaces.trinidad.component.UIXProcess;
import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java Thu Oct 26 15:42:18 2006
@@ -45,7 +45,7 @@
import org.apache.myfaces.trinidad.skin.Skin;
import org.apache.myfaces.trinidad.skin.Icon;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.renderkit.uix.SelectItemSupport;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java Thu Oct 26 15:42:18 2006
@@ -39,7 +39,7 @@
import org.apache.myfaces.trinidad.context.PartialPageContext;
import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.skin.Icon;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.util.Range;
public class SelectRangeChoiceBarRenderer extends XhtmlRenderer
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java Thu Oct 26 15:42:18 2006
@@ -29,21 +29,19 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.core.input.CoreInputColor;
+import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.event.ReturnEvent;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.render.RenderUtils;
-
+import org.apache.myfaces.trinidad.skin.Icon;
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.convert.ColorConverter;
-import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.pages.GenericEntry;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.AliasedScriptlet;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.ColorFieldInfoScriptlet;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.ConfigurationScriptlet;
-import org.apache.myfaces.trinidad.skin.Icon;
import org.apache.myfaces.trinidadinternal.style.util.CSSUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
@@ -367,7 +365,7 @@
if (converter instanceof ColorConverter)
{
int columns = ((ColorConverter) converter).getColumns(FacesContext.getCurrentInstance());
- columnsInteger = IntegerUtils.getInteger(columns);
+ columnsInteger = columns;
}
else
{
@@ -627,9 +625,7 @@
}
- private static final Integer _DEFAULT_COLUMNS = IntegerUtils.getInteger(11);
- // @todo 7 seems better than 11 - fix?
- // private static final Integer _DEFAULT_COLUMNS = IntegerUtils.getInteger(7);
+ private static final Integer _DEFAULT_COLUMNS = 11;
// AdfRenderingContext property key for the Map which tracks whether
// a ChooseColor id has been encountered
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java Thu Oct 26 15:42:18 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
import java.io.IOException;
-
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
@@ -32,23 +31,20 @@
import javax.faces.convert.DateTimeConverter;
import javax.faces.validator.Validator;
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.core.input.CoreInputDate;
+import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.event.ReturnEvent;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.render.RenderUtils;
import org.apache.myfaces.trinidad.validator.DateTimeRangeValidator;
-
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.convert.GenericConverterFactory;
-import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.pages.GenericEntry;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.ConfigurationScriptlet;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
@@ -402,7 +398,7 @@
{
int columns = ((org.apache.myfaces.trinidadinternal.convert.DateTimeConverter)
converter).getColumns();
- columnsInteger = IntegerUtils.getInteger(columns);
+ columnsInteger = (columns);
}
else
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java Thu Oct 26 15:42:18 2006
@@ -30,7 +30,7 @@
import org.apache.myfaces.trinidad.context.Agent;
import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
* @todo Do we need to incorporate bug 2669974???
@@ -181,7 +181,7 @@
if (intCol > _MAX_COLUMNS)
{
intCol = _MAX_COLUMNS;
- columns = IntegerUtils.getInteger(intCol);
+ columns = intCol;
}
}
}
@@ -198,7 +198,7 @@
{
Object rows = getRows(bean);
if (rows == null)
- rows = IntegerUtils.getInteger(getDefaultRows());
+ rows = getDefaultRows();
else
{
if (rows instanceof Number)
@@ -208,7 +208,7 @@
int intRow = ((Number) rows).intValue();
if (intRow > _MAX_ROWS)
{
- rows = IntegerUtils.getInteger(_MAX_ROWS);
+ rows = _MAX_ROWS;
}
}
}
@@ -492,7 +492,7 @@
colAdjust = 1;
}
- columns = IntegerUtils.getInteger((int) colAdjust);
+ columns = (int) colAdjust;
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java Thu Oct 26 15:42:18 2006
@@ -33,7 +33,7 @@
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
*/
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java Thu Oct 26 15:42:18 2006
@@ -32,7 +32,7 @@
import org.apache.myfaces.trinidad.component.core.input.CoreSelectManyListbox;
import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
* Renderer for SelectMany listboxes.
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java Thu Oct 26 15:42:18 2006
@@ -32,7 +32,7 @@
import org.apache.myfaces.trinidad.component.core.input.CoreSelectOneListbox;
import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
*/
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java Thu Oct 26 15:42:18 2006
@@ -33,7 +33,7 @@
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
*/
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java Thu Oct 26 15:42:18 2006
@@ -38,7 +38,7 @@
import org.apache.myfaces.trinidad.context.FormData;
import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.uix.SelectItemSupport;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
*/
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java Thu Oct 26 15:42:18 2006
@@ -57,7 +57,7 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TableSelectManyRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TableSelectOneRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TreeUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
abstract public class TableRenderer extends XhtmlRenderer
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DateFormatInfoScriptlet.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DateFormatInfoScriptlet.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DateFormatInfoScriptlet.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DateFormatInfoScriptlet.java Thu Oct 26 15:42:18 2006
@@ -21,7 +21,7 @@
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java Thu Oct 26 15:42:18 2006
@@ -105,8 +105,8 @@
new AliasedScriptlet(LOCALE_LIB, new String[]{
"getUserLanguage()",
"getJavaLanguage()",
- "Converter()",
- "Validator()",
+ "TrConverter()",
+ "TrValidator()",
"FastMessageFormatUtils()",
"isDigit()",
"parseDigit()",
@@ -158,11 +158,11 @@
new AliasedScriptlet(DATE_FORMAT_LIB,
new String[]
{
- "SimpleDateFormat()",
+ "TrDateTimeConverter()",
},
new String[]
{
- "Converter()",
+ "TrConverter()",
LocaleInfoScriptlet.LOCALE_INFO_KEY,
DateFormatInfoScriptlet.DATE_FORMAT_INFO_KEY,
});
@@ -170,13 +170,12 @@
new AliasedScriptlet(CORE_FORMAT_LIB,
new String[]
{
- "DecimalFormat()",
- "DecimalConvert()",
- "RegExpFormat()",
+ "TrNumberConverter()",
+ "TrRegExpValidator()",
},
new String[]
{
- "Converter()",
+ "TrConverter()",
LocaleInfoScriptlet.LOCALE_INFO_KEY,
});
@@ -190,7 +189,7 @@
},
new String[]
{
- "Validator()",
+ "TrValidator()",
});
_sShuttleScriptlet =
@@ -221,13 +220,13 @@
new AliasedScriptlet(COLOR_FORMAT_LIB,
new String[]
{
- "Color()",
+ "TrColor()",
"ColorFormat()",
- "RGBColorFormat()",
+ "TrColorConverter()",
},
new String[]
{
- "Converter()",
+ "TrConverter()",
ColorFormatInfoScriptlet.COLOR_FORMAT_INFO_KEY,
LocaleInfoScriptlet.LOCALE_INFO_KEY,
});
@@ -240,7 +239,7 @@
},
new String[]
{
- "SimpleDateFormat()",
+ "TrDateTimeConverter()",
});
_sDateFieldScriptlet =
new AliasedScriptlet(DATE_FIELD_LIB,
@@ -268,7 +267,7 @@
},
new String[]
{
- "RGBColorFormat()",
+ "TrColorConverter()",
});
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/CellUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/CellUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/CellUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/CellUtils.java Thu Oct 26 15:42:18 2006
@@ -24,7 +24,6 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/renderkit/core/xhtml/table/CellUtils.java#0 $) $Date: 10-nov-2005.19:02:33 $
@@ -75,7 +74,7 @@
writer.writeAttribute(isRowSpan
? XhtmlConstants.ROWSPAN_ATTRIBUTE
: XhtmlConstants.COLSPAN_ATTRIBUTE,
- IntegerUtils.getInteger(value),
+ value,
null);
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/DetailColumnRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/DetailColumnRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/DetailColumnRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/DetailColumnRenderer.java Thu Oct 26 15:42:18 2006
@@ -26,7 +26,7 @@
import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.render.CoreRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ShowDetailRenderer;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
public class DetailColumnRenderer extends SpecialColumnRenderer
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java Thu Oct 26 15:42:18 2006
@@ -39,7 +39,7 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
* Class that handles all tree related events
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java Thu Oct 26 15:42:18 2006
@@ -20,20 +20,14 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-
import java.util.Date;
import java.util.List;
import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
-
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
import org.apache.myfaces.trinidadinternal.share.text.ColorFormat;
import org.apache.myfaces.trinidadinternal.share.text.RGBColorFormat;
-
import org.apache.myfaces.trinidadinternal.share.xml.NamespaceURI;
import org.apache.myfaces.trinidadinternal.share.xml.XMLUtils;
-
import org.apache.myfaces.trinidadinternal.style.Style;
import org.apache.myfaces.trinidadinternal.style.util.CSSUtils;
@@ -123,7 +117,7 @@
Integer[] ints = new Integer[array.length];
for (int i = 0; i < array.length; i++)
{
- ints[i] = IntegerUtils.getInteger(Integer.parseInt(array[i]));
+ ints[i] = Integer.parseInt(array[i]);
}
return ints;
@@ -385,12 +379,12 @@
}
else if (value instanceof Number)
{
- return IntegerUtils.getInteger(((Number)value).intValue());
+ return ((Number)value).intValue();
}
else
{
int intValue = Integer.parseInt(value.toString());
- return IntegerUtils.getInteger(intValue);
+ return intValue;
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java Thu Oct 26 15:42:18 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.skin;
import java.io.StringReader;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -26,7 +25,6 @@
import org.apache.myfaces.trinidadinternal.style.util.NameUtils;
import org.apache.myfaces.trinidadinternal.style.util.StyleUtils;
import org.apache.myfaces.trinidadinternal.style.xml.parse.PropertyNode;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
/** As the Skin css file is parsed, methods in this class are called to
@@ -332,7 +330,7 @@
int agentInt = NameUtils.getBrowser(typeArray[i].trim());
if (agentInt != TrinidadAgent.APPLICATION_UNKNOWN)
- list.add(IntegerUtils.getInteger(agentInt));
+ list.add(agentInt);
}
}
else if (type == _AT_PLATFORM)
@@ -342,7 +340,7 @@
int platformInt = NameUtils.getPlatform(typeArray[i].trim());
if (platformInt != TrinidadAgent.OS_UNKNOWN)
- list.add(IntegerUtils.getInteger(platformInt));
+ list.add(platformInt);
}
}
return _getIntArray(list);