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 aw...@apache.org on 2006/08/06 23:12:54 UTC
svn commit: r429208 [9/14] - in /incubator/adffaces/trunk/trinidad:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/co...
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.java Sun Aug 6 16:12:37 2006
@@ -55,20 +55,24 @@
super(name, empty, closeRequired);
}
+ @Override
public void writeInlineStyle(FacesContext context, String style)
{
}
+ @Override
public void writeStyleClass(FacesContext context, String styleClass)
{
}
+ @Override
public void writeHRef(FacesContext context, String href)
{
}
+ @Override
public void writeSize(FacesContext context, String fontSize)
throws IOException
{
@@ -89,6 +93,7 @@
super(name, empty, closeRequired);
}
+ @Override
public void writeInlineStyle(FacesContext context, String style)
throws IOException
{
@@ -102,6 +107,7 @@
}*/
}
+ @Override
public void writeStyleClass(FacesContext context, String styleClass)
throws IOException
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java Sun Aug 6 16:12:37 2006
@@ -252,6 +252,7 @@
* that deliver events should always return "true".
* @todo Profile and possibly optimize.
*/
+ @Override
protected boolean shouldRenderId(
FacesContext context,
UIComponent component)
@@ -878,7 +879,7 @@
// since IE has problems with deferred scripts. This property is
// enabled by PanelPartialRootRenderer when rendering the contents
// of the body.
- Map props = arc.getProperties();
+ Map<Object, Object> props = arc.getProperties();
if (isEnabled)
{
// Turn script deferring on
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java Sun Aug 6 16:12:37 2006
@@ -123,7 +123,7 @@
{
if ((XhtmlRenderer.supportsScripting(arc)) && (libKey != null))
{
- Scriptlet scriptlet = (Scriptlet) _sScriptletTable.get(libKey);
+ Scriptlet scriptlet = _sScriptletTable.get(libKey);
if (scriptlet == null)
{
if (_LOG.isWarning())
@@ -505,17 +505,17 @@
}
/** HashMap mapping names to their scriptlets */
- private static Map _sScriptletTable =
- Collections.synchronizedMap(new HashMap(37));
+ private static Map<Object, Scriptlet> _sScriptletTable =
+ Collections.synchronizedMap(new HashMap<Object, Scriptlet>(37));
// Key for storing whether we've written out the script
// for storing loaded libraries
static private final Object _PORTLET_LIB_TABLE_KEY = new Object();
- static private final Set
- _NON_STRUCTURAL_COMPONENT_FAMILIES = new HashSet();
+ static private final Set<String> _NON_STRUCTURAL_COMPONENT_FAMILIES;
static
{
+ _NON_STRUCTURAL_COMPONENT_FAMILIES = new HashSet<String>();
_NON_STRUCTURAL_COMPONENT_FAMILIES.add(UIXIterator.COMPONENT_FAMILY);
_NON_STRUCTURAL_COMPONENT_FAMILIES.add(UIXComponentRef.COMPONENT_FAMILY);
_NON_STRUCTURAL_COMPONENT_FAMILIES.add(UIXSubform.COMPONENT_FAMILY);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java Sun Aug 6 16:12:37 2006
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.Iterator;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Properties;
@@ -43,17 +42,15 @@
*/
static public void registerAliases()
{
- HashSet aliases = new HashSet();
- Enumeration names = _ALIASES.propertyNames();
+ HashSet<String> aliases = new HashSet<String>();
+ Enumeration<?> names = _ALIASES.propertyNames();
while (names.hasMoreElements())
{
aliases.add(_ALIASES.getProperty((String) names.nextElement()));
}
- Iterator iterator = aliases.iterator();
- while (iterator.hasNext())
+ for(String libName : aliases)
{
- String libName = (String) iterator.next();
Scriptlet scriptlet = null;
if ("Common".equals(libName))
@@ -64,6 +61,7 @@
// when it's outside of a partial page request, since the
// partial page library itself needs it.
// See comments in Scriptlet.__isOutsidePartialPage()
+ @Override
boolean __isOutsidePartialPage(RenderingContext arc)
{
return false;
@@ -97,11 +95,13 @@
_actualLibrary = _getAlias(name);
}
+ @Override
public Object getScriptletKey()
{
return _name;
}
+ @Override
public void registerSelf()
{
super.registerSelf();
@@ -112,6 +112,7 @@
}
}
+ @Override
protected void outputScriptletImpl(
FacesContext context,
RenderingContext arc) throws IOException
@@ -125,6 +126,7 @@
outputDependency(context, arc, _actualLibrary);
}
+ @Override
protected void outputScriptletContent(
FacesContext context,
RenderingContext arc) throws IOException
@@ -159,7 +161,7 @@
_LOG = TrinidadLogger.createTrinidadLogger(AliasedScriptlet.class);
// Load library versions
- Class cl = AliasedScriptlet.class;
+ Class<AliasedScriptlet> cl = AliasedScriptlet.class;
InputStream in = cl.getResourceAsStream(_JAVASCRIPT_ALIAS_FILE);
if (in == null)
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFieldInfoScriptlet.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFieldInfoScriptlet.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFieldInfoScriptlet.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFieldInfoScriptlet.java Sun Aug 6 16:12:37 2006
@@ -44,6 +44,7 @@
return _sInstance;
}
+ @Override
public Object getScriptletKey()
{
return COLOR_FIELD_INFO_KEY;
@@ -52,6 +53,7 @@
/**
* @todo Rebuild in Faces-major land
*/
+ @Override
protected void outputScriptletContent(
FacesContext context,
RenderingContext arc) throws IOException
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFormatInfoScriptlet.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFormatInfoScriptlet.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFormatInfoScriptlet.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFormatInfoScriptlet.java Sun Aug 6 16:12:37 2006
@@ -42,6 +42,7 @@
{
}
+ @Override
public Object getScriptletKey()
{
return COLOR_FORMAT_INFO_KEY;
@@ -50,6 +51,7 @@
/**
* @todo GET TRANSPARENT OFF OF SKIN, NOT HARDCODED BUNDLE
*/
+ @Override
protected void outputScriptletContent(
FacesContext context,
RenderingContext arc) throws IOException
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ConfigurationScriptlet.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ConfigurationScriptlet.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ConfigurationScriptlet.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ConfigurationScriptlet.java Sun Aug 6 16:12:37 2006
@@ -34,6 +34,7 @@
{
}
+ @Override
public Object getScriptletKey()
{
return _CONFIGURATION_SCRIPTLET_KEY;
@@ -52,6 +53,7 @@
/**
* @todo See if truly necessary.
*/
+ @Override
protected void outputScriptletContent(
FacesContext context,
RenderingContext arc)
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?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- 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 Sun Aug 6 16:12:37 2006
@@ -43,11 +43,13 @@
{
}
+ @Override
public Object getScriptletKey()
{
return DATE_FORMAT_INFO_KEY;
}
+ @Override
protected void outputScriptletContent(
FacesContext context,
RenderingContext arc) throws IOException
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DefaultTimeZoneScriptlet.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DefaultTimeZoneScriptlet.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DefaultTimeZoneScriptlet.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DefaultTimeZoneScriptlet.java Sun Aug 6 16:12:37 2006
@@ -39,11 +39,13 @@
{
}
+ @Override
public Object getScriptletKey()
{
return DEFAULT_TIME_ZONE_KEY;
}
+ @Override
protected void outputScriptletImpl(
FacesContext context,
RenderingContext arc) throws IOException
@@ -52,6 +54,7 @@
super.outputScriptletImpl(context, arc);
}
+ @Override
protected void outputScriptletContent(
FacesContext context,
RenderingContext arc) throws IOException
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/GlobalVariablesScriptlet.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/GlobalVariablesScriptlet.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/GlobalVariablesScriptlet.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/GlobalVariablesScriptlet.java Sun Aug 6 16:12:37 2006
@@ -36,6 +36,7 @@
{
}
+ @Override
public Object getScriptletKey()
{
return GLOBAL_VARIABLES_KEY;
@@ -51,6 +52,7 @@
return _sInstance;
}
+ @Override
protected void outputScriptletContent(
FacesContext context,
RenderingContext arc) throws IOException
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/JspDirScriptlet.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/JspDirScriptlet.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/JspDirScriptlet.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/JspDirScriptlet.java Sun Aug 6 16:12:37 2006
@@ -41,11 +41,13 @@
{
}
+ @Override
public Object getScriptletKey()
{
return JSP_DIR_KEY;
}
+ @Override
protected void outputScriptletContent(
FacesContext context,
RenderingContext arc) throws IOException
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java Sun Aug 6 16:12:37 2006
@@ -46,7 +46,7 @@
_dependencies = dependencies;
}
-
+ @Override
public void registerSelf()
{
super.registerSelf();
@@ -57,7 +57,7 @@
}
}
-
+ @Override
public Object getScriptletKey()
{
return _libraryName;
@@ -81,6 +81,7 @@
return libraryName;
}
+ @Override
protected void outputScriptletImpl(
FacesContext context,
RenderingContext arc) throws IOException
@@ -94,6 +95,7 @@
XhtmlUtils.writeLibImport(context, arc, _getLibraryURL(context, arc));
}
+ @Override
protected void outputScriptletContent(
FacesContext context,
RenderingContext arc) throws IOException
@@ -101,6 +103,7 @@
// No-op.
}
+ @Override
protected void embedInScriptTagImpl(
FacesContext context,
RenderingContext arc) throws IOException
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java Sun Aug 6 16:12:37 2006
@@ -56,6 +56,7 @@
* @todo Revisit separate translation and internationalization
* locales.
*/
+ @Override
protected void outputScriptletImpl(
FacesContext context,
RenderingContext arc) throws IOException
@@ -108,6 +109,7 @@
super.outputScriptletImpl(context, arc);
}
+ @Override
protected String getLibraryName(
FacesContext context,
RenderingContext arc)
@@ -163,7 +165,9 @@
Locale inLocale
)
{
- HashMap supportedMap = LocaleList.getSupportedLocales();
+ HashMap<Locale, Locale> supportedMap =
+ LocaleList.getSupportedLocales();
+
Locale outLocale = inLocale;
if(supportedMap.containsKey(outLocale))
{
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?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- 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 Sun Aug 6 16:12:37 2006
@@ -90,6 +90,8 @@
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;
@@ -143,6 +145,7 @@
// =-=AEW The MarlinCore library needs to be rendered even
// when it's outside of a partial page request, since the
// partial page library itself needs it.
+ @Override
boolean __isOutsidePartialPage(RenderingContext context)
{
return false;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/BandingData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/BandingData.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/BandingData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/BandingData.java Sun Aug 6 16:12:37 2006
@@ -32,18 +32,21 @@
/**
* @param context gets the appropriate banding data from this context.
*/
+ @SuppressWarnings("unchecked")
public static BandingData create(TableRenderingContext context)
{
// using the variable name "hgrid" so that we don't forget that
// the table instance might infact be an hgrid:
UIComponent hgrid = context.getTable();
- Map attrs = hgrid.getAttributes();
+ Map<String, Object> attrs = hgrid.getAttributes();
int row = _getInterval(attrs, CoreTable.ROW_BANDING_INTERVAL_KEY);
int col = _getInterval(attrs, CoreTable.COLUMN_BANDING_INTERVAL_KEY);
return new BandingData(col, row);
}
- private static int _getInterval(Map attrs, PropertyKey key)
+ private static int _getInterval(
+ Map<String, Object> attrs,
+ PropertyKey key)
{
Number num = (Number) attrs.get(key.getName());
int interval = (num != null) ? num.intValue() : 0;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/ColumnData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/ColumnData.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/ColumnData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/ColumnData.java Sun Aug 6 16:12:37 2006
@@ -18,6 +18,7 @@
import java.awt.Dimension;
import java.util.ArrayList;
+import java.util.List;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.component.UIXTreeTable;
@@ -430,7 +431,7 @@
private Data _get(int physicalIndex)
{
- Data d = (Data) _data.get(physicalIndex);
+ Data d = _data.get(physicalIndex);
assert (d != null)
: "no column data for physicalIndex:" + physicalIndex;
return d;
@@ -551,7 +552,7 @@
private int _rowIndex = -1;
private final Dimension _currentSpan = new Dimension(1,1);
- private final ArrayList _data = new ArrayList(10);
+ private final List<Data> _data = new ArrayList<Data>(10);
// this constants is used for assert only:
private boolean _assertInitMode = true;
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?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- 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 Sun Aug 6 16:12:37 2006
@@ -31,6 +31,7 @@
public class DetailColumnRenderer extends SpecialColumnRenderer
{
+ @Override
protected void encodeAll(
FacesContext context,
RenderingContext arc,
@@ -55,17 +56,20 @@
super.encodeAll(context, arc, component, bean);
}
+ @Override
protected String getHeaderText(FacesBean bean)
{
RenderingContext arc = RenderingContext.getCurrentInstance();
return arc.getTranslatedString("af_table.DETAIL_COLUMN_HEADER");
}
+ @Override
protected boolean getNoWrap(FacesBean bean)
{
return true;
}
+ @Override
protected void renderKids(FacesContext context,
RenderingContext arc,
TableRenderingContext tContext,
@@ -87,6 +91,7 @@
super(CoreTable.TYPE);
}
+ @Override
protected void renderAllAttributes(
FacesContext context,
RenderingContext arc,
@@ -107,6 +112,7 @@
super.renderPromptStart(context, arc, component, bean);
}
+ @Override
protected String getValueParameter(UIComponent component)
{
UIXCollection cb = (UIXCollection) component;
@@ -114,11 +120,13 @@
return IntegerUtils.getString(rowIndex);
}
+ @Override
protected boolean isTableDetailDisclosure()
{
return true;
}
+ @Override
protected boolean getDisclosed(FacesBean bean)
{
TableRenderingContext tContext = TableRenderingContext.getCurrentInstance();
@@ -126,11 +134,13 @@
return (table.getDisclosedRowKeys().isContained());
}
+ @Override
protected String getLinkId(String rootId, boolean disclosed)
{
return _getDetailLinkId(TableRenderingContext.getCurrentInstance());
}
+ @Override
protected String getClientId(FacesContext context, UIComponent component)
{
TableRenderingContext tContext = TableRenderingContext.getCurrentInstance();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/FocusColumnRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/FocusColumnRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/FocusColumnRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/FocusColumnRenderer.java Sun Aug 6 16:12:37 2006
@@ -34,22 +34,26 @@
public class FocusColumnRenderer extends SpecialColumnRenderer
{
+ @Override
protected String getHeaderText(FacesBean bean)
{
RenderingContext arc = RenderingContext.getCurrentInstance();
return arc.getTranslatedString("af_treeTable.FOCUS_COLUMN_HEADER");
}
+ @Override
protected String getHeaderStyleClass(TableRenderingContext tContext)
{
return XhtmlConstants.AF_COLUMN_HEADER_ICON_STYLE;
}
+ @Override
protected String getFormatType(FacesBean bean)
{
return CoreColumn.ALIGN_CENTER;
}
+ @Override
protected void renderKids(FacesContext context,
RenderingContext arc,
TableRenderingContext trc,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/RenderStage.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/RenderStage.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/RenderStage.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/RenderStage.java Sun Aug 6 16:12:37 2006
@@ -52,6 +52,7 @@
return ps;
}
+ @Override
public String toString()
{
return "RenderStage:"+_stage;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/RowData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/RowData.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/RowData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/RowData.java Sun Aug 6 16:12:37 2006
@@ -93,8 +93,14 @@
public void setCurrentRowSpan(int rowSpan)
{
- boolean assertEnabled = false;
- assert assertEnabled = true;
+ // -= Simon Lessard =-
+ // I really dislike to see assert used like that. It's much like
+ // #ifdef __DEBUG, but it has a performance cost as well since
+ // assertEnabled get instanciated for nothing and this add one
+ // if to the coding path. This basically break the purpose of
+ // the assert to not polute the execution when not enabled.
+ boolean assertEnabled = false;
+ assert assertEnabled = true;
if (rowSpan < 0)
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java Sun Aug 6 16:12:37 2006
@@ -27,6 +27,7 @@
public class SelectionColumnRenderer extends SpecialColumnRenderer
{
+ @Override
protected void renderKids(FacesContext context,
RenderingContext arc,
TableRenderingContext trc,
@@ -40,7 +41,7 @@
: _singleRenderer);
}
-
+ @Override
protected String getHeaderText(FacesBean bean)
{
RenderingContext arc = RenderingContext.getCurrentInstance();
@@ -54,17 +55,19 @@
return arc.getTranslatedString(key);
}
+ @Override
protected boolean getNoWrap(FacesBean bean)
{
return false;
}
-
+ @Override
protected String getFormatType(FacesBean bean)
{
return CoreColumn.ALIGN_CENTER;
}
+ @Override
protected String getHeaderStyleClass(TableRenderingContext tContext)
{
return XhtmlConstants.AF_COLUMN_HEADER_ICON_STYLE;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java Sun Aug 6 16:12:37 2006
@@ -36,23 +36,25 @@
return _specialColumn;
}
+ @Override
protected boolean getHeaderNoWrap(FacesBean bean)
{
return true;
}
-
+ @Override
protected boolean getSortable(FacesBean bean)
{
return false;
}
-
+ @Override
protected String getSortProperty(FacesBean bean)
{
return null;
}
+ @Override
protected String getHeaderInlineStyle(RenderingContext arc)
{
if (XhtmlRenderer.isIE(arc))
@@ -61,6 +63,7 @@
return null;
}
+ @Override
protected boolean isSpecialColumn()
{
return true;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java Sun Aug 6 16:12:37 2006
@@ -41,7 +41,7 @@
{
static public TableRenderingContext getCurrentInstance()
{
- return (TableRenderingContext) _CURRENT_CONTEXT.get();
+ return _CURRENT_CONTEXT.get();
}
public TableRenderingContext(
@@ -219,7 +219,8 @@
* Gets the selection state for this table.
* This is overwritten in HGridRenderingContext
*/
- public RowKeySet getSelectedRowKeys()
+ @SuppressWarnings("unchecked")
+ public RowKeySet<Object> getSelectedRowKeys()
{
return ((UIXTable) getCollectionComponent()).getSelectedRowKeys();
}
@@ -494,14 +495,15 @@
}
}
+ @SuppressWarnings("unchecked")
private void _gatherChildInformation(
UIComponent parent)
{
- List children = parent.getChildren();
+ List<UIComponent> children = parent.getChildren();
int count = children.size();
for (int index = 0; index < count; index++)
{
- UIComponent child = (UIComponent) children.get(index);
+ UIComponent child = children.get(index);
if (!child.isRendered())
{
@@ -517,8 +519,7 @@
public static boolean isInsideContentOfTable()
{
- TableRenderingContext tContext =
- (TableRenderingContext) _CURRENT_CONTEXT.get();
+ TableRenderingContext tContext = _CURRENT_CONTEXT.get();
if (tContext == null)
return false;
@@ -533,7 +534,7 @@
*/
public final Object getTableProperty(Object key)
{
- Map props = _tableProps;
+ Map<Object, Object> props = _tableProps;
return (props == null) ? null : props.get(key);
}
@@ -545,10 +546,10 @@
*/
public final Object setTableProperty(Object key, Object value)
{
- Map props = _tableProps;
+ Map<Object, Object> props = _tableProps;
if (props == null)
{
- props = new HashMap(5);
+ props = new HashMap<Object, Object>(5);
_tableProps = props;
}
return props.put(key, value);
@@ -590,7 +591,7 @@
// this is a map of properties that are local to this table. This is to
// support nested tables:
- private Map _tableProps = null;
+ private Map<Object, Object> _tableProps = null;
// general fields
@@ -603,5 +604,6 @@
public static final int DONT_KNOW = -1;
- static private final ThreadLocal _CURRENT_CONTEXT = new ThreadLocal();
+ static private final ThreadLocal<TableRenderingContext> _CURRENT_CONTEXT =
+ new ThreadLocal<TableRenderingContext>();
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java Sun Aug 6 16:12:37 2006
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.faces.component.NamingContainer;
@@ -53,6 +52,8 @@
//
// Decode
//
+ @SuppressWarnings("unchecked")
+ @Override
public void decode(FacesContext context, UIComponent component)
{
UIXCollection table = (UIXCollection) component;
@@ -61,9 +62,10 @@
table.setRowIndex(-1);
String tableId = table.getClientId(context);
- Map parameters = context.getExternalContext().getRequestParameterValuesMap();
+ Map<String, String[]> parameters =
+ context.getExternalContext().getRequestParameterValuesMap();
- String[] unselectedBoxes = (String[])
+ String[] unselectedBoxes =
parameters.get(tableId+NamingContainer.SEPARATOR_CHAR+UNSELECTED_KEY);
// check to see if there were any selection boxes in the request.
@@ -72,11 +74,11 @@
if ((unselectedBoxes == null) || (unselectedBoxes.length == 0))
return;
- String[] selectedBoxes = (String[])
+ String[] selectedBoxes =
parameters.get(tableId+NamingContainer.SEPARATOR_CHAR+SELECTED_KEY);
// must work with both table and hgrid:
- final RowKeySet selectionModel;
+ final RowKeySet<Object> selectionModel;
if (table instanceof UIXTable)
selectionModel = ((UIXTable) table).getSelectedRowKeys();
else
@@ -100,9 +102,9 @@
// // have clicked select-all and then deselected some rows before submitting:
// }
- RowKeySet selectedDelta = selectionModel.clone();
+ RowKeySet<Object> selectedDelta = selectionModel.clone();
selectedDelta.clear();
- RowKeySet unselectedDelta = selectedDelta.clone();
+ RowKeySet<Object> unselectedDelta = selectedDelta.clone();
_setDeltas(table, selectedBoxes, unselectedBoxes,
selectionModel, selectedDelta, unselectedDelta);
@@ -117,11 +119,12 @@
private void _setDeltas(UIXCollection table,
String[] selectedBoxes, String[] unselectedBoxes,
- RowKeySet current,
- RowKeySet selectedDelta,
- RowKeySet unselectedDelta)
+ RowKeySet<Object> current,
+ RowKeySet<Object> selectedDelta,
+ RowKeySet<Object> unselectedDelta)
{
- Map deltas = new HashMap(unselectedBoxes.length);
+ Map<String, Boolean> deltas =
+ new HashMap<String, Boolean>(unselectedBoxes.length);
for(int i=0; i< unselectedBoxes.length; i++)
{
String currencyStr = unselectedBoxes[i];
@@ -137,10 +140,9 @@
}
}
- for(Iterator entries=deltas.entrySet().iterator(); entries.hasNext();)
+ for(Map.Entry<String, Boolean> entry : deltas.entrySet())
{
- Map.Entry entry = (Map.Entry) entries.next();
- String currencyStr = (String) entry.getKey();
+ String currencyStr = entry.getKey();
boolean select = (Boolean.TRUE == entry.getValue());
table.setCurrencyString(currencyStr);
@@ -164,11 +166,13 @@
}
}
+ @Override
protected CoreRenderer createCellRenderer(FacesBean.Type type)
{
return new Checkbox(type);
}
+ @Override
protected boolean isSelectOne()
{
return false;
@@ -204,7 +208,7 @@
arc.getFormData().addNeededValue(selectedModeName);
}
-
+ @Override
protected void renderCellContent(
FacesContext context,
RenderingContext arc,
@@ -245,6 +249,7 @@
super(type);
}
+ @Override
protected void renderId(
FacesContext context,
UIComponent component) throws IOException
@@ -264,13 +269,13 @@
}
-
+ @Override
protected Object getType()
{
return "checkbox";
}
-
+ @Override
protected String getDefaultShortDescKey()
{
return "af_tableSelectMany.SELECT_COLUMN_HEADER";
@@ -278,6 +283,8 @@
}
private static final Object _JS_RENDERED_KEY = new Object();
+ // -= Simon Lessard =- nothing is logge in this class as of 2006-08-03
+ @SuppressWarnings("unused")
private static final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(TableSelectManyRenderer.class);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java Sun Aug 6 16:12:37 2006
@@ -49,6 +49,7 @@
super(CoreTable.TYPE);
}
+ @Override
protected void findTypeConstants(FacesBean.Type type)
{
super.findTypeConstants(type);
@@ -58,6 +59,8 @@
//
// Decode
//
+ @SuppressWarnings("unchecked")
+ @Override
public void decode(FacesContext context, UIComponent component)
{
UIXCollection table = (UIXCollection) component;
@@ -70,14 +73,16 @@
String selectionParam = __getSelectionParameterName(context, table);
- Map parameters = context.getExternalContext().getRequestParameterMap();
+ Map<String, String> parameters =
+ context.getExternalContext().getRequestParameterMap();
+
_LOG.finest("Params:{0}", parameters);
- String selection = (String) parameters.get(selectionParam);
+ String selection = parameters.get(selectionParam);
if (selection != null)
{
- final RowKeySet state;
+ final RowKeySet<Object> state;
if (table instanceof UIXTable)
state = ((UIXTable) table).getSelectedRowKeys();
else
@@ -86,14 +91,14 @@
table.setCurrencyString(selection);
if (!state.isContained())
{
- RowKeySet unselected = state.clone();
+ RowKeySet<Object> unselected = state.clone();
// TODO : do not mutate the selectedRowKeys here.
// instead, mutate when event is broadcast:
state.clear();
state.add();
// clone, so that subsequent mutations of "state" will
// not affect the parameters of this event: bug 4733858:
- RowKeySet selected = state.clone();
+ RowKeySet<Object> selected = state.clone();
FacesEvent event = new SelectionEvent(table, unselected, selected);
event.queue();
}
@@ -109,11 +114,13 @@
//
// Encode
//
+ @Override
public boolean getRendersChildren()
{
return true;
}
+ @Override
protected void encodeAll(
FacesContext context,
RenderingContext arc,
@@ -188,6 +195,7 @@
super(type);
}
+ @Override
protected String getCompositeId(String clientId)
{
return null;
@@ -196,6 +204,7 @@
/**
* we do not want to render the simple span for the checkbox.
*/
+ @Override
protected boolean getRenderSimpleSpan(FacesBean bean)
{
return false;
@@ -203,11 +212,13 @@
/**
* don't render a special content style class on the radio.
*/
+ @Override
protected String getContentStyleClass(FacesBean bean)
{
return null;
}
+ @Override
protected void renderId(
FacesContext context,
UIComponent component) throws IOException
@@ -225,6 +236,7 @@
writer.writeAttribute("id", getClientId(context, component), null);
}
+ @Override
protected Object getSubmittedValue(FacesBean bean)
{
TableRenderingContext tContext =
@@ -233,12 +245,13 @@
Boolean.TRUE : Boolean.FALSE;
}
+ @Override
protected Object getType()
{
return "radio";
}
-
+ @Override
protected Object getValueAttr(RenderingContext arc)
{
TableRenderingContext tContext =
@@ -247,7 +260,7 @@
getCurrencyString();
}
-
+ @Override
protected String getShortDesc(FacesBean bean)
{
String key = getDefaultShortDescKey();
@@ -260,16 +273,19 @@
return "af_tableSelectOne.SELECT_COLUMN_HEADER";
}
+ @Override
protected char getAccessKey(FacesBean bean)
{
return CHAR_UNDEFINED;
}
+ @Override
protected boolean isAutoSubmit(FacesBean bean)
{
return false;
}
+ @Override
protected boolean isImmediate(FacesBean bean)
{
TableRenderingContext tContext =
@@ -277,11 +293,13 @@
return tContext.isImmediate();
}
+ @Override
protected boolean getReadOnly(FacesContext context, FacesBean bean)
{
return false;
}
+ @Override
protected boolean getDisabled(FacesBean bean)
{
return false;
@@ -290,6 +308,7 @@
/**
* @todo Support?
*/
+ @Override
protected String getOnblur(FacesBean bean)
{
return null;
@@ -298,11 +317,13 @@
/**
* @todo Support?
*/
+ @Override
protected String getOnfocus(FacesBean bean)
{
return null;
}
+ @Override
protected String getOnchange(FacesBean bean)
{
return null;
@@ -313,6 +334,7 @@
return null;
}
+ @Override
protected String getText(FacesBean bean)
{
return null;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java Sun Aug 6 16:12:37 2006
@@ -34,7 +34,8 @@
public class TreeNodeColumnRenderer extends ColumnRenderer
{
-
+ @SuppressWarnings("unchecked")
+ @Override
protected void renderKids(FacesContext context,
RenderingContext arc,
TableRenderingContext tContext,
@@ -47,7 +48,7 @@
final String onclick;
if (hGrid.isContainer())
{
- RowKeySet treeState = hGrid.getDisclosedRowKeys();
+ RowKeySet<Object> treeState = hGrid.getDisclosedRowKeys();
String jsVarName = ttrc.getJSVarName();
if (treeState.isContained())
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java Sun Aug 6 16:12:37 2006
@@ -40,6 +40,7 @@
_isTop = isTop;
}
+ @Override
public boolean getRendersChildren()
{
// we don't take any children. however, return true so that
@@ -47,6 +48,7 @@
return true;
}
+ @Override
protected void encodeAll(
FacesContext context,
RenderingContext arc,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java Sun Aug 6 16:12:37 2006
@@ -87,7 +87,9 @@
* Gets the selection state for this table.
* This is overwritten in HGridRenderingContext
*/
- public RowKeySet getSelectedRowKeys()
+ @SuppressWarnings("unchecked")
+ @Override
+ public RowKeySet<Object> getSelectedRowKeys()
{
return ((UIXTree) getCollectionComponent()).getSelectedRowKeys();
}
@@ -142,6 +144,7 @@
* Get the actual column count, taking selection, focus
* and object-hierarchy columns into account.
*/
+ @Override
public int getSpecialColumnCount()
{
// we need to add one for the object hierarchy column and possibly another
@@ -153,6 +156,7 @@
/**
* @return null. HGrids cannot have detail-disclosure.
*/
+ @Override
public UIComponent getDetail()
{
return null;
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?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- 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 Sun Aug 6 16:12:37 2006
@@ -193,7 +193,7 @@
return jsVarName+".multiSelect("+(isSelectAll ? "true" : "false")+")";
}
- public static void decodeGotoEvent(final Map parameters,
+ public static void decodeGotoEvent(final Map<String, String> parameters,
UIComponent tree)
{
Object event = parameters.get(EVENT_PARAM);
@@ -201,14 +201,15 @@
{
PreserveState preserve = new PreserveState()
{
+ @Override
protected void process(UIXHierarchy tree)
{
final int newStart;
- String startParam = (String) parameters.get(_START_PARAM);
+ String startParam = parameters.get(_START_PARAM);
if ((startParam == null) || ("".equals(startParam)))
{
// this must be a root level range change:
- startParam = (String) parameters.get(XhtmlConstants.VALUE_PARAM);
+ startParam = parameters.get(XhtmlConstants.VALUE_PARAM);
newStart = Integer.parseInt(startParam) - 1; // value is based at one.
tree.setRowKey(tree.getFocusRowKey());
tree.setRowIndex(newStart);
@@ -228,7 +229,7 @@
}
}
- public static void decodeFocusEvent(final Map parameters,
+ public static void decodeFocusEvent(final Map<String, String> parameters,
UIComponent tree)
{
Object event = parameters.get(EVENT_PARAM);
@@ -236,6 +237,7 @@
{
PreserveState preserve = new PreserveState()
{
+ @Override
protected void process(UIXHierarchy tree)
{
_restorePathFromParam(parameters, tree);
@@ -246,7 +248,7 @@
}
}
- public static void decodeExpandEvents(final Map parameters,
+ public static void decodeExpandEvents(final Map<String, String> parameters,
final UIComponent tree,
final Object focusRowKey)
{
@@ -267,6 +269,7 @@
PreserveState preserve = new PreserveState()
{
+ @Override
protected void process(UIXHierarchy tree)
{
final FacesEvent event;
@@ -283,8 +286,8 @@
else
{
tree.setRowKey(focusRowKey);
- RowKeySet old = _getExpandedRowKeys(tree);
- RowKeySet newset = old.clone();
+ RowKeySet<Object> old = _getExpandedRowKeys(tree);
+ RowKeySet<Object> newset = old.clone();
if (expand)
newset.addAll();
else
@@ -295,8 +298,8 @@
else // expand/collapse event
{
_restorePathFromParam(parameters, tree);
- RowKeySet old = _getExpandedRowKeys(tree);
- RowKeySet newset = old.clone();
+ RowKeySet<Object> old = _getExpandedRowKeys(tree);
+ RowKeySet<Object> newset = old.clone();
newset.setContained(expand);
event = new RowDisclosureEvent(old, newset, tree);
}
@@ -307,7 +310,8 @@
preserve.run((UIXHierarchy) tree);
}
- private static RowKeySet _getExpandedRowKeys(UIXHierarchy tree)
+ @SuppressWarnings("unchecked")
+ private static RowKeySet<Object> _getExpandedRowKeys(UIXHierarchy tree)
{
if (tree instanceof UIXTree)
return ((UIXTree) tree).getDisclosedRowKeys();
@@ -318,9 +322,11 @@
throw new IllegalArgumentException("Don't know how to get disclosedRowKeys from:"+tree);
}
- private static void _restorePathFromParam(Map parameters, UIXHierarchy tree)
+ private static void _restorePathFromParam(
+ Map<String, String> parameters,
+ UIXHierarchy tree)
{
- String currencyString = (String) parameters.get(_PATH_PARAM);
+ String currencyString = parameters.get(_PATH_PARAM);
tree.setCurrencyString(currencyString);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/DontRenderChildrenRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/DontRenderChildrenRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/DontRenderChildrenRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/DontRenderChildrenRenderer.java Sun Aug 6 16:12:37 2006
@@ -22,6 +22,7 @@
*/
public class DontRenderChildrenRenderer extends UINodeRendererBase
{
+ @Override
public boolean getRendersChildren()
{
return false;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java Sun Aug 6 16:12:37 2006
@@ -55,18 +55,20 @@
* @param component the UIComponent object
* @throws IOException when some issues while writing output
*/
+ @SuppressWarnings("unchecked")
+ @Override
public void encodeBegin(FacesContext context, UIComponent component)
throws IOException
{
_LOG.finer("Entering CorePanelAccordionRenderer.encodeBegin()");
- List children = component.getChildren();
+ List<UIComponent> children = component.getChildren();
int numChildren = children.size();
UIComponent disclosedChild = null;
UIXShowDetail renderableChild = null;
for (int indxChild = 0; indxChild < numChildren ; indxChild++ )
{
- UIComponent child = (UIComponent) children.get(indxChild);
+ UIComponent child = children.get(indxChild);
if (! (child instanceof UIXShowDetail) )
{
continue;
@@ -125,6 +127,8 @@
* @param component the UIComponent object
* @throws IOException when some issues while writing output
*/
+ @SuppressWarnings("unchecked")
+ @Override
public void encodeChildren(FacesContext context, UIComponent component)
throws IOException
{
@@ -135,7 +139,7 @@
ResponseWriter out = context.getResponseWriter();
- ListIterator iter = component.getChildren().listIterator();
+ ListIterator<UIComponent> iter = component.getChildren().listIterator();
if (iter == null)
{
@@ -343,6 +347,7 @@
* @param component the UIComponent object
* @throws IOException when some issues while writing output
*/
+ @Override
public void encodeEnd(FacesContext context,
UIComponent component)
throws IOException
@@ -524,9 +529,9 @@
return discloseNone;
}
- private UIXShowDetail _getNextShowDetailChild(ListIterator iter)
+ private UIXShowDetail _getNextShowDetailChild(ListIterator<UIComponent> iter)
{
- UIComponent child = (UIComponent)iter.next();
+ UIComponent child = iter.next();
if (! child.isRendered() )
{
return null;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelChoiceRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelChoiceRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelChoiceRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelChoiceRenderer.java Sun Aug 6 16:12:37 2006
@@ -45,6 +45,7 @@
/**
* {@inheritDoc}
*/
+ @Override
protected void writeAdditionalJS(FacesContext context,
UIComponent component)
throws IOException
@@ -108,6 +109,7 @@
* @inheritDoc
*
*/
+ @Override
protected void renderListDisplay(FacesContext context,
UIComponent component,
String disclosedChildId)
@@ -152,6 +154,7 @@
/**
* {@inheritDoc}
*/
+ @Override
protected String getHTMLControlID(String compId)
{
return compId + _CHOICE_SELECT_SUFFIX_ID_CONST;
@@ -162,6 +165,7 @@
*
* The select control markup is contained within a TD element.
*/
+ @SuppressWarnings("unchecked")
private void _renderSelectItemInTD(FacesContext context,
UIComponent component,
String disclosedChildId)
@@ -190,10 +194,10 @@
URLEncoder encoder = rCtx.getURLEncoder();
// Render options now.
- ListIterator children = component.getChildren().listIterator();
+ ListIterator<UIComponent> children = component.getChildren().listIterator();
while (children.hasNext())
{
- UIComponent child = (UIComponent) children.next();
+ UIComponent child = children.next();
if (child instanceof UIXShowDetail)
{
UIXShowDetail detailItem = (UIXShowDetail) child;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelRadioRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelRadioRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelRadioRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelRadioRenderer.java Sun Aug 6 16:12:37 2006
@@ -45,6 +45,7 @@
/**
* {@inheritDoc}
*/
+ @Override
protected void renderListDisplay(FacesContext context,
UIComponent component,
String disclosedChildId)
@@ -111,6 +112,7 @@
* Each radio control is corresponding to a rendered UIXShowDetail child.
* The disable showDetail children are shown as disabled radio buttons.
*/
+ @SuppressWarnings("unchecked")
private void _renderRadioItemsInTD(FacesContext context,
UIComponent component,
ResponseWriter out,
@@ -137,10 +139,10 @@
URLEncoder encoder = rCtx.getURLEncoder();
- ListIterator children = component.getChildren().listIterator();
+ ListIterator<UIComponent> children = component.getChildren().listIterator();
while (children.hasNext())
{
- UIComponent child = (UIComponent) children.next();
+ UIComponent child = children.next();
if (! (child instanceof UIXShowDetail) )
{
continue;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java Sun Aug 6 16:12:37 2006
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -52,6 +51,7 @@
* {@inheritDoc}
* @return true always
*/
+ @Override
public boolean getRendersChildren()
{
return true;
@@ -67,18 +67,20 @@
* @param component
* @throws IOException
*/
+ @SuppressWarnings("unchecked")
+ @Override
public void encodeBegin(FacesContext context, UIComponent component)
throws IOException
{
_LOG.entering("ShowOneListRendererBase", "encodeBegin");
- List children = component.getChildren();
+ List<UIComponent> children = component.getChildren();
int numChildren = children.size();
UIComponent disclosedChild = null;
UIXShowDetail renderableChild = null;
for (int indxChild = 0; indxChild < numChildren ; indxChild++ )
{
- UIComponent child = (UIComponent) children.get(indxChild);
+ UIComponent child = children.get(indxChild);
if (! (child instanceof UIXShowDetail) )
{
continue;
@@ -90,7 +92,7 @@
{
// Mark the first renderable child
Object disabled =
- (Object) detailChild.getAttributes().get(
+ detailChild.getAttributes().get(
UIConstants.DISABLED_ATTR.getAttributeName());
if (Boolean.TRUE.equals(disabled))
{
@@ -126,6 +128,7 @@
* to CoreShowDetailItem child. If no text attrbute value specified,
* the label remains blank.
*/
+ @Override
public void encodeChildren(FacesContext context, UIComponent component)
throws IOException
{
@@ -261,6 +264,7 @@
* @param component the UIComponent object
* @throws IOException when some issues while writing output
*/
+ @Override
public void encodeEnd(FacesContext context,
UIComponent component)
throws IOException
@@ -458,12 +462,13 @@
* and is disclosed
* @throws IOException
*/
+ @SuppressWarnings("unchecked")
private static String _getDisclosedItemId(FacesContext context,
UIComponent component)
throws IOException
{
String returnId = null;
- ListIterator iter = component.getChildren().listIterator();
+ ListIterator<UIComponent> iter = component.getChildren().listIterator();
if (iter == null)
{
@@ -474,7 +479,7 @@
// other children are ignored.
while ( iter.hasNext())
{
- UIComponent child = (UIComponent) iter.next();
+ UIComponent child = iter.next();
if (! child.isRendered() )
{
continue;
@@ -529,6 +534,7 @@
*
* @throws IOException when any IO error while writing markup
*/
+ @SuppressWarnings("unchecked")
private static void _findAndEncodeChild(FacesContext context,
UIComponent parent,
String disclosedChildId)
@@ -552,9 +558,10 @@
{
if (disclosedChild.getChildCount() > 0)
{
- Iterator children = disclosedChild.getChildren().iterator();
- while (children.hasNext())
- RenderUtils.encodeRecursive(context, (UIComponent) children.next());
+ for(UIComponent child : (List<UIComponent>)disclosedChild.getChildren())
+ {
+ RenderUtils.encodeRecursive(context, child);
+ }
}
}
@@ -572,6 +579,7 @@
* @param disclosedChildId id of the child to be found among it's children
*
*/
+ @SuppressWarnings("unchecked")
private static UIComponent _findChild(FacesContext context,
UIComponent component,
String disclosedChildId)
@@ -580,18 +588,16 @@
{
return null;
}
-
- Iterator childrenList = component.getChildren().iterator();
-
- while (childrenList.hasNext())
+
+ for(UIComponent child : (List<UIComponent>)component.getChildren())
{
- UIComponent child = (UIComponent) childrenList.next();
String childId = child.getClientId(context);
if (disclosedChildId.equals(childId))
{
return child;
}
}
+
return null;
}
@@ -667,10 +673,11 @@
private static final String _POSITION_BOTTOM = "bottom";
private static final String _POSITION_DEFAULT_VALUE = _POSITION_LEFT;
- private static Map positionMap = new HashMap(4);
+ private static Map<String, String> positionMap;
static
{
+ positionMap = new HashMap<String, String>(4);
positionMap.put(_POSITION_LEFT, _POSITION_LEFT);
positionMap.put(_POSITION_RIGHT, _POSITION_RIGHT);
positionMap.put(_POSITION_TOP, _POSITION_TOP);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java Sun Aug 6 16:12:37 2006
@@ -42,12 +42,13 @@
* @param component the UIComponent object
* @throws IOException when can't write onto response writer
*/
+ @SuppressWarnings("unchecked")
static void renderGenericAttributes(UIXRenderingContext rCtx,
UIComponent component,
ResponseWriter out)
throws IOException
{
- Map attrMap = component.getAttributes();
+ Map<String, Object> attrMap = component.getAttributes();
// there is a certain amount of controversy about writing this attribute.
// see bug 1606882
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java Sun Aug 6 16:12:37 2006
@@ -92,17 +92,17 @@
throw new UnsupportedOperationException();
}
- final public Object[] getEntries(PropertyKey listKey, Class clazz)
+ final public Object[] getEntries(PropertyKey listKey, Class<?> clazz)
{
throw new UnsupportedOperationException();
}
- final public boolean containsEntry(PropertyKey listKey, Class clazz)
+ final public boolean containsEntry(PropertyKey listKey, Class<?> clazz)
{
throw new UnsupportedOperationException();
}
- final public Iterator entries(PropertyKey listKey)
+ final public Iterator<? extends Object> entries(PropertyKey listKey)
{
throw new UnsupportedOperationException();
}
@@ -117,12 +117,12 @@
}
- final public Set keySet()
+ final public Set<PropertyKey> keySet()
{
throw new UnsupportedOperationException();
}
- final public Set bindingKeySet()
+ final public Set<PropertyKey> bindingKeySet()
{
throw new UnsupportedOperationException();
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java Sun Aug 6 16:12:37 2006
@@ -16,7 +16,7 @@
package org.apache.myfaces.trinidadinternal.renderkit.htmlBasic;
import java.io.IOException;
-import java.util.Iterator;
+import java.util.List;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -35,23 +35,28 @@
*/
public class HtmlCommandLinkRenderer extends Renderer
{
+ @Override
public void decode(FacesContext context,
UIComponent component)
{
createRenderer(component).decode(context, component);
}
+ @Override
public boolean getRendersChildren()
{
return true;
}
+ @Override
public void encodeChildren(FacesContext context,
UIComponent component) throws IOException
{
// Do nothing - we'll do it all in encodeEnd()
}
+ @SuppressWarnings("unchecked")
+ @Override
public void encodeEnd(FacesContext context,
UIComponent component) throws IOException
{
@@ -60,9 +65,10 @@
Renderer renderer = createRenderer(component);
renderer.encodeBegin(context, component);
- Iterator children = component.getChildren().iterator();
- while (children.hasNext())
- RenderUtils.encodeRecursive(context, (UIComponent) children.next());
+ for(UIComponent child : (List<UIComponent>)component.getChildren())
+ {
+ RenderUtils.encodeRecursive(context, child);
+ }
renderer.encodeEnd(context, component);
}
@@ -72,26 +78,31 @@
final FacesBean bean = new ComponentFacesBean(component);
return new CommandLinkRenderer()
{
+ @Override
public FacesBean getFacesBean(UIComponent comp)
{
return bean;
}
+ @Override
protected String getText(FacesBean bean)
{
return toString(component.getAttributes().get("value"));
}
+ @Override
protected String getShortDesc(FacesBean bean)
{
return toString(component.getAttributes().get("title"));
}
+ @Override
protected char getAccessKey(FacesBean bean)
{
return toChar(component.getAttributes().get("accesskey"));
}
+ @Override
protected String getInlineStyle(FacesBean bean)
{
return toString(component.getAttributes().get("style"));
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java Sun Aug 6 16:12:37 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.renderkit.htmlBasic;
import java.io.IOException;
-import java.util.Iterator;
import java.util.Map;
import javax.faces.component.UIComponent;
@@ -25,7 +24,6 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
-import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
/**
@@ -36,24 +34,27 @@
*/
public class HtmlFormRenderer extends Renderer
{
+ @Override
public void decode(FacesContext context,
UIComponent component)
{
createRenderer(component).decode(context, component);
}
+ @Override
public boolean getRendersChildren()
{
return false;
}
-
+ @Override
public void encodeBegin(FacesContext context,
UIComponent component) throws IOException
{
createRenderer(component).encodeBegin(context, component);
}
+ @Override
public void encodeEnd(FacesContext context,
UIComponent component) throws IOException
{
@@ -65,29 +66,35 @@
final FacesBean bean = new ComponentFacesBean(component);
return new FormRenderer()
{
+ @Override
public FacesBean getFacesBean(UIComponent comp)
{
return bean;
}
+ @Override
protected String getInlineStyle(FacesBean bean)
{
return toString(component.getAttributes().get("style"));
}
+ @Override
protected String getTargetFrame(FacesBean bean)
{
return toString(component.getAttributes().get("target"));
}
+ @Override
protected String getShortDesc(FacesBean bean)
{
return toString(component.getAttributes().get("title"));
}
+ @SuppressWarnings("unchecked")
+ @Override
protected boolean getUsesUpload(FacesBean bean)
{
- Map attrs = component.getAttributes();
+ Map<String, Object> attrs = component.getAttributes();
return "multipart/form-data".equals(attrs.get("enctype"));
}
};
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/UINodeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/UINodeRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/UINodeRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/UINodeRenderer.java Sun Aug 6 16:12:37 2006
@@ -39,6 +39,7 @@
*/
abstract public class UINodeRenderer extends javax.faces.render.Renderer
{
+ @Override
public void encodeBegin(FacesContext context,
UIComponent component)
throws IOException
@@ -53,12 +54,14 @@
}
}
+ @Override
public void encodeChildren(FacesContext context,
UIComponent component)
{
// Children-encoding is always handled in getRendersChildren()
}
+ @Override
public void encodeEnd(FacesContext context,
UIComponent component)
throws IOException
@@ -104,6 +107,7 @@
node.setAttributeValue(attrKey, value);
}
+ @Override
public boolean getRendersChildren()
{
return true;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java Sun Aug 6 16:12:37 2006
@@ -35,6 +35,8 @@
*/
public class CommandRenderer extends UINodeRendererBase
{
+ @SuppressWarnings("unchecked")
+ @Override
public void decode(FacesContext context, UIComponent component)
{
RequestContext afContext = RequestContext.getCurrentInstance();
@@ -46,14 +48,16 @@
}
else
{
- Map parameterMap = context.getExternalContext().getRequestParameterMap();
+ Map<String, String> parameterMap =
+ context.getExternalContext().getRequestParameterMap();
+
Object source = parameterMap.get("source");
String clientId = component.getClientId(context);
if ((source != null) && source.equals(clientId))
{
(new ActionEvent(component)).queue();
- Map attrs = component.getAttributes();
+ Map<String, Object> attrs = component.getAttributes();
if (Boolean.TRUE.equals(attrs.get("partialSubmit")))
{
PartialPageUtils.forcePartialRendering(context);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/FormUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/FormUtils.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/FormUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/FormUtils.java Sun Aug 6 16:12:37 2006
@@ -27,11 +27,14 @@
*/
public class FormUtils
{
+ @SuppressWarnings("unchecked")
static public boolean wasSubmitted(
FacesContext context,
UIComponent component)
{
- Map paramMap = context.getExternalContext().getRequestParameterMap();
+ Map<String, String> paramMap =
+ context.getExternalContext().getRequestParameterMap();
+
Object formName = paramMap.get(CoreResponseStateManager.FORM_FIELD_NAME);
boolean submitted = false;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java Sun Aug 6 16:12:37 2006
@@ -31,11 +31,13 @@
*/
public class InputRenderer extends DecodingUINodeRenderer
{
+ @SuppressWarnings("unchecked")
+ @Override
protected boolean wasSubmitted(
FacesContext context,
UIComponent component)
{
- Map attrs = component.getAttributes();
+ Map<String, Object> attrs = component.getAttributes();
if (Boolean.TRUE.equals(attrs.get("readOnly")) ||
Boolean.TRUE.equals(attrs.get("disabled")))
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java Sun Aug 6 16:12:37 2006
@@ -26,6 +26,7 @@
public class MessageBoxRenderer extends UINodeRendererBase
{
+ @Override
public void encodeBegin(
FacesContext context,
UIComponent component) throws IOException
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/NavigationTreeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/NavigationTreeRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/NavigationTreeRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/NavigationTreeRenderer.java Sun Aug 6 16:12:37 2006
@@ -38,12 +38,16 @@
/**
* @todo do not mess with selection here. queue an event.
*/
+ @SuppressWarnings("unchecked")
+ @Override
public void decode(
FacesContext context,
UIComponent component)
{
- Map parameters = context.getExternalContext().getRequestParameterMap();
- String source = (String) parameters.get(UIConstants.SOURCE_PARAM);
+ Map<String, String> parameters =
+ context.getExternalContext().getRequestParameterMap();
+
+ String source = parameters.get(UIConstants.SOURCE_PARAM);
if (!component.getClientId(context).equals(source))
return;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java Sun Aug 6 16:12:37 2006
@@ -38,12 +38,16 @@
{
public static final String TREE_SUFFIX = ":_navigationTree";
+ @SuppressWarnings("unchecked")
+ @Override
public void decode(
FacesContext context,
UIComponent component)
{
- Map parameters = context.getExternalContext().getRequestParameterMap();
- String source = (String) parameters.get(UIConstants.SOURCE_PARAM);
+ Map<String, String> parameters =
+ context.getExternalContext().getRequestParameterMap();
+
+ String source = parameters.get(UIConstants.SOURCE_PARAM);
UIXPage page = (UIXPage)component;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PanelTabbedRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PanelTabbedRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PanelTabbedRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PanelTabbedRenderer.java Sun Aug 6 16:12:37 2006
@@ -38,10 +38,12 @@
* Make sure we've got at least one selected item; if not,
* the "decode" phase will have problems.
*/
+ @SuppressWarnings("unchecked")
+ @Override
public void encodeBegin(FacesContext context, UIComponent component)
throws IOException
{
- List children = component.getChildren();
+ List<UIComponent> children = component.getChildren();
int childCount = children.size();
boolean oneIsDisclosed = false;
for (int i=0; i<childCount; i++)