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 sl...@apache.org on 2007/02/16 00:21:50 UTC
svn commit: r508250 [2/2] - in /incubator/adffaces/trunk/trinidad:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/...
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java Thu Feb 15 16:21:46 2007
@@ -114,7 +114,6 @@
}
// Write the text and access key
- String text = getText(bean);
char accessKey;
if (supportsAccessKeys(arc))
{
@@ -169,6 +168,7 @@
}
// FIXME: move this implementation to XhtmlRenderer
+ @Override
protected void renderStyleAttributes(
FacesContext context,
RenderingContext arc,
@@ -176,7 +176,9 @@
String defaultStyleClass) throws IOException
{
String styleClass = getStyleClass(bean);
- String inlineStyle = getInlineStyle(bean);
+ // -= Simon =-
+ // FIXME: How come inlineStyle is never read
+ //String inlineStyle = getInlineStyle(bean);
List<String> stateStyleClasses = getStateStyleClasses(context, arc, bean);
if ((styleClass==null) &&
@@ -285,6 +287,7 @@
return XhtmlUtils.getChainedJS(base, onclickJS, true);
}
+ @Override
protected String getDefaultStyleClass(FacesBean bean)
{
return SkinSelectors.AF_GO_BUTTON_STYLE_CLASS;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java Thu Feb 15 16:21:46 2007
@@ -208,6 +208,7 @@
return toString(bean.getProperty(_textKey));
}
+ @Override
protected String getDefaultStyleClass(FacesBean bean)
{
RenderingContext arc = RenderingContext.getCurrentInstance();
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=508250&r1=508249&r2=508250
==============================================================================
--- 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 Feb 15 16:21:46 2007
@@ -602,7 +602,7 @@
if (mimeType != null)
{
// check that the format is supported by this player
- if (!((PlayerData)playerData).isSupportedMimeType(mimeType))
+ if (!playerData.isSupportedMimeType(mimeType))
{
playerData = null;
}
@@ -2002,9 +2002,6 @@
private static final int _DEFAULT_INNER_WIDTH_INDEX = 0;
private static final int _DEFAULT_INNER_HEIGHT_INDEX = 1;
-
- // local property for the player identification information
- private static final Object _PLAYER_DATA_KEY = new Object();
// map of mime types to preferred players
private static HashMap<Object, Object> _sPreferredMimePlayers;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java Thu Feb 15 16:21:46 2007
@@ -915,6 +915,8 @@
String destination = toString(itemData.get("destination"));
boolean immediate = false;
boolean partialSubmit = false;
+ // -= Simon =-
+ // FIXME: _EXTRA_SUBMIT_PARAMS_KEY is never restored to its old value
Object old = null;
if (destination == null)
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java Thu Feb 15 16:21:46 2007
@@ -278,6 +278,7 @@
//
// OVERRIDES
//
+ @Override
protected String getDefaultStyleClass(FacesBean bean)
{
return "af|outputLabel";
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java Thu Feb 15 16:21:46 2007
@@ -52,6 +52,7 @@
_contentStyleKey = type.findKey("contentStyle");
}
+ @Override
public String getDefaultStyleClass(FacesBean bean)
{
String background = getBackground(bean);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java Thu Feb 15 16:21:46 2007
@@ -126,6 +126,7 @@
return false;
}
+ @Override
protected String getDefaultStyleClass(FacesBean bean)
{
return SkinSelectors.AF_LABEL_TEXT_STYLE_CLASS;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelTipRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelTipRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelTipRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelTipRenderer.java Thu Feb 15 16:21:46 2007
@@ -47,6 +47,7 @@
return true;
}
+ @Override
protected String getDefaultStyleClass(FacesBean bean)
{
return "af|panelTip";
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java Thu Feb 15 16:21:46 2007
@@ -339,8 +339,6 @@
boolean isPartial
)
{
-
- String argumentString = null;
StringBuilder buffer = new StringBuilder(60);
buffer.append("'");
buffer.append(formName);
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=508250&r1=508249&r2=508250
==============================================================================
--- 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 Feb 15 16:21:46 2007
@@ -1124,7 +1124,7 @@
boolean hasLeadingDesc = getLeadingDescShown(bean);
boolean hasTrailingDesc = getTrailingDescShown(bean);
boolean hasDescArea = hasLeadingDesc || hasTrailingDesc;
- boolean hasDescHere = _isLeading ? hasLeadingDesc : hasTrailingDesc;
+
_endRow(context, rc, 0);
if (hasDescArea)
@@ -1252,15 +1252,11 @@
private final static int _DEFAULT_FOOTER_HEIGHT = 36;
- private final static String _DEFAULT_SHUTTLE_NAME = "theShuttle";
private final static String _LEADING_COMPLETE = ":leading";
private final static String _TRAILING_COMPLETE = ":trailing";
private final static String _ITEMS_COMPLETE = ":items";
private final static String _DESC_FIELD_COMPLETE = ":desc";
private final static String _DESCRIPTION_COMPLETE = "_desc";
- private final static String _SELECTION_COMPLETE = "_sel";
- private final static String _VAR = "var ";
- private final static String _NEW_ARRAY = "=new Array();";
private final static String _TRANSLATED_JS_FEEDBACK_NO_ITEMS
= "var _shuttle_no_items='";
@@ -1270,8 +1266,6 @@
new Object();
private final static Object _SHUTTLE_INFO_KEY = new Object();
- private final static Object _LEADING_INFO_KEY = new Object();
- private final static Object _TRAILING_INFO_KEY = new Object();
static private final int[] _EMPTY_INT_ARRAY = new int[0];
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOrderShuttleRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOrderShuttleRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOrderShuttleRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOrderShuttleRenderer.java Thu Feb 15 16:21:46 2007
@@ -66,7 +66,7 @@
return _SELECT_ORDER_KEY_MAP;
}
-
+ @Override
protected void renderReorderButtons(
FacesContext context,
RenderingContext rc,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java Thu Feb 15 16:21:46 2007
@@ -66,6 +66,7 @@
rw.writeAttribute("size", "1", null);
}
+ @Override
protected String getDefaultStyleClass(FacesBean bean)
{
return SkinSelectors.AF_SEPARATOR_STYLE_CLASS;
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=508250&r1=508249&r2=508250
==============================================================================
--- 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 Feb 15 16:21:46 2007
@@ -88,14 +88,9 @@
else
{
Object submittedValue = getSubmittedValue(bean);
- Color color = null;
try
{
- Object converted = getConvertedValue(context,
- component,
- submittedValue);
- if (converted instanceof Color)
- color = (Color) converted;
+ getConvertedValue(context, component, submittedValue);
}
// Not a big deal; just means that an invalid value was entered,
// so we'll launch the dialog showing nothing
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=508250&r1=508249&r2=508250
==============================================================================
--- 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 Feb 15 16:21:46 2007
@@ -483,9 +483,7 @@
{
if (hidden[i] != TableRenderingContext.NORMAL_COLUMN)
continue;
- String selection = (String)
- treeTable.getAttributes().get(CoreTable.ROW_SELECTION_KEY.getName());
-
+
UIComponent child = children.get(i);
if (!(child instanceof UIXColumn))
continue;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java Thu Feb 15 16:21:46 2007
@@ -129,7 +129,8 @@
tree.setRowKey(oldPath);
}
}
-
+
+ @Override
protected boolean shouldRenderId(FacesContext context,
UIComponent component)
{
@@ -812,7 +813,6 @@
private static final String _ICON_WIDTH = "16";
private static final String _ICON_HEIGHT = "22";
- private static final String _NODE_ICON_HEIGHT = "16";
private static final String _NODE_SPACER = "6";
@@ -841,7 +841,6 @@
"af_tree.DISABLED_COLLAPSE_TIP";
private static final String _COLLAPSE_TIP_KEY = "af_tree.COLLAPSE_TIP";
private static final String _EXPAND_TIP_KEY = "af_tree.EXPAND_TIP";
- private static final String _FOLDER_TIP_KEY = "af_tree.FOLDER_TIP";
private static final String _NODE_LEVEL_TEXT_KEY = "af_tree.NODE_LEVEL";
private static final String _PATH_PARAM = "path";
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?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- 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 Thu Feb 15 16:21:46 2007
@@ -244,6 +244,7 @@
//
+ @Override
protected boolean skipDecode(FacesContext context)
{
// =-=AEW HACK! When executing a "dialog return" from the filter,
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?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- 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 Thu Feb 15 16:21:46 2007
@@ -96,12 +96,12 @@
public void setCurrentRowSpan(int rowSpan)
{
- // -= Simon Lessard =-
+ // -= Simon =-
// 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.
+ // if to the code path. This basically break the purpose of
+ // assert to not polute the execution when not enabled.
boolean assertEnabled = false;
assert assertEnabled = true;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TrTranslationsResourceLoader.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TrTranslationsResourceLoader.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TrTranslationsResourceLoader.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TrTranslationsResourceLoader.java Thu Feb 15 16:21:46 2007
@@ -43,11 +43,13 @@
return 20000;
}
+ @Override
protected String getJSVarName()
{
return "TrMessageFactory._TRANSLATIONS";
}
+ @Override
protected String getBundleName()
{
return "org.apache.myfaces.trinidad.resource.MessageBundle";
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContextImpl.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContextImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContextImpl.java Thu Feb 15 16:21:46 2007
@@ -95,6 +95,7 @@
/**
* Returns the locale that should be used for translations.
*/
+ @Override
public Locale getTranslationLocale()
{
return _transLocale;
@@ -103,6 +104,7 @@
/**
* Returns the locale that should be used for formatting.
*/
+ @Override
public Locale getFormattingLocale()
{
return _formattingLocale;
@@ -112,6 +114,7 @@
/**
* Returns the Locale in IANA String format.
*/
+ @Override
public String getFormattingIANALocaleString()
{
if (_formattingIanaLocale == null)
@@ -128,6 +131,7 @@
/**
* Returns the translation Locale in IANA String format.
*/
+ @Override
public String getTranslationIANALocaleString()
{
if (_transIanaLocale == null)
@@ -140,6 +144,7 @@
return _transIanaLocale;
}
+ @Override
public boolean isRightToLeft()
{
return (getReadingDirection() == LocaleUtils.DIRECTION_RIGHTTOLEFT);
@@ -195,6 +200,7 @@
/**
* Returns the TimeZone that the user is running in.
*/
+ @Override
public TimeZone getTimeZone()
{
return _timeZone;
@@ -257,6 +263,7 @@
* <p>
* @see java.util.ResourceBundle#getBundle
*/
+ @Override
public ResourceBundle getBundle(
String baseBundleName
) throws MissingResourceException
@@ -296,6 +303,7 @@
/**
* Returns the year offset for parsing years with only two digits.
*/
+ @Override
public int getTwoDigitYearStart()
{
return getDateFormatContext().getTwoDigitYearStart();
@@ -306,6 +314,7 @@
* If zero (NUL), the default separator for the Locale
* will be used.
*/
+ @Override
public char getGroupingSeparator()
{
return getDecimalFormatContext().getGroupingSeparator();
@@ -316,6 +325,7 @@
* If zero (NUL), the default separator for the Locale
* will be used.
*/
+ @Override
public char getDecimalSeparator()
{
return getDecimalFormatContext().getDecimalSeparator();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java Thu Feb 15 16:21:46 2007
@@ -41,7 +41,8 @@
* @author The Oracle ADF Faces Team
*/
// -= Simon Lessard =-
-// FIXME: Deprecation within this class is strange...
+// FIXME: Should we make LocaleContextImpl.setReadingDirection and
+// LocaleContextImpl.setTimeZone protected instead of deprecated?
public final class MutableLocaleContext extends LocaleContextImpl
{
/**
@@ -99,6 +100,7 @@
* @see org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils
*/
@Override
+ @SuppressWarnings("deprecation")
public void setReadingDirection(
int newReadingDirection
)
@@ -111,6 +113,7 @@
* to null will set the TimeZone to the default TimeZone.
*/
@Override
+ @SuppressWarnings("deprecation")
public void setTimeZone(
TimeZone newTimeZone
)
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java Thu Feb 15 16:21:46 2007
@@ -23,7 +23,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-
+import java.util.Map;
import java.util.StringTokenizer;
import javax.faces.context.ExternalContext;
@@ -68,6 +68,7 @@
/**
* Create a MultipartFormHandler for the given servlet request.
*/
+ @SuppressWarnings("unchecked")
public MultipartFormHandler(final ExternalContext externalContext) throws IOException
{
@@ -75,7 +76,8 @@
// make sure that we don't try to decode this multi part request at a
// later time; ie: if we do a forward.
- externalContext.getRequestMap().put(_HANDLED, Boolean.TRUE);
+ Map<String, Object> requestMap = externalContext.getRequestMap();
+ requestMap.put(_HANDLED, Boolean.TRUE);
_contentStreamSize = ExternalContextUtils.getContentLength(externalContext);
}
@@ -652,8 +654,7 @@
{
try
{
- int bytes;
- while ((bytes = read(_buffer)) > 0)
+ while (read(_buffer) > 0)
{
// do nothing
;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinFactoryImpl.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinFactoryImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinFactoryImpl.java Thu Feb 15 16:21:46 2007
@@ -24,11 +24,9 @@
import javax.faces.context.FacesContext;
-import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.skin.Skin;
import org.apache.myfaces.trinidad.skin.SkinFactory;
-import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderKit;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
@@ -169,10 +167,6 @@
// Stores all the Skins in this SkinFactory
private Map<String, Skin> _skins = null;
-
- static private final String _RENDER_KIT_ID_CORE = "org.apache.myfaces.trinidad.desktop";
- static private final String _RENDER_KIT_ID_PDA = "org.apache.myfaces.trinidad.pda";
- static private final String _RENDER_KIT_ID_PORTLET = CoreRenderKit.OUTPUT_MODE_PORTLET;
static private final String _SIMPLE_PDA = "simple.pda";
static private final String _SIMPLE_DESKTOP = "simple.desktop";
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java Thu Feb 15 16:21:46 2007
@@ -70,6 +70,7 @@
* can be retrieved by id via SkinFactory.getSkin().
* @see org.apache.myfaces.trinidadinternal.skin.SkinFactory#getSkin
*/
+ @Override
public String getId()
{
return null;
@@ -84,6 +85,7 @@
* particular skin instance to be selected based on the
* current render-kit-id.
*/
+ @Override
public String getFamily()
{
return null;
@@ -92,6 +94,7 @@
/**
* Returns the renderKitId for the Skin.
*/
+ @Override
public String getRenderKitId()
{
return null;
@@ -100,11 +103,13 @@
/**
* Returns the name of the XSS style sheet for this Skin.
*/
+ @Override
abstract public String getStyleSheetName();
/**
* Returns a translated String in the LocaleContext's translation Locale.
*/
+ @Override
public String getTranslatedString(
LocaleContext lContext,
String key
@@ -126,6 +131,7 @@
* @param key The key of the translation to retrieve. Cannot be null.
* @throws NullPointerException if lContext or key is null.
*/
+ @Override
public Object getTranslatedValue(
LocaleContext lContext,
String key
@@ -204,6 +210,7 @@
* icon. (ReferenceIcons are resolved -- the real icon they point to is
* returned)
*/
+ @Override
public Icon getIcon(
String iconName
)
@@ -216,6 +223,7 @@
* @param iconName The name of the icon to retrieve. Cannot be null
* @throws NullPointerException if iconName is null.
*/
+ @Override
public Icon getIcon(
String iconName,
boolean resolveIcon
@@ -294,6 +302,7 @@
* @param icon The Icon to register.
* @throws NullPointerException if iconName is null.
*/
+ @Override
synchronized public void registerIcon(
String iconName,
Icon icon
@@ -318,6 +327,7 @@
* @see #getStyleSheetDocument
* @throws NullPointerException if styleSheetName is null.
*/
+ @Override
public void registerStyleSheet(
String styleSheetName
)
@@ -352,6 +362,7 @@
* @return Map<String, String> The default implemention returns a map of full
* style class names to shortened style classes.
*/
+ @Override
public Map<String, String> getStyleClassMap(
RenderingContext arc
)
@@ -400,6 +411,7 @@
* Skin instance to avoid having to re-compute Skin-specific
* values on each render.
*/
+ @Override
public Object getProperty(Object key)
{
if (_properties == null)
@@ -411,6 +423,7 @@
/**
* Sets a value for the specified property key.
*/
+ @Override
synchronized public void setProperty(
Object key,
Object value
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java Thu Feb 15 16:21:46 2007
@@ -367,8 +367,10 @@
List<SkinNode> sortedSkinNodes = new ArrayList<SkinNode>();
List<String> skinNodesAdded = new ArrayList<String>();
List<String> baseSkinIds = new ArrayList<String>();
- for (Iterator i=skinFactory.getSkinIds(); i.hasNext(); )
- baseSkinIds.add((String)i.next());
+ for (Iterator<String> i = skinFactory.getSkinIds(); i.hasNext();)
+ {
+ baseSkinIds.add(i.next());
+ }
// first, the skins that don't extend anything
for (SkinNode skinNode : skinNodes)
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java Thu Feb 15 16:21:46 2007
@@ -109,6 +109,7 @@
/**
* Override of Icon.getImageIcon().
*/
+ @Override
public InputStream openStream(
FacesContext context,
RenderingContext arc
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java Thu Feb 15 16:21:46 2007
@@ -20,7 +20,6 @@
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidad.context.LocaleContext;
-import org.apache.myfaces.trinidad.skin.Skin;
/**
* The StyleContext interface is used to provide information
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java Thu Feb 15 16:21:46 2007
@@ -112,6 +112,7 @@
_value = _value + moreText;
}
+ @Override
public void addWhitespace(
ParseContext context,
char[] text,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java Thu Feb 15 16:21:46 2007
@@ -22,7 +22,6 @@
import javax.faces.context.FacesContext;
-import org.apache.myfaces.trinidadinternal.share.url.FacesURLEncoder;
import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java Thu Feb 15 16:21:46 2007
@@ -273,6 +273,7 @@
* @param node The UINode which is being rendered
* @throws IOException
*/
+ @SuppressWarnings("deprecation")
private void _renderDescription(
UIXRenderingContext context,
UINode node
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java Thu Feb 15 16:21:46 2007
@@ -22,7 +22,6 @@
import java.util.Iterator;
import javax.faces.component.UIComponent;
-import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.convert.Converter;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java Thu Feb 15 16:21:46 2007
@@ -42,6 +42,7 @@
*/
public class RendererNodeParser extends BaseNodeParser implements XMLConstants
{
+ @SuppressWarnings("deprecation")
@Override
public void startElement(
ParseContext context,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java Thu Feb 15 16:21:46 2007
@@ -233,13 +233,13 @@
// =-= Scott O'Bryan =-=
// Performance enhancement. These will be needed anyway, let's not get them every time.
- private static final Class _PORTLET_ACTION_REQUEST_CLASS;
- private static final Class _PORTLET_CONTEXT_CLASS;
+ private static final Class<?> _PORTLET_ACTION_REQUEST_CLASS;
+ private static final Class<?> _PORTLET_CONTEXT_CLASS;
static
{
- Class context;
- Class actionRequest;
+ Class<?> context;
+ Class<?> actionRequest;
try
{
context = ClassLoaderUtils.loadClass("javax.portlet.PortletContext");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JsonUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JsonUtils.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JsonUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JsonUtils.java Thu Feb 15 16:21:46 2007
@@ -39,7 +39,6 @@
import java.util.Date;
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import org.apache.myfaces.trinidadinternal.convert.GenericConverterFactory;
@@ -67,7 +66,7 @@
return;
}
- Class valueClass = attrValue.getClass();
+ Class<?> valueClass = attrValue.getClass();
if (Boolean.class == valueClass)
{
writeBoolean(out, ((Boolean)attrValue).booleanValue());
@@ -198,8 +197,8 @@
*/
static public void writeCollection(
StringBuilder out,
- Collection value,
- boolean escapeXML) throws IOException
+ Collection<?> value,
+ boolean escapeXML) throws IOException
{
if (value == null)
{
@@ -212,7 +211,7 @@
else
{
out.append("[");
- for (Iterator iter = value.iterator();
+ for (Iterator<?> iter = value.iterator();
iter.hasNext();)
{
Object item = iter.next();
@@ -351,8 +350,8 @@
*/
static public void writeMap(
StringBuilder out,
- Map map,
- boolean escapeXML) throws IOException
+ Map<?, ?> map,
+ boolean escapeXML) throws IOException
{
if (map == null)
{
@@ -365,11 +364,10 @@
else
{
out.append('{');
- Set entries = map.entrySet();
- for (Iterator iter = entries.iterator();
- iter.hasNext();)
+
+ for (Iterator<?> iter = map.entrySet().iterator(); iter.hasNext();)
{
- Map.Entry entry = (Map.Entry)iter.next();
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>)iter.next();
Object rawKey = entry.getKey();
if(rawKey == null)
throw new IllegalArgumentException("Javascript does not support null keys");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateRestrictionValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateRestrictionValidator.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateRestrictionValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateRestrictionValidator.java Thu Feb 15 16:21:46 2007
@@ -138,7 +138,7 @@
UIComponent component,
String weekdaysValues,
String monthValues,
- Map messages)
+ Map<String, String> messages)
{
StringBuilder outBuffer = new StringBuilder(31 + weekdaysValues.length() + monthValues.length());
outBuffer.append("new TrDateRestrictionValidator(");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateTimeRangeValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateTimeRangeValidator.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateTimeRangeValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateTimeRangeValidator.java Thu Feb 15 16:21:46 2007
@@ -117,7 +117,7 @@
UIComponent component,
String max,
String min,
- Map messages)
+ Map<String, String> messages)
{
StringBuilder outBuffer = new StringBuilder(31 + min.length() + max.length());
outBuffer.append("new TrDateTimeRangeValidator(");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DoubleRangeValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DoubleRangeValidator.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DoubleRangeValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DoubleRangeValidator.java Thu Feb 15 16:21:46 2007
@@ -99,7 +99,7 @@
UIComponent component,
String max,
String min,
- Map messages)
+ Map<String, String> messages)
{
StringBuilder outBuffer = new StringBuilder();
outBuffer.append("new TrRangeValidator(");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LengthValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LengthValidator.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LengthValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LengthValidator.java Thu Feb 15 16:21:46 2007
@@ -94,7 +94,7 @@
UIComponent component,
String max,
String min,
- Map messages)
+ Map<String, String> messages)
{
StringBuilder outBuffer = new StringBuilder();
outBuffer.append("new TrLengthValidator(");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java Thu Feb 15 16:21:46 2007
@@ -100,7 +100,7 @@
UIComponent component,
String max,
String min,
- Map messages)
+ Map<String, String> messages)
{
StringBuilder outBuffer = new StringBuilder();
outBuffer.append("new TrRangeValidator(");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionResponseWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionResponseWrapper.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionResponseWrapper.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionResponseWrapper.java Thu Feb 15 16:21:46 2007
@@ -78,7 +78,11 @@
/* (non-Javadoc)
* @see javax.portlet.ActionResponse#setRenderParameters(java.util.Map)
+ * -= Simon =-
+ * TODO: When portlet is made generic, fix this signature to fit with
+ * ActionResponse.setRenderParameters
*/
+ @SuppressWarnings("unchecked")
public void setRenderParameters(Map arg0)
{
_resp.setRenderParameters(arg0);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletContextWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletContextWrapper.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletContextWrapper.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletContextWrapper.java Thu Feb 15 16:21:46 2007
@@ -57,7 +57,7 @@
* @return
* @see javax.portlet.PortletContext#getAttributeNames()
*/
- public Enumeration getAttributeNames()
+ public Enumeration<?> getAttributeNames()
{
return _context.getAttributeNames();
}
@@ -76,7 +76,7 @@
* @return
* @see javax.portlet.PortletContext#getInitParameterNames()
*/
- public Enumeration getInitParameterNames()
+ public Enumeration<?> getInitParameterNames()
{
return _context.getInitParameterNames();
}
@@ -173,7 +173,10 @@
* @param arg0
* @return
* @see javax.portlet.PortletContext#getResourcePaths(java.lang.String)
+ * -= Simon =-
+ * TODO: Once portlet spec supports generics, change this signature to match it.
*/
+ @SuppressWarnings("unchecked")
public Set getResourcePaths(String arg0)
{
return _context.getResourcePaths(arg0);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestWrapper.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestWrapper.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestWrapper.java Thu Feb 15 16:21:46 2007
@@ -59,7 +59,10 @@
/**
* @return
* @see javax.portlet.PortletRequest#getAttributeNames()
+ * -= Simon =-
+ * TODO: Once portlet spec supports generics, change this signature to match it.
*/
+ @SuppressWarnings("unchecked")
public Enumeration getAttributeNames()
{
return _req.getAttributeNames();
@@ -95,7 +98,10 @@
/**
* @return
* @see javax.portlet.PortletRequest#getLocales()
+ * -= Simon =-
+ * TODO: Once portlet spec supports generics, change this signature to match it.
*/
+ @SuppressWarnings("unchecked")
public Enumeration getLocales()
{
return _req.getLocales();
@@ -114,7 +120,10 @@
/**
* @return
* @see javax.portlet.PortletRequest#getParameterMap()
+ * -= Simon =-
+ * TODO: Once portlet spec supports generics, change this signature to match it.
*/
+ @SuppressWarnings("unchecked")
public Map getParameterMap()
{
return _req.getParameterMap();
@@ -123,7 +132,10 @@
/**
* @return
* @see javax.portlet.PortletRequest#getParameterNames()
+ * -= Simon =-
+ * TODO: Once portlet spec supports generics, change this signature to match it.
*/
+ @SuppressWarnings("unchecked")
public Enumeration getParameterNames()
{
return _req.getParameterNames();
@@ -189,7 +201,10 @@
* @param arg0
* @return
* @see javax.portlet.PortletRequest#getProperties(java.lang.String)
+ * -= Simon =-
+ * TODO: Once portlet spec supports generics, change this signature to match it.
*/
+ @SuppressWarnings("unchecked")
public Enumeration getProperties(String arg0)
{
return _req.getProperties(arg0);
@@ -208,7 +223,10 @@
/**
* @return
* @see javax.portlet.PortletRequest#getPropertyNames()
+ * -= Simon =-
+ * TODO: Once portlet spec supports generics, change this signature to match it.
*/
+ @SuppressWarnings("unchecked")
public Enumeration getPropertyNames()
{
return _req.getPropertyNames();
@@ -244,7 +262,10 @@
/**
* @return
* @see javax.portlet.PortletRequest#getResponseContentTypes()
+ * -= Simon =-
+ * TODO: Once portlet spec supports generics, change this signature to match it.
*/
+ @SuppressWarnings("unchecked")
public Enumeration getResponseContentTypes()
{
return _req.getResponseContentTypes();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/RequestContextTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/RequestContextTest.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/RequestContextTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/RequestContextTest.java Thu Feb 15 16:21:46 2007
@@ -85,6 +85,7 @@
}
}
+ @SuppressWarnings("unchecked")
public void testComponentState() throws Exception
{
RequestContext context = _createContext();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MVariableResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MVariableResolver.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MVariableResolver.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MVariableResolver.java Thu Feb 15 16:21:46 2007
@@ -22,11 +22,6 @@
import java.beans.IntrospectionException;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Arrays;
@@ -38,7 +33,6 @@
import javax.faces.context.FacesContext;
import javax.faces.el.VariableResolver;
-import org.apache.myfaces.trinidad.component.core.data.CoreChart;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.model.ChartModel;
import org.apache.myfaces.trinidad.model.ChildPropertyTreeModel;
@@ -57,7 +51,6 @@
public Object resolveVariable(FacesContext context, String name)
{
Object o = context.getExternalContext().getRequestMap().get(name);
- TreeModel modelTree = null;
if (o != null)
return o;
@@ -416,61 +409,72 @@
private class MyChartModel extends ChartModel
{
+ @Override
public List<String> getSeriesLabels()
{
return _seriesLabels;
}
+ @Override
public List<String> getGroupLabels()
{
return _groupLabels;
}
+ @Override
public List<List<Double>> getXValues()
{
return _chartXValues;
}
+ @Override
public List<List<Double>> getYValues()
{
return _chartYValues;
}
+ @Override
public Double getMaxYValue()
{
return 500000.0;
}
+ @Override
public Double getMinYValue()
{
return 0.0;
}
+ @Override
public Double getMaxXValue()
{
return 10.0;
}
+ @Override
public Double getMinXValue()
{
return 6.0;
}
+ @Override
public String getTitle()
{
return "Title";
}
+ @Override
public String getSubTitle()
{
return "SubTitle";
}
+ @Override
public String getFootNote()
{
return "FootNote";
@@ -479,15 +483,9 @@
private final List<String> _groupLabels =
Arrays.asList(new String[]{"June", "July", "August", "September","October"});
- private final List<String> _largeGroupLabels =
- Arrays.asList(new String[]{"Q4-2005", "Q1-2006", "Q2-2006", "Q3-2006"});
-
private final List<String> _seriesLabels =
Arrays.asList(new String[]{"Previous", "Target", "Actual"});
- private final List<String> _largeSeriesLabels =
- Arrays.asList(new String[]{"Opening", "Low", "High"});
-
private final ArrayList<List<Double>> _chartYValues;
private final ArrayList<List<Double>> _chartXValues;
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBootstrap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBootstrap.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBootstrap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBootstrap.java Thu Feb 15 16:21:46 2007
@@ -32,7 +32,6 @@
import java.util.Map;
import org.apache.myfaces.trinidad.context.Agent;
-import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.skin.SkinFactory;
import org.apache.myfaces.trinidadinternal.agent.AgentFactoryImpl;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java Thu Feb 15 16:21:46 2007
@@ -83,6 +83,7 @@
{
}
+ @Override
public void run(TestResult result)
{
try
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScriptParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScriptParser.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScriptParser.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScriptParser.java Thu Feb 15 16:21:46 2007
@@ -208,7 +208,6 @@
{
return new ComponentDefinitionParser(_definition, _info);
}
- int i=0;
String id = (String) _definition.getAttributes().get("id");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtilsTest.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtilsTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtilsTest.java Thu Feb 15 16:21:46 2007
@@ -21,7 +21,6 @@
import junit.framework.TestCase;
import java.util.Arrays;
-import java.util.List;
public class OutputUtilsTest extends TestCase
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRendererTest.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRendererTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRendererTest.java Thu Feb 15 16:21:46 2007
@@ -24,7 +24,6 @@
import java.util.Map;
import javax.faces.event.FacesEvent;
-import javax.faces.render.RenderKit;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -140,7 +139,6 @@
{
//this.facesContext.setViewRoot(new UIViewRoot());
Mock mockRenderKit = getMockRenderKitWrapper().getMock();
- RenderKit renderKit = getMockRenderKitWrapper().getRenderKit();
TableSelectOneRenderer renderer = new TableSelectOneRenderer();
mockRenderKit.expects(atLeastOnce()).method("getRenderer").will(returnValue(renderer));