You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by aw...@apache.org on 2007/05/16 01:42:49 UTC
svn commit: r538387 [1/13] - in /myfaces/trinidad/trunk:
plugins/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/
trinidad/
trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/
trinidad/trini...
Author: awiner
Date: Tue May 15 16:42:41 2007
New Revision: 538387
URL: http://svn.apache.org/viewvc?view=rev&rev=538387
Log:
TRINIDAD-16: Resolve issues reported by FindBugs
- Use the latest version of FindBugs to analyze the Trinidad codebase and fix reported problems.
Most were stylistic, but a few genuine bugs were detected. Changes included:
- Consistently use valueOf() instead of new Integer/Character/Short/Long/etc.
- Avoid unnecessary toString() and new String() calls
- A few synchronization issues, none especially significant
- Make inner classes static were possible
- Make constants static were this was missing
- Make clones of arrays (mostly) consistently
- Avoid String instance equality
- Fix some incorrect null pointer checks
- Fix some object equals() implementations
Modified:
myfaces/trinidad/trunk/plugins/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java
myfaces/trinidad/trunk/trinidad/pom.xml
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/PropertyKey.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyHashMap.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/StateUtils.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/ValueMap.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/change/ChangeComponentProxy.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/change/ReorderChildrenComponentChange.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/StampState.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ValueMap.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/ChartDrillDownEvent.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogRecord.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/PathHelper.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/AggregatingResourceLoader.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/StringContentResourceLoader.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilitiesProvider.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgentImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/NameVersion.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/VersionId.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/AccessKeyBinding.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResponseConfiguratorImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/PortletUploadedExternalContext.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/BaseConverter.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/CompositeButtonKey.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FlippedIconKey.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/GifEncoder.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/OctreeNode.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/OracleGIFEncoder.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/encode/PNGEncoder.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/CompositeButtonPainter.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/SourceUtils.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/CompositeButtonParser.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/DebugResponseWriter.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SingleStepButtonBarRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/BandingData.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/ScriptRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneUtils.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DateFormatContext.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DecimalFormatContext.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContextImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceSupport.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleProvider.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CSSStyle.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/FontProxy.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/VirtualAttributeUtils.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeUtils.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderedNodeRenderingContext.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AccessKeyBoundValue.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/EscapedTextFactory.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelExtension.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafConstants.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PanelTabbedRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/MessageBoxRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PanelTabbedRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/BorderLayoutRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/JavaIntrospector.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/TokenCache.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimal-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalIE-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalSaf-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chart-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messages-minimal-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messages-minimalIE-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messages-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messages-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messages-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messages-minimalSaf-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messages-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesError-minimal-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesError-minimalIE-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesError-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesError-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesError-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesError-minimalSaf-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesError-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesFatal-minimal-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesFatal-minimalIE-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesFatal-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesFatal-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesFatal-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesFatal-minimalSaf-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesFatal-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesInfo-minimal-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesInfo-minimalIE-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesInfo-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesInfo-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesInfo-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesInfo-minimalSaf-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesInfo-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesWarn-minimal-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesWarn-minimalIE-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesWarn-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesWarn-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesWarn-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesWarn-minimalSaf-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/messagesWarn-minimalScrRdr-golden.xml
Modified: myfaces/trinidad/trunk/plugins/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/plugins/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/plugins/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java (original)
+++ myfaces/trinidad/trunk/plugins/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java Tue May 15 16:42:41 2007
@@ -100,10 +100,7 @@
_pw.println("public class " + outName + " extends ListResourceBundle {");
_pw.println(" @Override");
_pw.println(" public Object[][] getContents() {");
- _pw.println(" return contents;");
- _pw.println(" }");
- _pw.println("");
- _pw.println(" static final Object[][] contents = {");
+ _pw.println(" return new Object[][] {");
}
protected void writeImports(Map parms, Map meta)
@@ -130,7 +127,8 @@
*/
public void endBundle(Map parms, Map meta) throws Throwable
{
- _pw.println(" };");
+ _pw.println(" };");
+ _pw.println(" }");
_pw.println("}");
_pw.close();
}
Modified: myfaces/trinidad/trunk/trinidad/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/pom.xml?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad/pom.xml Tue May 15 16:42:41 2007
@@ -210,7 +210,7 @@
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-xrts-plugin</artifactId>
- <version>1.0.0-incubating</version>
+ <version>1.0.1-SNAPSHOT</version>
<inherited>true</inherited>
</plugin>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java Tue May 15 16:42:41 2007
@@ -120,7 +120,7 @@
// javax.servlet.jsp.jstl.core.LoopTagStatus
if ("begin".equals(key)) // from jstl
{
- return new Integer(getFirst());
+ return Integer.valueOf(getFirst());
}
if ("first".equals(key)) // from jstl
{
@@ -130,11 +130,11 @@
if ("count".equals(key)) // from jstl
{
int count = getRowIndex() - getFirst() + 1;
- return new Integer(count);
+ return Integer.valueOf(count);
}
if ("step".equals(key)) // from jstl
{
- return new Integer(1);
+ return Integer.valueOf(1);
}
return map.get(key);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java Tue May 15 16:42:41 2007
@@ -86,7 +86,7 @@
int first = rEvent.getNewStart();
setFirst(first);
//pu: Implicitly record a Change for 'first' attribute
- addAttributeChange("first", new Integer(first));
+ addAttributeChange("first", Integer.valueOf(first));
if ((first == 0) && (rEvent.getNewEnd() == getRowCount()))
{
@@ -305,7 +305,7 @@
Object[] state = new Object[6];
state[0] = _sortCriteria;
state[1] = super.__getMyStampState();
- state[2] = new Integer(getFirst());
+ state[2] = Integer.valueOf(getFirst());
state[3] = Boolean.valueOf(isShowAll());
state[4] = getSelectedRowKeys();
state[5] = getDisclosedRowKeys();
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java Tue May 15 16:42:41 2007
@@ -116,7 +116,7 @@
if (index <= 0)
_firstMap.remove(container);
else
- _firstMap.put(container, new Integer(index));
+ _firstMap.put(container, Integer.valueOf(index));
}
/**
@@ -190,7 +190,7 @@
//pu: Implicitly record a Change for 'first' attribute
//=-=pu: This ain't getting restored. Check with Arj or file a bug.
addAttributeChange("first",
- new Integer(rce.getNewStart()));
+ Integer.valueOf(rce.getNewStart()));
broadcastToMethodBinding(event, getRangeChangeListener());
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/PropertyKey.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/PropertyKey.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/PropertyKey.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/PropertyKey.java Tue May 15 16:42:41 2007
@@ -308,13 +308,13 @@
{
Map<Class<?>, Object> map = new HashMap<Class<?>, Object>();
map.put(Boolean.TYPE, Boolean.FALSE);
- map.put(Byte.TYPE, new Byte((byte)0));
- map.put(Character.TYPE, new Character('\0'));
- map.put(Double.TYPE, new Double(0.0));
- map.put(Float.TYPE, new Float(0.0f));
- map.put(Integer.TYPE, new Integer(0));
- map.put(Long.TYPE, new Long(0L));
- map.put(Short.TYPE, new Short((short)0));
+ map.put(Byte.TYPE, Byte.valueOf((byte)0));
+ map.put(Character.TYPE, Character.valueOf('\0'));
+ map.put(Double.TYPE, Double.valueOf(0.0));
+ map.put(Float.TYPE, Float.valueOf(0.0f));
+ map.put(Integer.TYPE, Integer.valueOf(0));
+ map.put(Long.TYPE, Long.valueOf(0L));
+ map.put(Short.TYPE, Short.valueOf((short)0));
return Collections.unmodifiableMap(map);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyHashMap.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyHashMap.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyHashMap.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyHashMap.java Tue May 15 16:42:41 2007
@@ -175,4 +175,6 @@
private transient boolean _initialStateMarked;
private transient PropertyMap _deltas;
private boolean _useStateHolder;
+
+ private static final long serialVersionUID = 1L;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/StateUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/StateUtils.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/StateUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/StateUtils.java Tue May 15 16:42:41 2007
@@ -49,9 +49,9 @@
return key.getName();
if (index < 128)
- return new Byte((byte) index);
+ return Byte.valueOf((byte) index);
- return new Integer(index);
+ return Integer.valueOf(index);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/ValueMap.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/ValueMap.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/ValueMap.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/ValueMap.java Tue May 15 16:42:41 2007
@@ -140,9 +140,8 @@
if (!(o instanceof EntryImpl))
return false;
- Object key = ((EntryImpl) o).getKey();
- _keys.remove(key);
- return (ValueMap.this.remove(key) != null);
+ String keyName = ((EntryImpl) o).getKey();
+ return (ValueMap.this.remove(keyName) != null);
}
@Override
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/change/ChangeComponentProxy.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/change/ChangeComponentProxy.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/change/ChangeComponentProxy.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/change/ChangeComponentProxy.java Tue May 15 16:42:41 2007
@@ -108,7 +108,11 @@
private static final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(ChangeComponentProxy.class);
+ // FindBugs claims this as "Transient field that isn't set
+ // by deserialization", but _getComponentClass() lazily restores it
private transient Class<? extends UIComponent> _class;
private String _className;
private Object _state;
+
+ private static final long serialVersionUID = 1L;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/change/ReorderChildrenComponentChange.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/change/ReorderChildrenComponentChange.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/change/ReorderChildrenComponentChange.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/change/ReorderChildrenComponentChange.java Tue May 15 16:42:41 2007
@@ -152,7 +152,7 @@
if (currKey == null)
{
// =-= bts What about insignificant whitespace?
- currKey = new Integer(fakeIndex++).toString();
+ currKey = Integer.valueOf(fakeIndex++).toString();
}
currChildrenMap.put(currKey, currChild);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/StampState.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/StampState.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/StampState.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/StampState.java Tue May 15 16:42:41 2007
@@ -335,6 +335,8 @@
}
private Object _state = null;
+
+ private static final long serialVersionUID = 1L;
}
static private class EVHState extends RowState
@@ -420,6 +422,8 @@
private boolean _localSet;
private boolean _valid;
private transient UIComponent _assertStamp = null;
+
+ private static final long serialVersionUID = 1L;
}
private static final class DualKey implements Serializable
@@ -467,6 +471,8 @@
private final Object _key1, _key2;
private final int _hash;
+
+ private static final long serialVersionUID = 1L;
}
private static final TrinidadLogger _LOG =
@@ -474,4 +480,5 @@
private Map<DualKey, Object> _rows;
private static final Object[] _EMPTY_ARRAY = new Object[0];
+ private static final long serialVersionUID = 1L;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java Tue May 15 16:42:41 2007
@@ -19,6 +19,7 @@
package org.apache.myfaces.trinidad.component;
import java.io.IOException;
+import java.io.ObjectInputStream;
import java.io.Serializable;
import java.util.AbstractMap;
@@ -1043,7 +1044,7 @@
if ("rowKey".equals(key))
return getRowKey();
if ("index".equals(key)) // from jstl
- return new Integer(getRowIndex());
+ return Integer.valueOf(getRowIndex());
if ("current".equals(key)) // from jstl
return getRowData();
return null;
@@ -1357,6 +1358,20 @@
private ClientRowKeyManager _clientKeyMgr = null;
private StampState _stampState = null;
+
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException
+ {
+ in.defaultReadObject();
+ // Set values of all transients to their defaults
+ _prevVarValue = _NULL;
+ _prevVarStatus = _NULL;
+ _currentRowKey = _NULL;
+ _isInitialized = true;
+ _initialStampStateKey = _NULL;
+ }
+
+ private static final long serialVersionUID = 1L;
}
// do not assign a non-null value. values should be assigned lazily. this is
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java Tue May 15 16:42:41 2007
@@ -1117,7 +1117,7 @@
protected void setIntProperty(PropertyKey key, int value)
{
- getFacesBean().setProperty(key, new Integer(value));
+ getFacesBean().setProperty(key, Integer.valueOf(value));
}
protected int getIntProperty(PropertyKey key, int defaultValue)
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ValueMap.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ValueMap.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ValueMap.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ValueMap.java Tue May 15 16:42:41 2007
@@ -133,6 +133,4 @@
private Map<K, V> _cache;
private transient Map<V, K> _valueMap;
-
- //private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(InvertibleMap.class);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java Tue May 15 16:42:41 2007
@@ -137,18 +137,31 @@
private static final String TRANSPARENT =
"org.apache.myfaces.trinidad.convert.ColorConverter.TRANSPARENT";
+ // Deprecated array: arrays should never be public constants,
+ // as they are mutable
/**
- * <p>Default pattern to be used if pattern if not supplied.
+ * @deprecated use getDefaultColorFormatPatterns()
+ */
+ @Deprecated
+ public static final String[] DEFAULT_COLOR_FORMAT_PATTERNS =
+ getDefaultColorFormatPatterns();
+
+
+ /**
+ * <p>Returns the default patterns to be used if the pattern if not supplied.
* The default patterns is <code>"#RRGGBB", "r,g,b"</code>
* The first pattern is special, it is always used for formatting color
* values</p>
*/
- public static final String[] DEFAULT_COLOR_FORMAT_PATTERNS = new String[]
- {
- "#RRGGBB",
- "r,g,b"
- };
-
+ public static final String[] getDefaultColorFormatPatterns()
+ {
+ return new String[]
+ {
+ "#RRGGBB",
+ "r,g,b"
+ };
+ }
+
/**
* <p>Construct a ColorConverter with preconfigured values.</p>
* @param patterns The set of R,G,B format patterns that
@@ -165,7 +178,7 @@
{
if (patterns == null)
{
- _facesBean.setProperty(_PATTERNS_KEY, DEFAULT_COLOR_FORMAT_PATTERNS);
+ _facesBean.setProperty(_PATTERNS_KEY, getDefaultColorFormatPatterns());
}
else
{
@@ -628,7 +641,8 @@
= _TYPE.registerKey("transparentAllowed", Boolean.class, Boolean.FALSE);
private static final PropertyKey _PATTERNS_KEY
- = _TYPE.registerKey("patterns", String[].class, DEFAULT_COLOR_FORMAT_PATTERNS);
+ = _TYPE.registerKey("patterns", String[].class,
+ getDefaultColorFormatPatterns());
private static final PropertyKey _CONVERT_MESSAGE_DETAIL_KEY
= _TYPE.registerKey("messageDetailConvert", String.class);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java Tue May 15 16:42:41 2007
@@ -1355,15 +1355,15 @@
)
{
Object msgPattern;
- if (key == CONVERT_DATE_MESSAGE_ID)
+ if (CONVERT_DATE_MESSAGE_ID.equals(key))
{
msgPattern = _getRawConvertDateMessageDetail();
}
- else if (key == CONVERT_TIME_MESSAGE_ID)
+ else if (CONVERT_TIME_MESSAGE_ID.equals(key))
{
msgPattern = _getRawConvertTimeMessageDetail();
}
- else if (key == CONVERT_BOTH_MESSAGE_ID)
+ else if (CONVERT_BOTH_MESSAGE_ID.equals(key))
{
msgPattern = _getRawConvertBothMessageDetail();
}
@@ -1532,10 +1532,14 @@
default:
{
// we only replace the first set of years
+ // FIXME: this break does nothing, so commenting out; is
+ // it really logic that needs to be fixed?
+ /*
if ((yCount > 0) && (yCount < 4))
{
break;
}
+ */
}
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java Tue May 15 16:42:41 2007
@@ -242,7 +242,7 @@
// to integer only. We will return the long value from the number object
// we have in hand.
if (isIntegerOnly())
- return new Long(num.longValue());
+ return Long.valueOf(num.longValue());
return num;
@@ -761,7 +761,7 @@
private static Integer _getIntValue(int value)
{
- return new Integer(value);
+ return Integer.valueOf(value);
}
private NumberFormat _getCachedNumberFormat(
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/ChartDrillDownEvent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/ChartDrillDownEvent.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/ChartDrillDownEvent.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/ChartDrillDownEvent.java Tue May 15 16:42:41 2007
@@ -35,10 +35,10 @@
double[] xValues)
{
super(source);
- _seriesIndices = seriesIndices;
- _yValueIndices = yValueIndices;
- _yValues = yValues;
- _xValues = xValues;
+ _seriesIndices = (seriesIndices == null) ? null : seriesIndices.clone();
+ _yValueIndices = (yValueIndices == null) ? null : yValueIndices.clone();
+ _yValues = (yValues == null) ? null : yValues.clone();
+ _xValues = (xValues == null) ? null : xValues.clone();
}
@@ -63,7 +63,10 @@
*/
public int[] getSeriesIndices()
{
- return _seriesIndices;
+ if (_seriesIndices == null)
+ return null;
+
+ return _seriesIndices.clone();
}
/**
@@ -77,7 +80,10 @@
*/
public int[] getYValueIndices()
{
- return _yValueIndices;
+ if (_yValueIndices == null)
+ return null;
+
+ return _yValueIndices.clone();
}
/**
@@ -90,7 +96,10 @@
*/
public double[] getYValues()
{
- return _yValues;
+ if (_yValues == null)
+ return null;
+
+ return _yValues.clone();
}
/**
@@ -104,7 +113,9 @@
*/
public double[] getXValues()
{
- return _xValues;
+ if (_xValues == null)
+ return null;
+ return _xValues.clone();
}
private final int[] _seriesIndices;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogRecord.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogRecord.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogRecord.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogRecord.java Tue May 15 16:42:41 2007
@@ -29,6 +29,7 @@
public TrinidadLogRecord(Level level, String msg)
{
super(level, (msg == null) ? "" : msg);
+ _needToInferCaller = true;
}
@@ -118,7 +119,7 @@
setSourceMethodName(null);
}
- transient private boolean _needToInferCaller = true;
+ transient private boolean _needToInferCaller;
private static final String _JDK_LOG_CLASS =
@@ -126,5 +127,7 @@
private static final String _TRINIDAD_LOG_CLASS =
"org.apache.myfaces.trinidad.logging.TrinidadLogger";
+
+ private static final long serialVersionUID = 1L;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/PathHelper.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/PathHelper.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/PathHelper.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/PathHelper.java Tue May 15 16:42:41 2007
@@ -101,7 +101,7 @@
for(int i=0; i<lastIndex; i++)
{
- setRowKey(path.get(i).toString());
+ setRowKey(path.get(i));
pushPath();
}
setRowKey(path.get(lastIndex));
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetImpl.java Tue May 15 16:42:41 2007
@@ -508,4 +508,5 @@
private boolean _default;
private Set<Object> _set;
private transient CollectionModel _model;
+ private static final long serialVersionUID = 1L;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java Tue May 15 16:42:41 2007
@@ -693,4 +693,5 @@
private Node<Object> _root;
private transient TreeModel _model = null;
+ private static final long serialVersionUID = 1L;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java Tue May 15 16:42:41 2007
@@ -239,7 +239,7 @@
// IMPORTANT: Code that returns the correct focus path for duplicate nodes
// in the node tree actually depends on this optimization.
//
- if (currentViewId == _prevViewId)
+ if ((_prevViewId != null) && _prevViewId.equals(currentViewId))
return _prevFocusPath;
// Initializations
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/AggregatingResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/AggregatingResourceLoader.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/AggregatingResourceLoader.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/AggregatingResourceLoader.java Tue May 15 16:42:41 2007
@@ -60,7 +60,7 @@
if (target == null)
throw new NullPointerException();
- _paths = paths;
+ _paths = paths.clone();
_target = target;
}
@@ -158,7 +158,7 @@
{
throw new NullPointerException();
}
- _urls = urls;
+ _urls = urls.clone();
_separator = separator;
}
@@ -188,7 +188,7 @@
}
- private class AggregatingURLConnection extends URLConnection
+ static private class AggregatingURLConnection extends URLConnection
{
public AggregatingURLConnection(URL url, URLConnection[] connections, String separator)
{
@@ -231,7 +231,7 @@
//Add the separator if needed
if(hasseparator && (i < sublen))
{
- streams[++streamCounter] = new separatorInputStream(_separator);
+ streams[++streamCounter] = new SeparatorInputStream(_separator);
}
}
return new SequenceInputStream(new ArrayEnumeration<InputStream>(streams));
@@ -330,11 +330,8 @@
}
- private class ArrayEnumeration<T> implements Enumeration<T>
+ static private class ArrayEnumeration<T> implements Enumeration<T>
{
- private T[] _array;
- private int _len;
- private int _pointer = 0;
public ArrayEnumeration(T[] array)
{
_array = array;
@@ -362,14 +359,15 @@
{
return hasNext();
}
+
+ private T[] _array;
+ private int _len;
+ private int _pointer = 0;
}
- private class separatorInputStream extends InputStream
+ static private class SeparatorInputStream extends InputStream
{
- private byte[] _separator;
- private int _length;
- private int _index = 0;
- public separatorInputStream (byte[] separatorBytes)
+ public SeparatorInputStream (byte[] separatorBytes)
{
_separator = separatorBytes;
_length = _separator.length;
@@ -431,5 +429,9 @@
{
return _length - _index;
}
+
+ private byte[] _separator;
+ private int _length;
+ private int _index = 0;
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/StringContentResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/StringContentResourceLoader.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/StringContentResourceLoader.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/resource/StringContentResourceLoader.java Tue May 15 16:42:41 2007
@@ -55,7 +55,7 @@
* specified in a String.
*
*/
- private class StringContentURLStreamHandler extends URLStreamHandler
+ static private class StringContentURLStreamHandler extends URLStreamHandler
{
/**
* Created a StringContentURLStreamHandler which will provide the specified content on the
@@ -87,7 +87,7 @@
private String _contentType;
}
- private class StringContentURLConnection extends URLConnection
+ static private class StringContentURLConnection extends URLConnection
{
public StringContentURLConnection(URL url, byte[] buff, String contentType)
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java Tue May 15 16:42:41 2007
@@ -142,7 +142,7 @@
*/
public void setMaximum(int maximum)
{
- _facesBean.setProperty(_MAXIMUM_KEY, new Integer(maximum));
+ _facesBean.setProperty(_MAXIMUM_KEY, Integer.valueOf(maximum));
}
/**
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java Tue May 15 16:42:41 2007
@@ -77,7 +77,8 @@
/**
* Construct a {@link Validator} with no preconfigured limits.
*/
- public DoubleRangeValidator() {
+ public DoubleRangeValidator()
+ {
super();
}
@@ -87,8 +88,9 @@
*
* @param maximum Maximum value to allow
*/
- public DoubleRangeValidator(long maximum) {
- super(new Long(maximum));
+ public DoubleRangeValidator(long maximum)
+ {
+ super();
}
/**
@@ -99,8 +101,9 @@
* @param minimum Minimum value to allow
*
*/
- public DoubleRangeValidator(long maximum, long minimum) {
- super(new Long(minimum), new Long(maximum));
+ public DoubleRangeValidator(long maximum, long minimum)
+ {
+ super(minimum, maximum);
}
/**
@@ -127,7 +130,7 @@
public void setMaximum(double maximum)
{
super.setMaximum(maximum);
- _facesBean.setProperty(_MAXIMUM_KEY, new Double(maximum));
+ _facesBean.setProperty(_MAXIMUM_KEY, Double.valueOf(maximum));
}
@@ -155,7 +158,7 @@
public void setMinimum(double minimum)
{
super.setMinimum(minimum);
- _facesBean.setProperty(_MINIMUM_KEY, new Double(minimum));
+ _facesBean.setProperty(_MINIMUM_KEY, Double.valueOf(minimum));
}
/**
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java Tue May 15 16:42:41 2007
@@ -79,7 +79,8 @@
/**
* Construct a {@link Validator} with no preconfigured limits.
*/
- public LengthValidator() {
+ public LengthValidator()
+ {
super();
}
@@ -89,8 +90,9 @@
*
* @param maximum Maximum value to allow
*/
- public LengthValidator(int maximum) {
- super(new Integer(maximum));
+ public LengthValidator(int maximum)
+ {
+ super(maximum);
}
/**
@@ -101,8 +103,9 @@
* @param minimum Minimum value to allow
*
*/
- public LengthValidator(int maximum, int minimum) {
- super(new Integer(minimum), new Integer(maximum));
+ public LengthValidator(int maximum, int minimum)
+ {
+ super(minimum, maximum);
}
/**
@@ -129,7 +132,7 @@
public void setMaximum(int maximum)
{
super.setMaximum(maximum);
- _facesBean.setProperty(_MAXIMUM_KEY, new Integer(maximum));
+ _facesBean.setProperty(_MAXIMUM_KEY, Integer.valueOf(maximum));
}
@@ -155,7 +158,7 @@
public void setMinimum(int minimum)
{
super.setMinimum(minimum);
- _facesBean.setProperty(_MINIMUM_KEY, new Integer(minimum));
+ _facesBean.setProperty(_MINIMUM_KEY, Integer.valueOf(minimum));
}
/**
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java Tue May 15 16:42:41 2007
@@ -79,7 +79,8 @@
/**
* Construct a {@link Validator} with no preconfigured limits.
*/
- public LongRangeValidator() {
+ public LongRangeValidator()
+ {
super();
}
@@ -89,8 +90,9 @@
*
* @param maximum Maximum value to allow
*/
- public LongRangeValidator(long maximum) {
- super(new Long(maximum));
+ public LongRangeValidator(long maximum)
+ {
+ super(maximum);
}
/**
@@ -101,8 +103,9 @@
* @param minimum Minimum value to allow
*
*/
- public LongRangeValidator(long maximum, long minimum) {
- super(new Long(minimum), new Long(maximum));
+ public LongRangeValidator(long maximum, long minimum)
+ {
+ super(minimum, maximum);
}
/**
@@ -129,7 +132,7 @@
public void setMaximum(long maximum)
{
super.setMaximum(maximum);
- _facesBean.setProperty(_MAXIMUM_KEY, new Long(maximum));
+ _facesBean.setProperty(_MAXIMUM_KEY, Long.valueOf(maximum));
}
@@ -157,7 +160,7 @@
public void setMinimum(long minimum)
{
super.setMinimum(minimum);
- _facesBean.setProperty(_MINIMUM_KEY, new Long(minimum));
+ _facesBean.setProperty(_MINIMUM_KEY, Long.valueOf(minimum));
}
/**
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java Tue May 15 16:42:41 2007
@@ -275,13 +275,13 @@
public void setPattern(String pattern)
{
String prevPattern = getPattern();
- if (! (prevPattern != null && prevPattern.equals(pattern) ||
- (prevPattern == pattern)
- ))
- {
- _facesBean.setProperty(_PATTERN_KEY, pattern);
- _compiled = null;
- }
+ if ((prevPattern != null) && prevPattern.equals(pattern))
+ return;
+ if ((prevPattern == null) && (pattern == null))
+ return;
+
+ _facesBean.setProperty(_PATTERN_KEY, pattern);
+ _compiled = null;
}
/**
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java Tue May 15 16:42:41 2007
@@ -279,27 +279,31 @@
BufferedReader br = new BufferedReader(r);
try
{
- String className = br.readLine().trim();
- Class<?> clazz = cl.loadClass(className);
- try
+ String className = br.readLine();
+ if (className != null)
{
- Constructor<?> decorator = clazz.getConstructor(_DECORATOR_SIGNATURE);
- ServletContext context = getServletContext();
- File tempdir = (File)
+ className = className.trim();
+ Class<?> clazz = cl.loadClass(className);
+ try
+ {
+ Constructor<?> decorator = clazz.getConstructor(_DECORATOR_SIGNATURE);
+ ServletContext context = getServletContext();
+ File tempdir = (File)
context.getAttribute("javax.servlet.context.tempdir");
- ResourceLoader delegate = new DirectoryResourceLoader(tempdir);
- loader = (ResourceLoader)
+ ResourceLoader delegate = new DirectoryResourceLoader(tempdir);
+ loader = (ResourceLoader)
decorator.newInstance(new Object[]{delegate});
- }
- catch (InvocationTargetException e)
- {
- // by default, create new instance with no-args constructor
- loader = (ResourceLoader) clazz.newInstance();
- }
- catch (NoSuchMethodException e)
- {
- // by default, create new instance with no-args constructor
- loader = (ResourceLoader) clazz.newInstance();
+ }
+ catch (InvocationTargetException e)
+ {
+ // by default, create new instance with no-args constructor
+ loader = (ResourceLoader) clazz.newInstance();
+ }
+ catch (NoSuchMethodException e)
+ {
+ // by default, create new instance with no-args constructor
+ loader = (ResourceLoader) clazz.newInstance();
+ }
}
}
finally
@@ -465,7 +469,7 @@
return false;
}
- private class _ResourceLifecycle extends Lifecycle
+ static private class _ResourceLifecycle extends Lifecycle
{
@Override
public void execute(FacesContext p0) throws FacesException
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java Tue May 15 16:42:41 2007
@@ -268,7 +268,7 @@
else
{
if (value.length() >= 1)
- bean.setProperty(key, new Character(value.charAt(0)));
+ bean.setProperty(key, Character.valueOf(value.charAt(0)));
}
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java Tue May 15 16:42:41 2007
@@ -93,7 +93,7 @@
if (userAgent == null)
{
- _populateUnknownAgentImpl(userAgent, agent);
+ _populateUnknownAgentImpl(null, agent);
return;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java Tue May 15 16:42:41 2007
@@ -57,23 +57,26 @@
new DefaultAgent ()
{
@Override
- public Object getType() {
+ public Object getType()
+ {
return AgentNameUtil.getAgentName(fType);
}
@Override
- public String getAgentName() {
+ public String getAgentName()
+ {
return AgentNameUtil.getAgentName(fBrowser);
}
@Override
- public String getAgentVersion() {
+ public String getAgentVersion()
+ {
return fAgentVersion;
}
- // FIXME: This method is never used locally, should it be removed?
- @SuppressWarnings("unused")
- public String getPlatFormName() {
+ @Override
+ public String getPlatformName()
+ {
return AgentNameUtil.getPlatformName(fPlatform);
}
};
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilitiesProvider.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilitiesProvider.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilitiesProvider.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilitiesProvider.java Tue May 15 16:42:41 2007
@@ -37,7 +37,7 @@
{
/**
- * @param capUrl URL to the capabilities document defining the
+ * @param capUrl URI to the capabilities document defining the
* capabilities for various clients/agents
* //TODO: Right now all capabilities get an Key. Do we really need to that?
* //--why should we create a key for capabilities we don't care?
@@ -48,7 +48,7 @@
}
/**
- * @param capUrl URL to the capabilities document defining the
+ * @param capUrl URI to the capabilities document defining the
* capabilities for various clients/agents
* @return A provider of Capabilities based on the context Agent
*/
@@ -215,7 +215,7 @@
private URL _capUrl;
- private CapabilitiesDocument _document;
+ private volatile CapabilitiesDocument _document;
static private CapabilityMap _EMPTY_MAP = new CapabilityMap(new Object[0][0]);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java Tue May 15 16:42:41 2007
@@ -262,17 +262,16 @@
private Object[] _getMapAsArray(Map<Object, Object> capabilities)
{
- Iterator<Object> iter = capabilities.keySet().iterator();
Object[] caps = new Object[capabilities.size() * 2];
int i = 0;
- while (iter.hasNext())
+ for (Map.Entry<Object, Object> entry : capabilities.entrySet())
{
- Object key = iter.next();
+ Object key = entry.getKey();
CapabilityKey capKey = key instanceof CapabilityKey
? (CapabilityKey) key
: CapabilityKey.getCapabilityKey((String) key);
caps[i++] = capKey;
- caps[i++] = capabilities.get(key);
+ caps[i++] = entry.getValue();
}
return caps;
}
@@ -334,7 +333,7 @@
//Map Entry
- private class CEntry implements Entry<Object, Object>
+ static private class CEntry implements Entry<Object, Object>
{
private Object key;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgentImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgentImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgentImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgentImpl.java Tue May 15 16:42:41 2007
@@ -380,7 +380,7 @@
_capMap = _capMap.merge(capabilities);
}
- private static URL _capUrl;
+ private static volatile URL _capUrl;
//@todo: Get this from the Configuration Object
static final private String _CAPABILITIES_FILE = "META-INF/agent/capabilities.xml";
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/NameVersion.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/NameVersion.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/NameVersion.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/NameVersion.java Tue May 15 16:42:41 2007
@@ -487,13 +487,13 @@
//structure to store the parsed parts of a name
- private class NameEntry
+ static private class NameEntry
{
String text;
NameEntry next;
}
- private class VersionEntry
+ static private class VersionEntry
{
static final int EXACT_TYPE = 0;
static final int PLUS_TYPE = 1;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/VersionId.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/VersionId.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/VersionId.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/parse/VersionId.java Tue May 15 16:42:41 2007
@@ -151,7 +151,7 @@
return head;
}
- private class Entry
+ static private class Entry
{
String text;
Entry next;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Tue May 15 16:42:41 2007
@@ -769,6 +769,8 @@
private static final class PageState implements Serializable
{
+ private static final long serialVersionUID = 1L;
+
private final Object _structure, _state;
// use transient since UIViewRoots are not Serializable.
private transient UIViewRoot _root;
@@ -918,6 +920,8 @@
private static final String _APPLICATION_CACHE_TOKEN = "_a_";
+
+ private static final long serialVersionUID = 1L;
private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(StateManagerImpl.class);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java Tue May 15 16:42:41 2007
@@ -389,12 +389,12 @@
// Remove the "file:"
File file = new File(externalForm.substring(5));
- return new Long(file.lastModified());
+ return Long.valueOf(file.lastModified());
}
else
{
long modified = url.openConnection().getLastModified();
- return new Long(modified);
+ return Long.valueOf(modified);
}
}
@@ -537,5 +537,5 @@
"org.apache.myfaces.trinidad.CHECK_FILE_MODIFICATION";
private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(ViewHandlerImpl.class);
- private static final Long _NOT_FOUND = new Long(0);
+ private static final Long _NOT_FOUND = Long.valueOf(0);
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/AccessKeyBinding.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/AccessKeyBinding.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/AccessKeyBinding.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/AccessKeyBinding.java Tue May 15 16:42:41 2007
@@ -56,7 +56,7 @@
if (accessKeyIndex == StringUtils.MNEMONIC_INDEX_NONE)
return null;
- return new Character(text.charAt(accessKeyIndex + 1));
+ return Character.valueOf(text.charAt(accessKeyIndex + 1));
}
@Override
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResponseConfiguratorImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResponseConfiguratorImpl.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResponseConfiguratorImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResponseConfiguratorImpl.java Tue May 15 16:42:41 2007
@@ -81,7 +81,7 @@
return (String) requestMap.get(__CONTENT_TYPE_KEY);
}
- private class ServletExternalContext extends ExternalContextDecorator
+ static private class ServletExternalContext extends ExternalContextDecorator
{
public ServletExternalContext(ExternalContext ec)
{
@@ -109,7 +109,7 @@
private ExternalContext _ec;
}
- private class PortletExternalContext extends ExternalContextDecorator
+ static private class PortletExternalContext extends ExternalContextDecorator
{
public PortletExternalContext(ExternalContext ec)
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/PortletUploadedExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/PortletUploadedExternalContext.java?view=diff&rev=538387&r1=538386&r2=538387
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/PortletUploadedExternalContext.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/PortletUploadedExternalContext.java Tue May 15 16:42:41 2007
@@ -127,7 +127,7 @@
return _externalContext;
}
- private class PortletUploadRequestWrapper extends ActionRequestWrapper
+ static private class PortletUploadRequestWrapper extends ActionRequestWrapper
{
public PortletUploadRequestWrapper(
ActionRequest request,