[Jguiraffe-developers] SF.net SVN: jguiraffe:[195] trunk
Brought to you by:
oheger
Menu
▾
▴
[Jguiraffe-developers] SF.net SVN: jguiraffe:[195] trunk
|
From: <oh...@us...> - 2010-08-30 19:54:52
|
Revision: 195
http://jguiraffe.svn.sourceforge.net/jguiraffe/?rev=195&view=rev
Author: oheger
Date: 2010-08-30 19:54:41 +0000 (Mon, 30 Aug 2010)
Log Message:
-----------
Improvements of the site. Fixed numerous checkstyle errors. Added ComponentManagerWrapper class.
Modified Paths:
--------------
trunk/conf/checkstyle.xml
trunk/core/pom.xml
trunk/core/src/main/java/net/sf/jguiraffe/di/BeanContext.java
trunk/core/src/main/java/net/sf/jguiraffe/di/EnumConverter.java
trunk/core/src/main/java/net/sf/jguiraffe/di/MutableBeanStore.java
trunk/core/src/main/java/net/sf/jguiraffe/di/ReflectionUtils.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/BeanContextWrapper.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ChainedInvocation.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ClassDependency.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ClassDescription.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ConstructorInvocation.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultBeanContext.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultClassLoaderProvider.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultDependencyProvider.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/Invocation.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/MethodInvocation.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/NameDependency.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/SetPropertyInvocation.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/ConstantBeanProvider.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/ConstructorBeanProvider.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/LifeCycleBeanProvider.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/MapBeanProvider.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/MethodInvocationBeanProvider.java
trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/SingletonBeanProvider.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/app/Application.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/app/ApplicationContext.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/app/ApplicationContextImpl.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/app/ApplicationResources.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/app/ApplicationShutdownListener.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/app/CommandActionTask.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/app/OpenWindowCommand.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/BeanBuilder.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/BeanBuilderResult.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/Accelerator.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/ActionBuilder.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/ActionHelper.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/ActionInvoker.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/ActionStore.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/tags/ActionTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/tags/EventFilterTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/tags/EventListenerTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/tags/EventRegistrationTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/tags/FormEventListenerTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/tags/MenuBarTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/tags/MenuItemTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/tags/MenuTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/tags/SeparatorTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/action/tags/ToolButtonTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/Color.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/ColorHelper.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/ComponentBuilderCallBack.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/ComponentBuilderData.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/ComponentGroup.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/ComponentManager.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/Composite.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/DefaultToolTipManager.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/FormBuilderRuntimeException.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/ToolTipManager.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/model/ProgressBarHandler.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/model/StaticTextData.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/model/TreeExpansionEvent.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ButtonTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/CheckboxTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ComboBoxTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ComponentHandlerTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ConditionalTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ConstraintsTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ContainerTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ConverterTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/DesktopPanelTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/FieldTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/FontTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/FormBaseTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/IconSupport.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/IconTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/InputComponentTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/LabelTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ListBoxTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ListModelUtils.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/LocalizedTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/PanelTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/PercentCellConstraintsTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/PercentCellGroupTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/PercentLayoutTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ProgressBarTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/RadioButtonTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ReferenceTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/SimpleComponentTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/SliderTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/SplitterTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/StaticTextDataImpl.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/StaticTextTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/TabbedPaneTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/TextIconData.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/TextListModelTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ToggleButtonTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/TransformerBaseTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/TransformerTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/TreeTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/UseBeanBaseTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/ValidatorBaseTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/table/ColumnClass.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/table/ColumnComponentTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/table/TableColumnTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/table/TableColumnWidthController.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/tags/table/TableTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/DIBuilderData.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/BeanStoreTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/BeanTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/ConstantValueTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/ElementTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/EntryKeyTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/EntryTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/FactoryTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/InvocationData.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/ListTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/MapTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/SetTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/di/tags/ValueData.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/event/FormEventManager.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/event/FormFocusEvent.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/event/FormListenerType.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/event/FormMouseEvent.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/event/filter/ChainedEventFilter.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/impl/JellyBeanBuilder.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/window/InvariantWindowClosingStrategy.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/window/WindowEvent.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/window/ctrl/FormController.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/window/tags/FormControllerTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/window/tags/FrameTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/window/tags/WindowBaseTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/window/tags/WindowControllerTag.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/cmd/CommandQueueEvent.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/cmd/CommandQueueImpl.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/forms/ComponentHandler.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/forms/ComponentHandlerImpl.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/forms/DefaultFieldHandler.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/forms/DefaultFormValidatorResults.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/forms/FormRuntimeException.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/forms/FormValidatorResults.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/forms/ValidationPhase.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/forms/bind/DummyBindingStrategy.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/layout/BorderLayout.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/layout/ButtonLayout.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/layout/CellAlignment.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/layout/CellConstraints.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/layout/CellGroup.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/layout/CellSize.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/layout/NumberWithUnit.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/layout/PercentData.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/layout/PercentLayout.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/layout/PercentLayoutBase.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/layout/Unit.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/action/SwingActionManager.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/action/SwingFormAction.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/SwingComponentManager.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/SwingComponentUtils.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/SwingListModel.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/SwingProgressBarHandler.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/SwingStaticTextComponentHandler.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/SwingTabbedPaneHandler.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/SwingTableComponentHandler.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/SwingTreeCellRenderer.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/SwingTreeComponentHandler.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/table/SwingTableCellRenderer.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/table/SwingTableModel.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/event/SwingEventConstantMapper.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/event/SwingEventManager.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/utils/SwingGUISynchronizer.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/utils/SwingMessageOutput.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/window/WindowHelper.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/layout/SwingPercentLayoutAdapter.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/layout/SwingSizeHandler.java
trunk/core/src/main/java/net/sf/jguiraffe/locators/ByteArrayLocator.java
trunk/core/src/main/java/net/sf/jguiraffe/locators/ClassPathLocator.java
trunk/core/src/main/java/net/sf/jguiraffe/locators/FileLocator.java
trunk/core/src/main/java/net/sf/jguiraffe/locators/LocatorUtils.java
trunk/core/src/main/java/net/sf/jguiraffe/locators/URLLocator.java
trunk/core/src/main/java/net/sf/jguiraffe/resources/Message.java
trunk/core/src/main/java/net/sf/jguiraffe/resources/ResourceManager.java
trunk/core/src/main/java/net/sf/jguiraffe/resources/impl/ResourceManagerImpl.java
trunk/core/src/main/java/net/sf/jguiraffe/resources/impl/bundle/BundleResourceGroup.java
trunk/core/src/main/java/net/sf/jguiraffe/transform/AbstractDecimalTransformer.java
trunk/core/src/main/java/net/sf/jguiraffe/transform/AbstractIntegerTransformer.java
trunk/core/src/main/java/net/sf/jguiraffe/transform/ChainValidator.java
trunk/core/src/main/java/net/sf/jguiraffe/transform/DateTimeTransformer.java
trunk/core/src/main/java/net/sf/jguiraffe/transform/DateTransformerBase.java
trunk/core/src/main/java/net/sf/jguiraffe/transform/DefaultValidationMessageHandler.java
trunk/core/src/main/java/net/sf/jguiraffe/transform/DefaultValidationResult.java
trunk/core/src/main/java/net/sf/jguiraffe/transform/DummyTransformer.java
trunk/core/src/main/java/net/sf/jguiraffe/transform/NumberTransformerBase.java
trunk/core/src/main/java/net/sf/jguiraffe/transform/Validator.java
trunk/core/src/site/site.xml
trunk/core/src/test/java/net/sf/jguiraffe/gui/builder/components/ComponentManagerImpl.java
trunk/core/src/test/java/net/sf/jguiraffe/gui/cmd/TestCommandQueueImpl.java
trunk/core/src/test/java/net/sf/jguiraffe/gui/platform/swing/builder/components/TestSwingComponentManager.java
trunk/core/src/test/java/net/sf/jguiraffe/gui/platform/swing/builder/components/table/AbstractTableModelTest.java
trunk/core/src/test/java/net/sf/jguiraffe/gui/platform/swing/builder/event/TestSwingEventManager.java
trunk/core/src/test/java/net/sf/jguiraffe/gui/platform/swing/builder/utils/TestSwingMessageOutput.java
trunk/examples/pom.xml
trunk/examples/src/main/resources/main.jelly
trunk/pom.xml
Added Paths:
-----------
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/ComponentManagerWrapper.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/utils/package.html
trunk/core/src/main/java/net/sf/jguiraffe/resources/impl/bundle/package.html
trunk/core/src/main/java/net/sf/jguiraffe/resources/impl/package.html
trunk/core/src/main/java/net/sf/jguiraffe/resources/package.html
trunk/core/src/test/java/net/sf/jguiraffe/gui/builder/components/TestComponentManagerWrapper.java
trunk/examples/src/site/
trunk/examples/src/site/resources/
trunk/examples/src/site/resources/images/
trunk/examples/src/site/resources/images/tutorial_main.png
trunk/examples/src/site/resources/images/tutorial_viewsettings.png
trunk/examples/src/site/site.xml
trunk/examples/src/site/xdoc/
trunk/examples/src/site/xdoc/index.xml
trunk/examples/src/site/xdoc/tutorialapp.xml
trunk/src/
trunk/src/site/
trunk/src/site/resources/
trunk/src/site/resources/images/
trunk/src/site/resources/images/giraffe.jpg
trunk/src/site/site.xml
trunk/src/site/xdoc/
trunk/src/site/xdoc/building.xml
trunk/src/site/xdoc/index.xml
Removed Paths:
-------------
trunk/core/src/site/resources/images/giraffe.jpg
trunk/core/src/site/resources/images/tutorial_main.png
trunk/core/src/site/resources/images/tutorial_viewsettings.png
trunk/core/src/site/xdoc/building.xml
trunk/core/src/site/xdoc/tutorialapp.xml
Property Changed:
----------------
trunk/core/src/main/java/net/sf/jguiraffe/gui/builder/components/model/ProgressBarHandler.java
trunk/core/src/main/java/net/sf/jguiraffe/gui/platform/swing/builder/components/SwingProgressBarHandler.java
Modified: trunk/conf/checkstyle.xml
===================================================================
--- trunk/conf/checkstyle.xml 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/conf/checkstyle.xml 2010-08-30 19:54:41 UTC (rev 195)
@@ -1,9 +1,27 @@
<?xml version="1.0"?>
+<!--
+ Copyright 2006-2010 The GUIraffe Team.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.1//EN"
"http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
-<!-- Checkstyle configuration that checks the JGUIraffe coding conventions -->
+<!--
+ Checkstyle configuration that checks the JGUIraffe coding conventions
+ $Id$
+-->
<module name="Checker">
<property name="localeLanguage" value="en"/>
@@ -129,7 +147,6 @@
<module name="StringLiteralEquality"/>
<module name="SuperClone"/>
<module name="SuperFinalize"/>
- <module name="IllegalType"/>
<module name="DeclarationOrder"/>
<module name="ExplicitInitialization"/>
<module name="DefaultComesLast"/>
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/pom.xml 2010-08-30 19:54:41 UTC (rev 195)
@@ -117,6 +117,19 @@
<webAccessUrl>http://jguiraffe.svn.sourceforge.net/viewvc/jguiraffe/trunk</webAccessUrl>
<anonymousConnection>scm:svn:https://jguiraffe.svn.sourceforge.net/svnroot/jguiraffe/trunk</anonymousConnection>
<developerConnection>scm:svn:https://jguiraffe.svn.sourceforge.net/svnroot/jguiraffe/trunk</developerConnection>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>dependencies</report>
+ <report>project-team</report>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</configuration>
</plugin>
<plugin>
@@ -142,6 +155,11 @@
<configLocation>${basedir}/../conf/checkstyle.xml</configLocation>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
</plugins>
</reporting>
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/BeanContext.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/BeanContext.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/BeanContext.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -80,6 +80,7 @@
* abstract from the concrete naming of beans and focuses more on the beans'
* semantics.
*
+ * @param <T> the type of the bean to be fetched
* @param beanCls the class of the bean to be fetched
* @return the bean with this class
* @throws InjectionException if the bean cannot be resolved or its creation
@@ -92,6 +93,7 @@
* <code>BeanStore</code>. Works like the overloaded method, but operates
* on the given bean store.
*
+ * @param <T> the type of the bean to be fetched
* @param beanCls the class of the bean to be fetched
* @param store the <code>BeanStore</code> to use
* @return the bean with this class
@@ -254,7 +256,7 @@
/**
* Returns the {@code ClassLoaderProvider} used by this context.
- *
+ *
* @return the {@code ClassLoaderProvider}
*/
ClassLoaderProvider getClassLoaderProvider();
@@ -262,7 +264,7 @@
/**
* Sets the {@code ClassLoaderProvider} to be used by this context. This
* object is needed when classes have to be loaded through reflection.
- *
+ *
* @param clp the {@code ClassLoaderProvider}
*/
void setClassLoaderProvider(ClassLoaderProvider clp);
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/EnumConverter.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/EnumConverter.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/EnumConverter.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -42,10 +42,10 @@
* @author Oliver Heger
* @version $Id$
*/
-public class EnumConverter implements Converter
+public final class EnumConverter implements Converter
{
/** Constant for the single shared instance of this class. */
- private static EnumConverter INSTANCE = new EnumConverter();
+ private static final EnumConverter INSTANCE = new EnumConverter();
/**
* Private constructor so that no new instances can be created.
@@ -74,6 +74,7 @@
*
* @param type the class to convert to
* @param value the object to be converted
+ * @return the result of the conversion
*/
public Object convert(@SuppressWarnings("rawtypes") Class type, Object value)
{
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/MutableBeanStore.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/MutableBeanStore.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/MutableBeanStore.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -93,5 +93,5 @@
*
* @param p the parent
*/
- public void setParent(BeanStore p);
+ void setParent(BeanStore p);
}
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/ReflectionUtils.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/ReflectionUtils.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/ReflectionUtils.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -43,7 +43,7 @@
* @author Oliver Heger
* @version $Id$
*/
-public class ReflectionUtils
+public final class ReflectionUtils
{
/**
* A private constructor, so that no instances can be created.
@@ -80,7 +80,6 @@
try
{
return ClassUtils.getClass(loader, className);
-// return Class.forName(className, true, loader);
}
catch (ClassNotFoundException cnfex)
{
@@ -126,6 +125,7 @@
* that deals with all possible exceptions and redirects them as
* <code>InjectionException</code>s.
*
+ * @param <T> the type of the constructor
* @param ctor the constructor to be invoked (must not be <b>null</b>)
* @param args the arguments to be passed to the constructor
* @return the newly created instance
@@ -396,7 +396,8 @@
static boolean matchParameterTypes(Class<?>[] parameterTypes,
Class<?>[] definedTypes, Object[] values)
{
- assert parameterTypes != null && definedTypes != null && values != null : "Input parameters are null";
+ assert parameterTypes != null && definedTypes != null && values != null
+ : "Input parameters are null";
assert definedTypes.length == values.length : "Invalid array lengths";
if (parameterTypes.length != values.length)
@@ -578,7 +579,9 @@
public int hashCode()
{
final int factor = 31;
- int result = 17;
+ final int seed = 17;
+
+ int result = seed;
result = result * factor + methodName.hashCode();
result = result * factor + Arrays.hashCode(parameterTypes);
return result;
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/BeanContextWrapper.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/BeanContextWrapper.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/BeanContextWrapper.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -231,6 +231,7 @@
* Returns the bean with the given class starting the search with the
* default bean store. This implementation delegates to the wrapped context.
*
+ * @param <T> the type of the bean
* @param beanCls the class of the desired bean
* @return the bean
*/
@@ -244,6 +245,7 @@
* specified bean store. This implementation delegates to the wrapped
* context.
*
+ * @param <T> the type of the bean
* @param beanCls the class of the desired bean
* @param store the store to start with
* @return the bean
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ChainedInvocation.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ChainedInvocation.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ChainedInvocation.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -42,7 +42,7 @@
* bloc. In addition to that a rudimentary support for variables is available:
* the result of an invocation can be assigned to a named variable; later this
* variable can be accessed again using a special
- * <code>{@link Dependency}</code>, which can be created by calling the
+ * {@link Dependency}, which can be created by calling the
* <code>getChainDependency()</code> method.
* </p>
* <p>
@@ -313,6 +313,7 @@
*
* @param depProvider the dependency provider
* @param target the target object
+ * @return the result of the invocation
* @throws InjectionException if an error occurs
* @throws IllegalArgumentException if the dependency provider is <b>null</b>
* or a required target object is undefined
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ClassDependency.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ClassDependency.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ClassDependency.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -31,7 +31,7 @@
* @author Oliver Heger
* @version $Id$
*/
-public class ClassDependency implements Dependency
+public final class ClassDependency implements Dependency
{
/** Stores the class description of this dependency. */
private ClassDescription dependentClass;
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ClassDescription.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ClassDescription.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ClassDescription.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -16,9 +16,7 @@
package net.sf.jguiraffe.di.impl;
-import net.sf.jguiraffe.di.BeanContext;
import net.sf.jguiraffe.di.ClassLoaderProvider;
-import net.sf.jguiraffe.di.InjectionException;
/**
* <p>
@@ -35,7 +33,7 @@
* a default class loader</li>
* <li>by providing a class name and a symbolic name for a class loader; this
* works together with the class loader registration mechanism supported by
- * {@link BeanContext}</li>
+ * {@link net.sf.jguiraffe.di.BeanContext BeanContext}</li>
* </ul>
* </p>
* <p>
@@ -77,14 +75,15 @@
}
/**
- * Returns the target class of this description. The passed in {@code
- * ClassLoaderProvider} is used for resolving the class if necessary. This
- * implementation will cache the <code>Class</code> objects when they have
- * been resolved.
+ * Returns the target class of this description. The passed in
+ * {@code ClassLoaderProvider} is used for resolving the class if necessary.
+ * This implementation will cache the <code>Class</code> objects when they
+ * have been resolved.
*
* @param clProvider the {@code ClassLoaderProvider}
* @return the target class of this description instance
- * @throws InjectionException if the class cannot be resolved
+ * @throws net.sf.jguiraffe.di.InjectionException if the class cannot be
+ * resolved
* @throws IllegalArgumentException if the {@code ClassLoaderProvider} is
* needed, but is <b>null</b>
*/
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ConstructorInvocation.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ConstructorInvocation.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/ConstructorInvocation.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -18,8 +18,6 @@
import net.sf.jguiraffe.di.Dependency;
import net.sf.jguiraffe.di.DependencyProvider;
-import net.sf.jguiraffe.di.InjectionException;
-import net.sf.jguiraffe.di.InvocationHelper;
/**
* <p>
@@ -34,8 +32,9 @@
* can contain constant values that will be directly passed to the constructor.
* If the constructor's signature is known, the types of its arguments can be
* defined. If this is not the case, the parameter types will be derived from
- * the current parameter values. The {@link InvocationHelper} class is used to
- * find the correct constructor to be invoked.
+ * the current parameter values. The
+ * {@link net.sf.jguiraffe.di.InvocationHelper InvocationHelper} class is used
+ * to find the correct constructor to be invoked.
* </p>
* <p>
* Objects of this class cannot be changed after they have been created. So they
@@ -87,7 +86,7 @@
*
* @param depProvider the dependency provider (must not be <b>null</b>)
* @return the newly created instance of the target class
- * @throws InjectionException if an error occurs
+ * @throws net.sf.jguiraffe.di.InjectionException if an error occurs
* @throws IllegalArgumentException if the dependency provider is <b>null</b>
*/
public Object invoke(DependencyProvider depProvider)
@@ -107,7 +106,7 @@
* @param depProvider the dependency provider (must not be <b>null</b>)
* @param target the target of the invocation
* @return the result of the invocation
- * @throws InjectionException if an error occurs
+ * @throws net.sf.jguiraffe.di.InjectionException if an error occurs
* @throws IllegalArgumentException if the dependency provider is
* <b>null</b>
*/
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultBeanContext.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultBeanContext.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultBeanContext.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -54,7 +54,7 @@
public class DefaultBeanContext implements BeanContext
{
/** A counter for generating transaction IDs. */
- private static final AtomicLong txCounter = new AtomicLong();
+ private static final AtomicLong TX_COUNTER = new AtomicLong();
/** Stores the default bean store. */
private volatile BeanStore defaultBeanStore;
@@ -183,7 +183,7 @@
* Tests whether a bean with the given name can be found in the default
* store.
*
- * @param the name of the bean
+ * @param name the name of the bean
* @return a flag whether this bean can be found
*/
public boolean containsBean(String name)
@@ -265,6 +265,7 @@
/**
* Returns the bean with the specified class from the default bean store.
*
+ * @param <T> the type of the bean to be retrieved
* @param beanCls the class of the bean to be retrieved
* @return the bean with this class
* @throws InjectionException if an error occurs
@@ -277,6 +278,7 @@
/**
* Returns the bean with the specified class from the given bean store.
*
+ * @param <T> the type of the bean to be retrieved
* @param beanCls the class of the bean to be retrieved
* @param store the bean store
* @return the bean with this class
@@ -469,7 +471,7 @@
*/
static Long nextTxID()
{
- return txCounter.incrementAndGet();
+ return TX_COUNTER.incrementAndGet();
}
/**
@@ -478,7 +480,7 @@
*/
static void resetTxID()
{
- txCounter.set(0);
+ TX_COUNTER.set(0);
}
/**
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultClassLoaderProvider.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultClassLoaderProvider.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultClassLoaderProvider.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -75,7 +75,7 @@
* name is <b>null</b>, the context class loader, and a registered class
* loader.
*
- * @param loaderRef the name of the class loader
+ * @param name the name of the class loader
* @return the corresponding class loader
* @throws InjectionException if the class loader cannot be resolved
*/
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultDependencyProvider.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultDependencyProvider.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/DefaultDependencyProvider.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -206,8 +206,8 @@
if (result == null)
{
throw new InjectionException(
- "Invalid dependency! This dependency does not belong to the current transaction: "
- + dependency);
+ "Invalid dependency! This dependency does not belong to "
+ + "the current transaction: " + dependency);
}
return result;
}
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/Invocation.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/Invocation.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/Invocation.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -21,7 +21,6 @@
import net.sf.jguiraffe.di.Dependency;
import net.sf.jguiraffe.di.DependencyProvider;
-import net.sf.jguiraffe.di.InjectionException;
/**
* <p>
@@ -31,8 +30,8 @@
* This class allows the definition of important data that is required for
* invoking a method using reflection. Especially the parameter types and the
* parameter values can be specified. The parameter values are provided as
- * <code>{@link Dependency}</code> objects, so they can refer to other beans
- * defined in a <code>BeanStore</code>.
+ * {@link Dependency} objects, so they can refer to other beans defined in a
+ * <code>BeanStore</code>.
* </p>
* <p>
* The main use case for <code>Invocation</code> objects is the creation and
@@ -162,9 +161,10 @@
*
* @param depProvider the dependency provider (must not be <b>null</b>)
* @return an array with the resolved parameter values (can be <b>null</b>)
- * @throws InjectionException if a dependency cannot be resolved
+ * @throws net.sf.jguiraffe.di.InjectionException if a dependency cannot be
+ * resolved
* @throws IllegalArgumentException if the passed in dependency provider is
- * <b>null</b>
+ * <b>null</b>
*/
public Object[] getResolvedParameters(DependencyProvider depProvider)
{
@@ -189,12 +189,13 @@
/**
* Returns an array with the concrete parameter classes. This method
- * converts the internally stored <code>ClassDescription</code> objects
- * into <code>Class</code> objects.
+ * converts the internally stored <code>ClassDescription</code> objects into
+ * <code>Class</code> objects.
*
* @param depProvider the dependency provider for resolving the classes
* @return an array with the parameter classes
- * @throws InjectionException if a class cannot be resolved
+ * @throws net.sf.jguiraffe.di.InjectionException if a class cannot be
+ * resolved
*/
public Class<?>[] getParameterClasses(DependencyProvider depProvider)
{
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/MethodInvocation.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/MethodInvocation.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/MethodInvocation.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -180,13 +180,17 @@
}
Object[] values = getResolvedParameters(depProvider);
- if(isStaticInvocation() || target == null)
+ if (isStaticInvocation() || target == null)
{
- return depProvider.getInvocationHelper().invokeStaticMethod(getTargetClass().getTargetClass(depProvider), getMethodName(), getParameterClasses(depProvider), values);
+ return depProvider.getInvocationHelper().invokeStaticMethod(
+ getTargetClass().getTargetClass(depProvider),
+ getMethodName(), getParameterClasses(depProvider), values);
}
else
{
- return depProvider.getInvocationHelper().invokeInstanceMethod(target, getMethodName(), getParameterClasses(depProvider), values);
+ return depProvider.getInvocationHelper().invokeInstanceMethod(
+ target, getMethodName(), getParameterClasses(depProvider),
+ values);
}
}
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/NameDependency.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/NameDependency.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/NameDependency.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -31,7 +31,7 @@
* @author Oliver Heger
* @version $Id$
*/
-public class NameDependency implements Dependency
+public final class NameDependency implements Dependency
{
/** Stores the name of the dependent bean. */
private String name;
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/SetPropertyInvocation.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/SetPropertyInvocation.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/SetPropertyInvocation.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -19,7 +19,6 @@
import net.sf.jguiraffe.di.Dependency;
import net.sf.jguiraffe.di.DependencyProvider;
import net.sf.jguiraffe.di.InjectionException;
-import net.sf.jguiraffe.di.InvocationHelper;
/**
* <p>
@@ -27,17 +26,17 @@
* </p>
* <p>
* This <code>Invocation</code> implementation is initialized with a property
- * name and value (the latter one is provided as a
- * {@link Dependency} object. In its <code>invoke()</code>
- * method it will set this property on the target object.
+ * name and value (the latter one is provided as a {@link Dependency} object. In
+ * its <code>invoke()</code> method it will set this property on the target
+ * object.
* </p>
* <p>
* This is more or less a convenience class because similar results could be
- * achieved by using {@link MethodInvocation} and specifying the
- * name of the set method corresponding to the property and the property value
- * as parameter dependency. Setting the property is done using the
- * {@link InvocationHelper} class. This ensures that required type conversions
- * are done automatically.
+ * achieved by using {@link MethodInvocation} and specifying the name of the set
+ * method corresponding to the property and the property value as parameter
+ * dependency. Setting the property is done using the
+ * {@link net.sf.jguiraffe.di.InvocationHelper InvocationHelper} class. This
+ * ensures that required type conversions are done automatically.
* </p>
* <p>
* Once initialized, an instance is immutable. So it can easily be shared
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/ConstantBeanProvider.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/ConstantBeanProvider.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/ConstantBeanProvider.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -59,7 +59,7 @@
* @author Oliver Heger
* @version $Id$
*/
-public class ConstantBeanProvider extends SimpleBeanProvider implements
+public final class ConstantBeanProvider extends SimpleBeanProvider implements
BeanProvider, Dependency
{
/** Constant for a dependency that will be resolved to <b>null</b>. */
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/ConstructorBeanProvider.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/ConstructorBeanProvider.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/ConstructorBeanProvider.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -21,7 +21,6 @@
import net.sf.jguiraffe.di.Dependency;
import net.sf.jguiraffe.di.DependencyProvider;
-import net.sf.jguiraffe.di.InjectionException;
import net.sf.jguiraffe.di.impl.ConstructorInvocation;
/**
@@ -31,7 +30,7 @@
* </p>
* <p>
* This <code>BeanProvider</code> class is initialized with a
- * <code>{@link ConstructorInvocation}</code> object. The
+ * {@link ConstructorInvocation} object. The
* <code>getBean()</code> method will trigger this invocation object and
* return the newly created instance.
* </p>
@@ -92,7 +91,8 @@
*
* @param dependencyProvider the dependency provider
* @return the newly created bean instance
- * @throws InjectionException if an error occurs when creating the bean
+ * @throws net.sf.jguiraffe.di.InjectionException if an error occurs when
+ * creating the bean
*/
public Object getBean(DependencyProvider dependencyProvider)
{
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/LifeCycleBeanProvider.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/LifeCycleBeanProvider.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/LifeCycleBeanProvider.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -317,7 +317,8 @@
if (!initializing)
{
// no reentrant call
- creating = initializing = true;
+ creating = true;
+ initializing = true;
boolean canInit = true;
try
{
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/MapBeanProvider.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/MapBeanProvider.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/MapBeanProvider.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -38,8 +38,8 @@
* With this bean provider implementation either a
* <code>java.util.HashMap</code> or a <code>java.util.LinkedHashMap</code> can
* be created and populated. The mechanisms used here are very similar to the
- * ones used by <code>{@link CollectionBeanProvider}</code>: an instance is
- * initialized with two lists of <code>{@link Dependency}</code> objects - one
+ * ones used by {@link CollectionBeanProvider}: an instance is
+ * initialized with two lists of {@link Dependency} objects - one
* list represents the key, the other list represents the values of the map. The
* <code>getDependencies()</code> method returns a union of all these
* dependencies. When the <code>Map</code> bean is to be created, a new instance
@@ -49,7 +49,7 @@
* </p>
* <p>
* Bean providers of this type are intended to be used together with a
- * <code>{@link LifeCycleBeanProvider}</code> that controls the creation of new
+ * {@link LifeCycleBeanProvider} that controls the creation of new
* instances.
* </p>
* <p>
@@ -146,6 +146,7 @@
* keys and values are resolved and added to the map.
*
* @param dependencyProvider the dependency provider
+ * @return the managed bean
*/
public Object getBean(DependencyProvider dependencyProvider)
{
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/MethodInvocationBeanProvider.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/MethodInvocationBeanProvider.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/MethodInvocationBeanProvider.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -31,11 +31,10 @@
* </p>
* <p>
* This <code>BeanProvider</code> implementation is initialized with a
- * <code>{@link MethodInvocation}</code> object describing the method to be
- * invoked. Optional a <code>{@link Dependency}</code> can be provided for the
- * instance, on which the method is to be invoked (if no such dependency is
- * specified, the method to be invoked must be static). This class is intended
- * for the following use cases:
+ * {@link MethodInvocation} object describing the method to be invoked. Optional
+ * a {@link Dependency} can be provided for the instance, on which the method is
+ * to be invoked (if no such dependency is specified, the method to be invoked
+ * must be static). This class is intended for the following use cases:
* <ul>
* <li>It can be used for obtaining instances that are not created using a
* constructor, but by invoking a static factory method. In this case the passed
@@ -44,8 +43,8 @@
* <li>Another use case is the handling of <em>factory classes</em>: Some
* objects are not directly created, but a method on a specific factory class is
* used for this purpose. An example could be a <code>Connection</code> object
- * that is obtained from a <code>DataSource</code>. In this case the factory
- * is defined as a separate bean, and a dependency to this bean is specified to
+ * that is obtained from a <code>DataSource</code>. In this case the factory is
+ * defined as a separate bean, and a dependency to this bean is specified to
* this bean provider class. The <code>MethodInvocation</code> defines the
* method of this factory bean that has to be called for obtaining an instance.</li>
* </ul>
@@ -53,8 +52,8 @@
* <p>
* As is true for other <code>SimpleBeanProvider</code>s, this provider is
* intended to be used together with a life-cycle-aware
- * <code>BeanProvider</code>. It does not provide any life-cycle support on
- * its own.
+ * <code>BeanProvider</code>. It does not provide any life-cycle support on its
+ * own.
* </p>
*
* @author Oliver Heger
@@ -158,14 +157,13 @@
* Returns the description of the class of the managed bean. If a class
* description was explicitly set in the constructor, this description is
* returned. Otherwise this implementation tries to obtain the bean class
- * from the <code>{@link MethodInvocation}</code> object owned by this
- * provider. Because a class is optional for a method invocation, result can
- * be <b>null</b>. To avoid this, a valid
- * <code>{@link ClassDescription}</code> should always be set either on
- * the <code>MethodInvocation</code> or when an instance of this class is
- * constructed.
+ * from the {@link MethodInvocation} object owned by this provider. Because
+ * a class is optional for a method invocation, result can be <b>null</b>.
+ * To avoid this, a valid {@link ClassDescription} should always be set
+ * either on the <code>MethodInvocation</code> or when an instance of this
+ * class is constructed.
*
- * @return
+ * @return a class description of the managed bean
*/
public ClassDescription getBeanClassDescription()
{
Modified: trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/SingletonBeanProvider.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/SingletonBeanProvider.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/di/impl/providers/SingletonBeanProvider.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -21,7 +21,6 @@
import net.sf.jguiraffe.di.BeanProvider;
import net.sf.jguiraffe.di.Dependency;
import net.sf.jguiraffe.di.DependencyProvider;
-import net.sf.jguiraffe.di.InjectionException;
import net.sf.jguiraffe.di.impl.Invokable;
import net.sf.jguiraffe.di.impl.NullInvocation;
@@ -64,7 +63,7 @@
*
* @param createProvider the bean provider used for creating a new bean
* instance (must not be <b>null</b>)
- * @param initinv the (optional) invocation object for performing
+ * @param initInv the (optional) invocation object for performing
* initialization
* @param shutdownInv the (optional) {@code Invokable} object to be called
* on shutdown
@@ -125,7 +124,7 @@
*
* @param dependencyProvider the dependency provider
* @return the bean managed by this provider
- * @throws InjectionException if an error occurs
+ * @throws net.sf.jguiraffe.di.InjectionException if an error occurs
*/
public Object getBean(DependencyProvider dependencyProvider)
{
Modified: trunk/core/src/main/java/net/sf/jguiraffe/gui/app/Application.java
===================================================================
--- trunk/core/src/main/java/net/sf/jguiraffe/gui/app/Application.java 2010-08-26 18:43:51 UTC (rev 194)
+++ trunk/core/src/main/java/net/sf/jguiraffe/gui/app/Application.java 2010-08-30 19:54:41 UTC (rev 195)
@@ -28,7 +28,6 @@
import net.sf.jguiraffe.di.BeanContext;
import net.sf.jguiraffe.di.ClassLoaderProvider;
-import net.sf.jguiraffe.di.InjectionException;
import net.sf.jguiraffe.di.MutableBeanStore;
import net.sf.jguiraffe.di.impl.DefaultBeanContext;
import net.sf.jguiraffe.di.impl.DefaultBeanStore;
@@ -95,8 +94,7 @@
* <p>
* A bunch of configuration properties is evaluated by this class to perform the
* correct setup. All of these must be placed in a section called
- * <code>framework</code>. The following table lists the available
- * properties:
+ * <code>framework</code>. The following table lists the available properties:
* </p>
* <p>
* <table border="1">
@@ -110,8 +108,8 @@
* <td>In this section some properties of the application context are defined:
* <dl>
* <dt><code>locale</code></dt>
- * <dd>Here the locale to be set at startup can be specified. If the property
- * is missing, the system's default locale will be used.</dd>
+ * <dd>Here the locale to be set at startup can be specified. If the property is
+ * missing, the system's default locale will be used.</dd>
* <dt><code>defaultResourceGroup</code></dt>
* <dd>Allows to define a default resource group that is used by the resource
* manager when no specific resource group is specified.</dd>
@@ -127,14 +125,14 @@
* The following sub elements are supported:
* <dl>
* <dt><code>beanBuilderFactory</code></dt>
- * <dd>Specifies the full qualified name of the
- * <code>{@link BeanBuilderFactory}</code> implementation that is used to
- * obtain bean builder instances. Here the implementation class and additional
- * initialization properties can be specified.</dd>
+ * <dd>Specifies the full qualified name of the {@link BeanBuilderFactory}
+ * implementation that is used to obtain bean builder instances. Here the
+ * implementation class and additional initialization properties can be
+ * specified.</dd>
* <dt><code>beandefinitions</code></dt>
* <dd>In this subsection an arbitrary number of <code>beandefinition</code>
- * elements can be specified. Each <code>beandefinition</code> element points
- * to a script with bean definitions. These scripts will be processed by the
+ * elements can be specified. Each <code>beandefinition</code> element points to
+ * a script with bean definitions. These scripts will be processed by the
* default bean builder.</dd>
* <dt><code>menuIcon</code></dt>
* <dd>An optional boolean flag that determines whether menu items should be
@@ -147,8 +145,7 @@
* <dt><code>mainScript</code></dt>
* <dd>With this property the name of the main builder script can be specified.
* If defined, the script will be executed using the application's builder. If
- * this results in a window, this window will be displayed.</dd>
- * </td>
+ * this results in a window, this window will be displayed.</dd></td>
* <td valign="top">Yes</td>
* </tr>
* <tr>
@@ -166,8 +163,7 @@
* <dt><code>width</code></dt>
* <dd>Defines the width position of the main window.</dd>
* <dt><code>height</code></dt>
- * <dd>Defines the height position of the main window.</dd>
- * </td>
+ * <dd>Defines the height position of the main window.</dd></td>
* <td valign="top">Yes</td>
* </tr>
* <tr>
@@ -193,11 +189,12 @@
* bean definitions. Here many helper classes used by the application are
* defined (e.g. the resource manager, the message output object, the GUI
* builder, and many more). At start up, the application creates a
- * <code>{@link BeanContext}</code> that provides access to these beans and
- * creates the required instances. There is a default bean definition file (<em>defaultbeans.jelly</em>)
- * with default bean definitions for all available helper classes. It is loaded
- * first. Concrete applications can override some or all of these beans. This is
- * a powerful means of customizing the application.
+ * {@link BeanContext} that provides access to these beans and creates the
+ * required instances. There is a default bean definition file (
+ * <em>defaultbeans.jelly</em>) with default bean definitions for all available
+ * helper classes. It is loaded first. Concrete applications can override some
+ * or all of these beans. This is a powerful means of customizing the
+ * application.
* </p>
* <p>
* To override bean definitions, use the
@@ -206,9 +203,8 @@
* arbitrary number of bean definition files can be specified (the files will be
* loaded from the class path). Using the predefined names for the default beans
* in these scripts causes the beans to be replaced by the custom ones. Have a
- * look at the <em>defaultbeans.jelly</em> script for more information; in
- * this file all available default beans are listed with a documentation for
- * each.
+ * look at the <em>defaultbeans.jelly</em> script for more information; in this
+ * file all available default beans are listed with a documentation for each.
* </p>
*
* @author Oliver Heger
@@ -697,10 +693,10 @@
* configuration file. Then this file is loaded with commons-configuration.
*
* @return the configuration to use
- * @throws ApplicationException if the configuration file cannot be located
+ * @throws ApplicationRuntimeException if the configuration file cannot be
+ * located
*/
protected HierarchicalConfiguration createConfiguration()
- throws ApplicationRuntimeException
{
return createConfiguration(fetchConfigURL());
}
@@ -1059,7 +1055,8 @@
*
* @param appCtx the application context
* @return the new command queue
- * @throws InjectionException if the command queue cannot be created
+ * @throws net.sf.jguiraffe.di.InjectionException if the command queue
+ * cannot be created
*/
protected CommandQueue createCommandQueue(ApplicationContext appCtx)
{
@@ -1154,7 +1151,8 @@
if (titleres != null && getCommandQueue().isPending())
{
if (getApplicationContext().messageBox(msgres, titleres,
- MessageOutput.MESSAGE_QUESTION, MessageOutput.BTN_YES_NO) != MessageOutput.RET_YE...
[truncated message content] |
