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 [1/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/...
Author: slessard
Date: Thu Feb 15 16:21:46 2007
New Revision: 508250
URL: http://svn.apache.org/viewvc?view=rev&rev=508250
Log:
ADFFACES-384 : Cleaned up the code, adding missing @Override, @Deprecated et generic declarations.
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ValueMap.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/LocaleContext.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/Base64OutputStream.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/bean/FacesBeanImplTest.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXEditableValueTestCase.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreTrainTest.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlHtmlTest.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/DateTimeConverterTestCase.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64OutputStreamTest.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateRestrictionValidatorTest.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ChartBean.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/AbstractAttributeMap.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/NullEnumeration.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletInitParameterMap.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletInitParameterMap.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PanelButtonBarRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelTipRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOrderShuttleRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/RowData.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TrTranslationsResourceLoader.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContextImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinFactoryImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JsonUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateRestrictionValidator.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateTimeRangeValidator.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DoubleRangeValidator.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LengthValidator.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionResponseWrapper.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletContextWrapper.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestWrapper.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/RequestContextTest.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MVariableResolver.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBootstrap.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScriptParser.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtilsTest.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRendererTest.java
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java Thu Feb 15 16:21:46 2007
@@ -1252,6 +1252,10 @@
_currencyCache.clear();
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public Object getRowKey(FacesContext context, UIComponent component, String clientRowKey)
{
if (_isOptimizedKey(clientRowKey))
@@ -1262,6 +1266,10 @@
return rowkey;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public String getClientRowKey(FacesContext context, UIComponent component, Object rowKey)
{
assert rowKey != null;
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ValueMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ValueMap.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ValueMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ValueMap.java Thu Feb 15 16:21:46 2007
@@ -121,6 +121,7 @@
out.writeObject(_cache);
}
+ @SuppressWarnings("unchecked")
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
Map<K, V> cache = (Map<K, V>) in.readObject();
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java Thu Feb 15 16:21:46 2007
@@ -80,6 +80,7 @@
* Constant for Mac platform
* @deprecated
*/
+ @Deprecated
public static final String PLATFORM_MAC = PLATFORM_MACOS;
/**
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/LocaleContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/LocaleContext.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/LocaleContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/LocaleContext.java Thu Feb 15 16:21:46 2007
@@ -51,6 +51,7 @@
* Returns the locale that should be used for formatting.
* @deprecated use getFormattingLocale()
*/
+ @Deprecated
public Locale getLocale()
{
return getFormattingLocale();
@@ -60,6 +61,7 @@
* Returns the Locale in IANA String format.
* @deprecated use getFormattingIANALocaleString()
*/
+ @Deprecated
public String getIANALocaleString()
{
return getFormattingIANALocaleString();
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java Thu Feb 15 16:21:46 2007
@@ -231,6 +231,7 @@
_name = name;
}
+ @Override
public String toString()
{
return _name;
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java Thu Feb 15 16:21:46 2007
@@ -380,6 +380,7 @@
*
* @return Object value of propName for Object node.
*/
+ @SuppressWarnings("unchecked")
public Object getCustomProperty(Object node, String propName)
{
if (node == null)
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/Base64OutputStream.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/Base64OutputStream.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/Base64OutputStream.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/Base64OutputStream.java Thu Feb 15 16:21:46 2007
@@ -193,6 +193,7 @@
* Subsequent calls to the write method will result in incorrect encoding.
*
*/
+ @Override
public void close() throws IOException
{
if (_numLeftoverBytes==1)
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java Thu Feb 15 16:21:46 2007
@@ -109,6 +109,7 @@
* Validator} or null if it has not been
* set.
*/
+ @Override
public double getMaximum()
{
Object maxLong = _facesBean.getProperty(_MAXIMUM_KEY);
@@ -123,6 +124,7 @@
* @param maximum The new maximum value
*
*/
+ @Override
public void setMaximum(double maximum)
{
super.setMaximum(maximum);
@@ -135,6 +137,7 @@
* Validator}, or null if it has not been
* set.
*/
+ @Override
public double getMinimum()
{
Object minLong = _facesBean.getProperty(_MINIMUM_KEY);
@@ -149,6 +152,7 @@
* @param minimum The new minimum value
*
*/
+ @Override
public void setMinimum(double minimum)
{
super.setMinimum(minimum);
@@ -347,12 +351,14 @@
}
// StateHolder Methods
+ @Override
public Object saveState(FacesContext context)
{
return _facesBean.saveState(context);
}
+ @Override
public void restoreState(FacesContext context, Object state)
{
_facesBean.restoreState(context, state);
@@ -393,12 +399,14 @@
return ValidatorUtils.getValueBinding(_facesBean, name);
}
+ @Override
public boolean isTransient()
{
return (_transientValue);
}
+ @Override
public void setTransient(boolean transientValue)
{
_transientValue = transientValue;
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java Thu Feb 15 16:21:46 2007
@@ -111,6 +111,7 @@
* Validator} or null if it has not been
* set.
*/
+ @Override
public int getMaximum()
{
Object maxInt = _facesBean.getProperty(_MAXIMUM_KEY);
@@ -125,6 +126,7 @@
* @param maximum The new maximum value
*
*/
+ @Override
public void setMaximum(int maximum)
{
super.setMaximum(maximum);
@@ -137,6 +139,7 @@
* Validator}, or null if it has not been
* set.
*/
+ @Override
public int getMinimum()
{
Object minInt = _facesBean.getProperty(_MINIMUM_KEY);
@@ -149,6 +152,7 @@
* @param minimum The new minimum value
*
*/
+ @Override
public void setMinimum(int minimum)
{
super.setMinimum(minimum);
@@ -347,12 +351,14 @@
}
// StateHolder Methods
+ @Override
public Object saveState(FacesContext context)
{
return _facesBean.saveState(context);
}
+ @Override
public void restoreState(FacesContext context, Object state)
{
_facesBean.restoreState(context, state);
@@ -393,12 +399,14 @@
return ValidatorUtils.getValueBinding(_facesBean, name);
}
+ @Override
public boolean isTransient()
{
return (_transientValue);
}
+ @Override
public void setTransient(boolean transientValue)
{
_transientValue = transientValue;
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java Thu Feb 15 16:21:46 2007
@@ -111,6 +111,7 @@
* Validator} or null if it has not been
* set.
*/
+ @Override
public long getMaximum()
{
Object maxLong = _facesBean.getProperty(_MAXIMUM_KEY);
@@ -125,6 +126,7 @@
* @param maximum The new maximum value
*
*/
+ @Override
public void setMaximum(long maximum)
{
super.setMaximum(maximum);
@@ -137,6 +139,7 @@
* Validator}, or null if it has not been
* set.
*/
+ @Override
public long getMinimum()
{
Object minLong = _facesBean.getProperty(_MINIMUM_KEY);
@@ -151,6 +154,7 @@
* @param minimum The new minimum value
*
*/
+ @Override
public void setMinimum(long minimum)
{
super.setMinimum(minimum);
@@ -349,12 +353,14 @@
}
// StateHolder Methods
+ @Override
public Object saveState(FacesContext context)
{
return _facesBean.saveState(context);
}
+ @Override
public void restoreState(FacesContext context, Object state)
{
_facesBean.restoreState(context, state);
@@ -395,12 +401,14 @@
return ValidatorUtils.getValueBinding(_facesBean, name);
}
+ @Override
public boolean isTransient()
{
return (_transientValue);
}
+ @Override
public void setTransient(boolean transientValue)
{
_transientValue = transientValue;
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/bean/FacesBeanImplTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/bean/FacesBeanImplTest.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/bean/FacesBeanImplTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/bean/FacesBeanImplTest.java Thu Feb 15 16:21:46 2007
@@ -464,7 +464,10 @@
assertNull(newBean.saveState(null));
// Now, we'll set a value, so we should get a non-null state
- String oldFirst = newBean.getFirst();
+
+ // Our current delta support *does not* keep track of the original value.
+ // If it does, add this test
+ // String oldFirst = newBean.getFirst();
newBean.setFirst("foo");
assertNotNull(newBean.saveState(null));
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java Thu Feb 15 16:21:46 2007
@@ -27,7 +27,6 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
-import javax.faces.application.ViewHandler;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
@@ -263,8 +262,7 @@
{
Mock mockRenderKitFactory = mock(RenderKitFactory.class);
- RenderKitFactory factory = (RenderKitFactory) mockRenderKitFactory.proxy();
-
+
Mock mockRenderkit = getMockRenderKitWrapper().getMock();
RenderKit renderkit = getMockRenderKitWrapper().getRenderKit();
@@ -368,7 +366,6 @@
{
Mock mockRenderKit = getMockRenderKitWrapper().getMock();
- RenderKit renderKit = getMockRenderKitWrapper().getRenderKit();
Mock mockRenderer = mock(Renderer.class);
Renderer renderer = (Renderer) mockRenderer.proxy();
@@ -471,7 +468,6 @@
{
Mock mockRenderkit = getMockRenderKitWrapper().getMock();
- RenderKit renderkit = getMockRenderKitWrapper().getRenderKit();
Mock mockRenderer = mock(Renderer.class);
Renderer renderer = (Renderer) mockRenderer.proxy();
@@ -589,7 +585,6 @@
// MockRenderKitFactory factory = setupMockRenderKitFactory();
Mock mockRenderkit = getMockRenderKitWrapper().getMock();
- RenderKit renderkit = getMockRenderKitWrapper().getRenderKit();
Mock mockRenderer = mock(Renderer.class);
Renderer renderer = (Renderer) mockRenderer.proxy();
@@ -629,7 +624,6 @@
mockChild.expects(never()).method("processValidators");
mockChild.expects(never()).method("processUpdates");
mockChild.expects(once()).method("processSaveState");
- int encodeCalls = willChildrenBeRendered(component) ? 1 : 0;
//fix this!
mockChild.expects(once()).method("encodeBegin");
@@ -658,17 +652,19 @@
protected void doTestValidateFailure(
UIViewRoot root)
{
-
- Mock mockRenderkit = getMockRenderKitWrapper().getMock();
+ // -= Simon =-
+ // All those variables do not seem to be used and do not seem
+ // to test anything either
+ /*Mock mockRenderkit = getMockRenderKitWrapper().getMock();
RenderKit renderkit = getMockRenderKitWrapper().getRenderKit();
-
+ */
Mock mockRenderer = mock(Renderer.class);
- Renderer renderer = (Renderer) mockRenderer.proxy();
+ /*Renderer renderer = (Renderer) mockRenderer.proxy();
Mock mockValidator = mock(Validator.class);
Validator validator = (Validator) mockValidator.proxy();
- ViewHandler viewhandler = this.facesContext.getApplication().getViewHandler();
+ ViewHandler viewhandler = this.facesContext.getApplication().getViewHandler();*/
setCurrentContext(facesContext);
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXEditableValueTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXEditableValueTestCase.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXEditableValueTestCase.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXEditableValueTestCase.java Thu Feb 15 16:21:46 2007
@@ -84,7 +84,7 @@
*/
public void testAttributeTransparency()
{
- UIXEditableValue component = createEditableValue();
+ //UIXEditableValue component = createEditableValue();
// remaining attributes here
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreTrainTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreTrainTest.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreTrainTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreTrainTest.java Thu Feb 15 16:21:46 2007
@@ -23,7 +23,6 @@
import junit.textui.TestRunner;
import org.apache.myfaces.trinidad.component.UIComponentTestCase;
-import org.apache.myfaces.trinidad.component.core.nav.CoreTrain;
/**
* Unit tests for CoreTrain
@@ -65,7 +64,8 @@
*/
public void testInitialAttributeValues()
{
- CoreTrain component = new CoreTrain();
+ //CoreTrain component = new CoreTrain();
+ // TODO: testInitialAttributeValues
}
/**
@@ -75,8 +75,8 @@
*/
public void testAttributeTransparency()
{
- CoreTrain component = new CoreTrain();
-
+ //CoreTrain component = new CoreTrain();
+ // TODO: testAttributeTransparency
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlHtmlTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlHtmlTest.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlHtmlTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlHtmlTest.java Thu Feb 15 16:21:46 2007
@@ -68,7 +68,7 @@
*/
public void testAttributeTransparency()
{
- HtmlHtml component = new HtmlHtml();
+ //HtmlHtml component = new HtmlHtml();
// remaining attributes here
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/DateTimeConverterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/DateTimeConverterTestCase.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/DateTimeConverterTestCase.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/DateTimeConverterTestCase.java Thu Feb 15 16:21:46 2007
@@ -244,7 +244,6 @@
Mock mock = mock(UIComponent.class);
UIComponent component = (UIComponent) mock.proxy();
- MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
setFacesContext(facesContext);
try
@@ -264,7 +263,6 @@
protected void checkConversionOnLongPatternWithTimeZone()
{
String pattern = "yyyy.MM.dd G 'at' HH:mm:ss z";
- String timeZoneId = TimeZone.getDefault().getDisplayName();
String inputValue = "2001.07.04 AD at 12:08:56 " + "UTC";
javax.faces.convert.DateTimeConverter dtConv = getDateTimeConverter();
@@ -273,11 +271,9 @@
Mock mock = mock(UIComponent.class);
UIComponent component = (UIComponent) mock.proxy();
- MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
- TimeZone tz = TimeZone.getDefault();
TimeZone.setDefault(getTzone("UTC"));
GregorianCalendar gcal = new GregorianCalendar(getTzone("UTC"));
@@ -327,7 +323,6 @@
Mock mock = mock(UIComponent.class);
UIComponent component = (UIComponent) mock.proxy();
- MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
javax.faces.convert.DateTimeConverter fdtConv
= getDateTimeConverter();
@@ -388,7 +383,6 @@
javax.faces.convert.DateTimeConverter dtConv = getDateTimeConverter();
Mock mock = mock(UIComponent.class);
UIComponent component = (UIComponent) mock.proxy();
- MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
_setStyleOnConverter(dtConv, styleType, styles[i]);
@@ -417,7 +411,7 @@
javax.faces.convert.DateTimeConverter extDtConv = getDateTimeConverter();
extDtConv.setLocale(Locale.ENGLISH);
_setStyleOnConverter(extDtConv, styleType, styles[i].toUpperCase());
- String outPut = extDtConv.getAsString(facesContext, cmp, dt);
+ extDtConv.getAsString(facesContext, cmp, dt);
fail("Upper case not accepted for styles");
}
catch (RuntimeException ce)
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java Thu Feb 15 16:21:46 2007
@@ -262,8 +262,10 @@
assertEquals("DEM99.00", outPut);
try
{
- Number outValue = (Number)converter.getAsObject(facesContext, component, "DEM99.00");
- fail("Exception should occur - since currency should not be considered while formatting");
+ if(converter.getAsObject(facesContext, component, "DEM99.00") instanceof Number)
+ {
+ fail("Exception should occur - since currency should not be considered while formatting");
+ }
}
catch(Exception e)
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java Thu Feb 15 16:21:46 2007
@@ -233,8 +233,8 @@
Date fdtConvDate = (Date)fdtConv.getAsObject(facesContext, component, inputValue);
// assertEquals(dtConvDate, fdtConvDate);
- String dtConvPattern = dtConv.getAsString(facesContext, component, dtConvDate);
- String fdtConvPattern = fdtConv.getAsString(facesContext, component, dtConvDate);
+ dtConv.getAsString(facesContext, component, dtConvDate);
+ fdtConv.getAsString(facesContext, component, fdtConvDate);
// assertEquals(dtConvPattern, fdtConvPattern);
}
}
@@ -308,7 +308,7 @@
else
converter.setType(types[i]);
- Object obj = converter.getAsObject(facesContext, component, failingValues[i]);
+ converter.getAsObject(facesContext, component, failingValues[i]);
fail("Expected converter exception");
}
catch (ConverterException ce)
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java Thu Feb 15 16:21:46 2007
@@ -124,7 +124,7 @@
try
{
// Trinidad Converter is not lenient.
- Object obj = converter.getAsObject(context, wrapper.getUIComponent(), inputValue);
+ converter.getAsObject(context, wrapper.getUIComponent(), inputValue);
fail("Expected converter exception");
}
catch (ConverterException ce)
@@ -144,7 +144,6 @@
MockFacesContext context = new MockFacesContext();
Mock mock = buildMockUIComponent(3);
UIComponent component = (UIComponent) mock.proxy();
- MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
org.apache.myfaces.trinidad.convert.NumberConverter converter =
@@ -172,7 +171,7 @@
else
converter.setType(types[i]);
- Object obj = converter.getAsObject(context, component, failingValues[i]);
+ converter.getAsObject(context, component, failingValues[i]);
fail("Expected converter exception");
}
catch (ConverterException ce)
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64OutputStreamTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64OutputStreamTest.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64OutputStreamTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64OutputStreamTest.java Thu Feb 15 16:21:46 2007
@@ -142,7 +142,7 @@
b64_out.write(b, 320, 2);
// remember to add padding characters (if necessary)
- b64_out.finish();
+ b64_out.close();
// compare the contents of the outputstream with the expected encoded string
assertEquals(strwriter.toString(), str_encoded);
@@ -170,7 +170,7 @@
zip.write(bytes, 0, bytes.length);
zip.finish();
buffwriter.flush();
- b64_out.finish();
+ b64_out.close();
assertEquals(str_encoded, strwriter.toString());
@@ -202,7 +202,7 @@
b64_out.write(str.charAt(i));
}
// remember to add padding characters (if necessary)
- b64_out.finish();
+ b64_out.close();
// compare the contents of the outputstream with the expected encoded string
assertEquals(strwriter.toString(), str_encoded);
@@ -231,7 +231,7 @@
// write out the array to the output stream
b64_out.write(b, 0, b.length);
// append padding chars if necessary
- b64_out.finish();
+ b64_out.close();
// System.out.println("testwriteArray, expected encoding:" + str_encoded);
// System.out.println("testwriteArray, output of encoding:" + strwriter.toString());
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateRestrictionValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateRestrictionValidatorTest.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateRestrictionValidatorTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateRestrictionValidatorTest.java Thu Feb 15 16:21:46 2007
@@ -116,8 +116,7 @@
Mock mock = buildMockUIComponent();
UIComponent component = (UIComponent) mock.proxy();
- MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
-
+
mock.stubs().method("getId").will(returnValue("test"));
try
{
@@ -288,7 +287,6 @@
public void testStateHolderSaveRestore()
{
- long millis = System.currentTimeMillis();
DateRestrictionValidator originalValidator = new DateRestrictionValidator();
originalValidator.setInvalidDaysOfWeek(new String[]{"MO", "DI"});
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java Thu Feb 15 16:21:46 2007
@@ -113,8 +113,7 @@
Mock mock = buildMockUIComponent();
UIComponent component = (UIComponent) mock.proxy();
- MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
-
+
mock.stubs().method("getId").will(returnValue("test"));
try
{
@@ -146,7 +145,6 @@
Mock mock = buildMockUIComponent();
UIComponent component = (UIComponent) mock.proxy();
- MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
try
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ChartBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ChartBean.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ChartBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ChartBean.java Thu Feb 15 16:21:46 2007
@@ -131,6 +131,7 @@
private class MyChartModel extends ChartModel
{
+ @Override
public List<String> getSeriesLabels()
{
if(_largerDataSet)
@@ -139,6 +140,7 @@
return _seriesLabels;
}
+ @Override
public List<String> getGroupLabels()
{
CoreChart chart = (CoreChart)_editorBean.getComponent();
@@ -150,6 +152,7 @@
return _largeGroupLabels;
}
+ @Override
public List<List<Double>> getXValues()
{
CoreChart chart = (CoreChart)_editorBean.getComponent();
@@ -170,6 +173,7 @@
return null;
}
+ @Override
public List<List<Double>> getYValues()
{
CoreChart chart = (CoreChart)_editorBean.getComponent();
@@ -222,7 +226,7 @@
}
}
-
+ @Override
public Double getMaxYValue()
{
CoreChart chart = (CoreChart)_editorBean.getComponent();
@@ -247,7 +251,7 @@
}
}
-
+ @Override
public Double getMinYValue()
{
CoreChart chart = (CoreChart)_editorBean.getComponent();
@@ -263,7 +267,7 @@
return 0.0;
}
-
+ @Override
public Double getMaxXValue()
{
if(_largerDataSet)
@@ -272,7 +276,7 @@
return 10.0;
}
-
+ @Override
public Double getMinXValue()
{
if(_largerDataSet)
@@ -281,7 +285,7 @@
return 6.0;
}
-
+ @Override
public String getTitle()
{
CoreChart chart = (CoreChart)_editorBean.getComponent();
@@ -297,6 +301,7 @@
}
}
+ @Override
public String getSubTitle()
{
CoreChart chart = (CoreChart)_editorBean.getComponent();
@@ -307,7 +312,7 @@
return "SubTitle";
}
-
+ @Override
public String getFootNote()
{
CoreChart chart = (CoreChart)_editorBean.getComponent();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Thu Feb 15 16:21:46 2007
@@ -796,6 +796,7 @@
return _state;
}
+ @SuppressWarnings("unchecked")
public UIViewRoot popRoot(FacesContext fc)
{
UIViewRoot root = null;
@@ -839,7 +840,7 @@
// because "root"'s child List is being mutated as the List
// is traversed.
List<UIComponent> temp = new ArrayList<UIComponent>(root.getChildCount());
- temp.addAll(((List<UIComponent>) root.getChildren()));
+ temp.addAll(root.getChildren());
newRoot.getChildren().addAll(temp);
return newRoot;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java Thu Feb 15 16:21:46 2007
@@ -141,6 +141,7 @@
static private class Handler extends DefaultHandler
{
+ @SuppressWarnings("unchecked")
public Handler(RequestContextBean bean, ExternalContext context)
{
_applicationMap = context.getApplicationMap();
@@ -253,9 +254,9 @@
}
- private RequestContextBean _bean;
+ private RequestContextBean _bean;
private String _currentText;
- private Map _applicationMap;
+ private Map<String, Object> _applicationMap;
}
static private final String _CONFIG_FILE = "/WEB-INF/trinidad-config.xml";
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java Thu Feb 15 16:21:46 2007
@@ -32,7 +32,6 @@
import org.apache.myfaces.trinidad.skin.SkinFactory;
import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
import org.apache.myfaces.trinidadinternal.context.RequestContextFactoryImpl;
-import org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener;
import org.apache.myfaces.trinidadinternal.skin.SkinFactoryImpl;
import org.apache.myfaces.trinidadinternal.skin.SkinUtils;
import org.apache.myfaces.trinidadinternal.util.ExternalContextUtils;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java Thu Feb 15 16:21:46 2007
@@ -233,13 +233,13 @@
private static final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(UploadedFileProcessorImpl.class);
- private static final Class _PORTLET_CONTEXT_CLASS;
- private static final Class _PORTLET_REQUEST_CLASS;
+ private static final Class<?> _PORTLET_CONTEXT_CLASS;
+ private static final Class<?> _PORTLET_REQUEST_CLASS;
static
{
- Class context;
- Class request;
+ Class<?> context;
+ Class<?> request;
try
{
context = ClassLoaderUtils.loadClass("javax.portlet.PortletContext");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java Thu Feb 15 16:21:46 2007
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.util.Iterator;
+import java.util.Map;
import javax.faces.application.Application;
import javax.faces.application.FacesMessage;
@@ -64,6 +65,7 @@
static public class CacheRenderKit extends FacesContext
{
+ @SuppressWarnings("unchecked")
public CacheRenderKit(FacesContext base)
{
_base = base;
@@ -76,7 +78,8 @@
//called by whatever did he origional beginRequest.
if(!GlobalConfiguratorImpl.isRequestStarted(baseExternal))
{
- baseExternal.getRequestMap().put(_CONFIG_IN_CONTEXT, Boolean.TRUE);
+ Map<String, Object> requestMap = baseExternal.getRequestMap();
+ requestMap.put(_CONFIG_IN_CONTEXT, Boolean.TRUE);
}
_external = new OverrideDispatch(config.getExternalContext(baseExternal));
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java Thu Feb 15 16:21:46 2007
@@ -412,6 +412,7 @@
return false;
}
+ @Override
public Locale getFormattingLocale()
{
Object o = _bean.getProperty(RequestContextBean.FORMATTING_LOCALE_KEY);
@@ -613,12 +614,14 @@
return _agent;
}
+ @Override
public Object saveComponent(UIComponent component)
{
return StateManagerImpl.saveComponentTree(__getFacesContext(),
component);
}
+ @Override
public UIComponent restoreComponent(Object state)
throws ClassNotFoundException,
InstantiationException,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java Thu Feb 15 16:21:46 2007
@@ -18,16 +18,10 @@
*/
package org.apache.myfaces.trinidadinternal.context;
-import java.util.Map;
-
import javax.faces.context.FacesContext;
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
-
-import org.apache.myfaces.trinidad.context.RequestContext;
-import org.apache.myfaces.trinidad.context.RequestContextFactory;
-import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
/**
* Performs some trinidad logic and provides some hooks.
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/AbstractAttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/AbstractAttributeMap.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/AbstractAttributeMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/AbstractAttributeMap.java Thu Feb 15 16:21:46 2007
@@ -53,7 +53,7 @@
return false;
}
- for (final Enumeration e = getAttributeNames(); e.hasMoreElements();)
+ for (final Enumeration<K> e = getAttributeNames(); e.hasMoreElements();)
{
final Object value = getAttribute(e.nextElement());
if (findValue.equals(value))
@@ -103,7 +103,7 @@
public int size()
{
int size = 0;
- for (final Enumeration e = getAttributeNames(); e.hasMoreElements();)
+ for (final Enumeration<K> e = getAttributeNames(); e.hasMoreElements();)
{
size++;
e.nextElement();
@@ -202,7 +202,7 @@
return false;
}
- final Entry entry = (Entry) o;
+ final Entry<?, ?> entry = (Entry<?, ?>) o;
final Object key = entry.getKey();
final Object value = entry.getValue();
if (key == null || value == null)
@@ -227,7 +227,7 @@
return false;
}
- final Entry entry = (Entry) o;
+ final Entry<?, ?> entry = (Entry<?, ?>) o;
final Object key = entry.getKey();
final Object value = entry.getValue();
if (key == null || value == null || !value.equals(AbstractAttributeMap.this.get(key)))
@@ -317,7 +317,7 @@
return false;
}
- for (final Iterator it = iterator(); it.hasNext();)
+ for (final Iterator<V> it = iterator(); it.hasNext();)
{
if (o.equals(it.next()))
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/NullEnumeration.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/NullEnumeration.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/NullEnumeration.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/NullEnumeration.java Thu Feb 15 16:21:46 2007
@@ -27,7 +27,7 @@
* @author Scott O'Bryan (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-final class NullEnumeration implements Enumeration
+final class NullEnumeration implements Enumeration<Object>
{
static final NullEnumeration instance()
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletInitParameterMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletInitParameterMap.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletInitParameterMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletInitParameterMap.java Thu Feb 15 16:21:46 2007
@@ -29,7 +29,7 @@
* @author Stan Silvert (latest modification by $Author: oros $)
* @version $Revision: 278654 $ $Date: 2005-09-04 18:32:35 -0600 (Sun, 04 Sep 2005) $
*/
-public class PortletInitParameterMap extends AbstractAttributeMap
+public class PortletInitParameterMap extends AbstractAttributeMap<String, String>
{
public PortletInitParameterMap(final PortletContext portletContext)
{
@@ -37,7 +37,7 @@
}
@Override
- protected Object getAttribute(final Object key)
+ protected String getAttribute(final Object key)
{
if (key.toString().equals(key))
{
@@ -47,7 +47,8 @@
}
@Override
- protected Enumeration getAttributeNames()
+ @SuppressWarnings("unchecked")
+ protected Enumeration<String> getAttributeNames()
{
return _portletContext.getInitParameterNames();
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java Thu Feb 15 16:21:46 2007
@@ -223,13 +223,14 @@
}
@Override
- public Map getInitParameterMap()
+ @SuppressWarnings("unchecked")
+ public Map<String, String> getInitParameterMap()
{
if (_initParameterMap == null)
{
// We cache it as an attribute in ServletContext itself (is this circular reference a
// problem?)
- if ((_initParameterMap = (Map) _servletContext.getAttribute(_INIT_PARAMETER_MAP_ATTRIBUTE)) == null)
+ if ((_initParameterMap = (Map<String, String>)_servletContext.getAttribute(_INIT_PARAMETER_MAP_ATTRIBUTE)) == null)
{
_initParameterMap = new ServletInitParameterMap(_servletContext);
_servletContext.setAttribute(_INIT_PARAMETER_MAP_ATTRIBUTE, _initParameterMap);
@@ -581,7 +582,7 @@
private Map<String, Object> _applicationMap;
private HttpServletRequest _httpServletRequest;
private HttpServletResponse _httpServletResponse;
- private Map _initParameterMap;
+ private Map<String, String> _initParameterMap;
private Map<String, Object> _requestCookieMap;
private Map<String, String> _requestHeaderMap;
private Map<String, String[]> _requestHeaderValuesMap;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletInitParameterMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletInitParameterMap.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletInitParameterMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletInitParameterMap.java Thu Feb 15 16:21:46 2007
@@ -29,7 +29,7 @@
* @author Anton Koinov (latest modification by $Author: oros $)
* @version $Revision: 278654 $ $Date: 2005-09-04 18:32:35 -0600 (Sun, 04 Sep 2005) $
*/
-public class ServletInitParameterMap extends AbstractAttributeMap
+public class ServletInitParameterMap extends AbstractAttributeMap<String, String>
{
public ServletInitParameterMap(final ServletContext servletContext)
{
@@ -37,7 +37,7 @@
}
@Override
- protected Object getAttribute(final Object key)
+ protected String getAttribute(final Object key)
{
if (key.toString().equals(key))
{
@@ -47,7 +47,8 @@
}
@Override
- protected Enumeration getAttributeNames()
+ @SuppressWarnings("unchecked")
+ protected Enumeration<String> getAttributeNames()
{
return _servletContext.getInitParameterNames();
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java Thu Feb 15 16:21:46 2007
@@ -181,6 +181,7 @@
/**
* @deprecated method needs to an overhaul
*/
+ @Deprecated
public static String getClientValidation(
FacesContext context,
UIComponent component,
@@ -273,6 +274,7 @@
* @param defaultId
* @return
*/
+ @Deprecated
public static String getClientConversion(
FacesContext context,
UIComponent component,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java Thu Feb 15 16:21:46 2007
@@ -104,8 +104,8 @@
private String _getTrNumberConverter(
FacesContext context,
- UIComponent component,
- Map messages)
+ UIComponent component,
+ Map<?, ?> messages)
{
StringBuilder outBuffer = new StringBuilder(250);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java Thu Feb 15 16:21:46 2007
@@ -135,7 +135,7 @@
_menuList = null;
// Handler Id will have to change also to be unique
- _handlerId = Integer.toString(System.identityHashCode((Object) _menuNodes));
+ _handlerId = Integer.toString(System.identityHashCode(_menuNodes));
}
/**
@@ -340,8 +340,8 @@
if (_nodeDepth > 0)
{
// The parent menu item is the last menu item at the previous depth
- List parentList = _menuNodes.get(_nodeDepth-1);
- MenuNode parentNode = (MenuNode)parentList.get(parentList.size()-1);
+ List<MenuNode> parentList = _menuNodes.get(_nodeDepth-1);
+ MenuNode parentNode = parentList.get(parentList.size()-1);
parentNode.setChildren(_menuNodes.get(_nodeDepth));
}
@@ -871,7 +871,7 @@
if (viewIdObject != null)
{
// Put this entry in the nodeFocusPathMap
- nodeFocusPathMap.put(node, (Object)focusPath);
+ nodeFocusPathMap.put(node, focusPath);
// Does this viewId already exist in the _viewIdFocusPathMap?
List<Object> existingFpArrayList =
@@ -885,7 +885,7 @@
// ArrayList in the focusPath HashMap.
List<Object> fpArrayList = new ArrayList<Object>();
fpArrayList.add(focusPath);
- viewIdFocusPathMap.put(viewIdObject, (Object)fpArrayList);
+ viewIdFocusPathMap.put(viewIdObject, fpArrayList);
}
else
{
@@ -900,11 +900,11 @@
if (defFocusPath)
{
- existingFpArrayList.add(0, (Object)focusPath);
+ existingFpArrayList.add(0, focusPath);
}
else
{
- existingFpArrayList.add((Object)focusPath);
+ existingFpArrayList.add(focusPath);
}
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java Thu Feb 15 16:21:46 2007
@@ -29,6 +29,7 @@
* @author The Oracle ADF Faces Team
* @deprecated use public API
*/
+@Deprecated
public class RenderUtils
{
private RenderUtils()
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java Thu Feb 15 16:21:46 2007
@@ -458,26 +458,31 @@
{
return new ResponseStream()
{
+ @Override
public void write(int b) throws IOException
{
output.write(b);
}
+ @Override
public void write(byte b[]) throws IOException
{
output.write(b);
}
+ @Override
public void write(byte b[], int off, int len) throws IOException
{
output.write(b, off, len);
}
+ @Override
public void flush() throws IOException
{
output.flush();
}
+ @Override
public void close() throws IOException
{
output.close();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java Thu Feb 15 16:21:46 2007
@@ -380,6 +380,7 @@
* @param context FacesContext
* @param afContext RequestContext
*/
+ @SuppressWarnings("unchecked")
private void _initializeSkin(
FacesContext context,
RequestContext afContext)
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java Thu Feb 15 16:21:46 2007
@@ -589,8 +589,8 @@
* @param value the List value
*/
static private void _writeJSCollection(
- StringWriter sw,
- Collection value) throws IOException
+ StringWriter sw,
+ Collection<?> value) throws IOException
{
if (value == null)
{
@@ -603,13 +603,14 @@
else
{
sw.append("[");
- for (Iterator iter = value.iterator();
- iter.hasNext();)
+ for (Iterator<?> iter = value.iterator(); iter.hasNext();)
{
Object item = iter.next();
_writeJSObject(sw, item);
if (iter.hasNext())
+ {
sw.append(',');
+ }
}
sw.append(']');
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java Thu Feb 15 16:21:46 2007
@@ -1783,7 +1783,6 @@
private static final String _SUFFIX_ICON_CELL = "-icon-cell";
private static final String _SUFFIX_ACTIVE = ":selected";
- private static final String _SUFFIX_DISABLED = ":disabled";
private static final String _SUFFIX_READ_ONLY = ":read-only";
private static final String _SUFFIX_UNVISITED = ":unvisited";
private static final String _SUFFIX_VISITED = ":visited";
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PanelButtonBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PanelButtonBarRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PanelButtonBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PanelButtonBarRenderer.java Thu Feb 15 16:21:46 2007
@@ -39,6 +39,7 @@
super(CorePanelButtonBar.TYPE);
}
+ @Override
protected Object getLayout(FacesBean bean)
{
return null;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java Thu Feb 15 16:21:46 2007
@@ -57,8 +57,6 @@
RenderingContext arc,
FacesBean bean) throws IOException
{
- ResponseWriter writer = context.getResponseWriter();
-
renderShortDescAttribute(context, arc, bean);
renderStyleAttributes(context, arc, bean);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java Thu Feb 15 16:21:46 2007
@@ -88,6 +88,7 @@
/**
* Returns the set of partial targets for this rendering pass.
*/
+ @Override
public Iterator<String> getPartialTargets()
{
return _targets.keySet().iterator();
@@ -99,6 +100,7 @@
* Tests whether the specified id is the client id of a UIComponent that
* should be rendered as part of the partial rendering pass.
*/
+ @Override
public boolean isPartialTarget(String id)
{
return (id != null) && _targets.containsKey(id);
@@ -107,6 +109,7 @@
/**
* Tests whether the specified partial target has been rendered.
*/
+ @Override
public boolean isPartialTargetRendered(String id)
{
return _renderedTargets.contains(id);
@@ -124,6 +127,7 @@
* @param id The id of the partial target to render
* @see #isPartialPassComplete
*/
+ @Override
public void addPartialTarget(String id)
{
_targets.put(id, Boolean.FALSE);
@@ -132,6 +136,7 @@
/**
* Returns true if we are inside of a partial target.
*/
+ @Override
public boolean isInsidePartialTarget()
{
return _getCurrentPartialTarget() != null;
@@ -142,11 +147,13 @@
* is needed if the "clientId" of a component does not match
* up to the top element (or elements).
*/
+ @Override
public void addRenderedPartialTarget(String id)
{
_renderedTargets.add(id);
}
+ @Override
public Iterator<String> getRenderedPartialTargets()
{
return _renderedTargets.iterator();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java Thu Feb 15 16:21:46 2007
@@ -19,9 +19,6 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.skin;
-import java.util.Map;
-
-import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.skin.Skin;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
import org.apache.myfaces.trinidadinternal.skin.SkinExtension;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java Thu Feb 15 16:21:46 2007
@@ -38,6 +38,7 @@
/**
* Returns the name of the XSS style sheet for this Skin.
*/
+ @Override
public String getStyleSheetName()
{
return "META-INF/adf/styles/simple-portlet.xss";
@@ -47,6 +48,7 @@
* Returns the id for the portlet implementation of the Simple
* Skin: "simple.portlet".
*/
+ @Override
public String getId()
{
return "simple.portlet";
@@ -56,6 +58,7 @@
* Returns the family for the portlet implementation of the Simple
* Skin: "simple.portlet".
*/
+ @Override
public String getFamily()
{
return "simple";
@@ -65,6 +68,7 @@
* Returns the renderKitId for the portlet implementation of the Simple
* Skin.
*/
+ @Override
public String getRenderKitId()
{
return CoreRenderKit.OUTPUT_MODE_PORTLET;
@@ -79,6 +83,7 @@
* @return Map<String, String> It should be a map that contains the full style class name as
* the key, and the value is a portlet style class.
*/
+ @Override
public Map<String, String> getStyleClassMap(
RenderingContext arc
)
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.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/CommandButtonRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java Thu Feb 15 16:21:46 2007
@@ -178,6 +178,7 @@
}
// FIXME: move this implementation to XhtmlRenderer
+ @Override
protected void renderStyleAttributes(
FacesContext context,
RenderingContext arc,
@@ -185,7 +186,9 @@
String defaultStyleClass) throws IOException
{
String styleClass = getStyleClass(bean);
- String inlineStyle = getInlineStyle(bean);
+ // -= Simon =-
+ // FIXME: How come inline style is never read locally?
+ // String inlineStyle = getInlineStyle(bean);
List<String> stateStyleClasses = getStateStyleClasses(context, arc, bean);
if ((styleClass==null) &&
@@ -248,6 +251,7 @@
}
}
+ @Override
protected String getDefaultStyleClass(FacesBean bean)
{
return SkinSelectors.AF_COMMAND_BUTTON_STYLE_CLASS;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java?view=diff&rev=508250&r1=508249&r2=508250
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java Thu Feb 15 16:21:46 2007
@@ -71,11 +71,13 @@
return _hasImmediateComponent;
}
+ @Override
public String getName()
{
return _formName;
}
+ @Override
public void addLabel(
String targetId,
String label
@@ -90,6 +92,7 @@
labelMap.put(targetId, label);
}
+ @Override
public Integer addGlobalMessageFormat(
RenderingContext rc)
{
@@ -116,6 +119,7 @@
*
* @todo get rid of servletRequestParameters reference
*/
+ @Override
public void addNeededValue(String name)
{
if (name == null)
@@ -132,6 +136,7 @@
}
+ @Override
public void addRenderedValue(String name)
{
Set<String> renderedSet = getRenderedValues(true);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.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/FormElementRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java Thu Feb 15 16:21:46 2007
@@ -238,6 +238,7 @@
return toString(bean.getProperty(_onchangeKey));
}
+ @Override
protected String getDefaultStyleClass(FacesBean bean)
{
return SkinSelectors.AF_FIELD_TEXT_STYLE_CLASS;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameRenderer.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/FrameRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameRenderer.java Thu Feb 15 16:21:46 2007
@@ -68,6 +68,7 @@
return true;
}
+ @Override
protected void renderAllAttributes(
FacesContext context,
RenderingContext arc,