branch develop updated (37c7ef8 -> d2cebf3)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from 37c7ef8 [iso] clean code + use some java 7-8 api new d2cebf3 [iso] clean code + use some java 7-8 api (part 2) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d2cebf3a8e176a4675dd5299e87349a86047bd5d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 30 12:28:04 2016 +0100 [iso] clean code + use some java 7-8 api (part 2) Summary of changes: .../JavaBeanObjectPropagateChangeListener.java | 4 +- .../jaxx/application/bean/JavaBeanObjectUtil.java | 7 +- .../listener/PropagatePropertyChangeListener.java | 6 +- .../swing/AbstractApplicationFormUIModel.java | 30 ++-- .../swing/AbstractApplicationUIHandler.java | 53 +++---- .../jaxx/application/swing/ApplicationUI.java | 28 ++-- .../swing/action/AbstractApplicationAction.java | 4 +- .../swing/action/ApplicationActionSwingWorker.java | 40 ++---- .../swing/action/ApplicationActionUIHandler.java | 127 ++++++++-------- .../swing/action/ApplicationUIAction.java | 57 +++----- .../jaxx/application/swing/tab/CustomTab.java | 18 +-- .../swing/table/AbstractApplicationTableModel.java | 8 +- .../swing/util/ApplicationColorHighlighter.java | 4 +- .../swing/util/ApplicationErrorHelper.java | 2 +- .../java/org/nuiton/jaxx/compiler/ClassMap.java | 2 +- .../org/nuiton/jaxx/compiler/CompiledObject.java | 16 +-- .../org/nuiton/jaxx/compiler/EventHandler.java | 12 +- .../org/nuiton/jaxx/compiler/JAXXCompiler.java | 42 +++--- .../java/org/nuiton/jaxx/compiler/JAXXProfile.java | 17 ++- .../java/org/nuiton/jaxx/compiler/SymbolTable.java | 6 +- .../nuiton/jaxx/compiler/beans/JAXXBeanInfo.java | 6 +- .../compiler/beans/JAXXEventSetDescriptor.java | 6 +- .../jaxx/compiler/beans/JAXXIntrospector.java | 14 +- .../nuiton/jaxx/compiler/binding/DataBinding.java | 8 +- .../nuiton/jaxx/compiler/css/parser/CSSParser.java | 15 +- .../compiler/css/parser/JJTCSSParserState.java | 4 +- .../org/nuiton/jaxx/compiler/css/parser/Node.java | 14 +- .../jaxx/compiler/css/parser/SimpleNode.java | 2 +- .../HelpRootCompiledObjectDecorator.java | 2 +- .../compiler/finalizers/ValidatorFinalizer.java | 2 +- .../nuiton/jaxx/compiler/java/JavaArgument.java | 2 +- .../nuiton/jaxx/compiler/java/JavaConstructor.java | 6 +- .../org/nuiton/jaxx/compiler/java/JavaField.java | 6 +- .../org/nuiton/jaxx/compiler/java/JavaFile.java | 6 +- .../org/nuiton/jaxx/compiler/java/JavaMethod.java | 8 +- .../compiler/java/parser/JJTJavaParserState.java | 4 +- .../jaxx/compiler/java/parser/JavaParser.java | 100 +------------ .../java/parser/JavaParserTokenManager.java | 2 +- .../jaxx/compiler/java/parser/ParseException.java | 4 +- .../jaxx/compiler/java/parser/SimpleNode.java | 2 +- .../jaxx/compiler/reflect/ClassDescriptor.java | 26 ++-- .../compiler/reflect/ClassDescriptorHelper.java | 4 +- .../compiler/reflect/ClassDescriptorResolver.java | 2 +- .../jaxx/compiler/reflect/FieldDescriptor.java | 4 +- .../jaxx/compiler/reflect/MemberDescriptor.java | 6 +- .../jaxx/compiler/reflect/MethodDescriptor.java | 4 +- .../ClassDescriptorResolverFromJavaFile.java | 12 +- .../nuiton/jaxx/compiler/script/ScriptManager.java | 2 +- .../jaxx/compiler/tags/DefaultObjectHandler.java | 10 +- .../org/nuiton/jaxx/compiler/tags/TagManager.java | 22 +-- .../compiler/tags/swing/CompiledItemContainer.java | 2 +- .../jaxx/compiler/tags/swing/ItemHandler.java | 2 +- .../jaxx/compiler/tags/swing/JSpinnerHandler.java | 6 +- .../jaxx/compiler/tags/swing/TableHandler.java | 4 +- .../tags/validator/BeanValidatorHandler.java | 10 +- .../validator/ExcludeFieldValidatorHandler.java | 2 +- .../tags/validator/FieldValidatorHandler.java | 2 +- .../tools/jaxxcapture/AbstractContextNode.java | 2 +- .../compiler/tools/jaxxcapture/CapturedObject.java | 16 +-- .../compiler/tools/jaxxcapture/JAXXCapture.java | 8 +- .../compiler/tools/jaxxcapture/LiteralNode.java | 4 +- .../compiler/tools/jaxxcapture/MethodNode.java | 2 +- .../compiler/tools/jaxxcapture/PropertyNode.java | 2 +- .../jaxx/compiler/tools/jaxxcapture/ValueNode.java | 2 +- .../jaxx/compiler/binding/JavaParserUtilTest.java | 6 +- .../jaxx/config/ConfigCallBackUIHandler.java | 24 ++-- .../org/nuiton/jaxx/config/ConfigTableEditor.java | 2 +- .../org/nuiton/jaxx/config/ConfigUIHandler.java | 11 +- .../nuiton/jaxx/config/model/CallBackEntry.java | 2 +- .../nuiton/jaxx/config/model/CallBacksManager.java | 2 +- .../nuiton/jaxx/config/model/CategoryModel.java | 8 +- .../nuiton/jaxx/config/model/ConfigTableModel.java | 10 +- .../nuiton/jaxx/config/model/ConfigUIModel.java | 2 +- .../nuiton/jaxx/config/model/MyDelegateConfig.java | 23 ++- .../jaxx/config/model/MyDelegateConfigTest.java | 12 +- .../jaxx/config/model/MyInheritedConfig.java | 21 ++- .../jaxx/config/model/MyInheritedConfigTest.java | 12 +- .../org/nuiton/jaxx/demo/DemoSourcesHandler.java | 10 +- .../java/org/nuiton/jaxx/demo/DemoUIHandler.java | 152 +++++++++----------- .../main/java/org/nuiton/jaxx/demo/RunDemo.java | 2 +- .../jaxx/editor/BeanDoubleListDemoHandler.java | 22 +-- .../jaxx/editor/gis/CoordinateDemoHandler.java | 57 +++----- .../jaxx/demo/entities/DemoDataProvider.java | 4 +- .../jaxx/demo/feature/nav/NavDemoHandler.java | 73 ++++------ .../feature/nav/tree/ActorsTreeNodeLoador.java | 2 +- .../feature/nav/tree/MoviesTreeNodeLoador.java | 4 +- .../feature/nav/tree/NavDemoTreeCellRenderer.java | 2 +- .../nav/treetable/ActorsTreeTableNodeLoador.java | 2 +- .../nav/treetable/MoviesTreeTableNodeLoador.java | 4 +- .../nav/treetable/NavDemoTreeTableModel.java | 2 +- .../list/ListBeanValidationDemoHandler.java | 2 +- .../feature/validation/list/PeopleTableModel.java | 9 +- .../org/nuiton/jaxx/demo/fun/CalculatorEngine.java | 4 +- .../nuiton/jaxx/demo/tree/DemoDataProvider.java | 2 +- .../org/nuiton/jaxx/demo/tree/DemoNodeLoador.java | 5 +- .../java/org/nuiton/jaxx/plugin/CompilerTest.java | 5 +- .../nuiton/jaxx/plugin/DataBinding/BeanImpl.java | 2 +- .../java/org/nuiton/jaxx/plugin/JaxxBaseTest.java | 4 +- .../validator/ok/Identity.java | 2 +- .../compilerValidatorTest/validator/ok/Model.java | 2 +- .../java/org/nuiton/jaxx/runtime/Base64Coder.java | 4 +- .../nuiton/jaxx/runtime/ComponentDescriptor.java | 8 +- .../nuiton/jaxx/runtime/DataBindingListener.java | 4 +- .../jaxx/runtime/DataBindingUpdateListener.java | 4 +- .../org/nuiton/jaxx/runtime/FileChooserUtil.java | 4 +- .../nuiton/jaxx/runtime/JAXXObjectDescriptor.java | 4 +- .../java/org/nuiton/jaxx/runtime/JAXXUtil.java | 98 ++++++------- .../org/nuiton/jaxx/runtime/JaxxFileChooser.java | 10 +- .../java/org/nuiton/jaxx/runtime/SwingUtil.java | 159 ++++++++------------- .../awt/visitor/GetCompopentAtPointVisitor.java | 4 +- .../nuiton/jaxx/runtime/context/DataContext.java | 32 +---- .../runtime/context/DefaultApplicationContext.java | 30 +--- .../org/nuiton/jaxx/runtime/css/DataBinding.java | 2 +- .../org/nuiton/jaxx/runtime/css/Pseudoclasses.java | 6 +- .../java/org/nuiton/jaxx/runtime/css/Rule.java | 4 +- .../java/org/nuiton/jaxx/runtime/css/Selector.java | 10 +- .../org/nuiton/jaxx/runtime/swing/Application.java | 8 +- .../org/nuiton/jaxx/runtime/swing/CardLayout2.java | 4 +- .../nuiton/jaxx/runtime/swing/CardLayout2Ext.java | 6 +- .../jaxx/runtime/swing/ComponentResizer.java | 4 +- .../java/org/nuiton/jaxx/runtime/swing/Item.java | 2 +- .../nuiton/jaxx/runtime/swing/JAXXButtonGroup.java | 4 +- .../nuiton/jaxx/runtime/swing/JAXXComboBox.java | 113 +++++++-------- .../org/nuiton/jaxx/runtime/swing/JAXXList.java | 123 ++++++---------- .../org/nuiton/jaxx/runtime/swing/JAXXTree.java | 35 ++--- .../runtime/swing/OneClicListSelectionModel.java | 4 +- .../org/nuiton/jaxx/runtime/swing/TabInfo.java | 22 +-- .../swing/TabInfoPropertyChangeListener.java | 4 +- .../java/org/nuiton/jaxx/runtime/swing/Table.java | 2 +- .../runtime/swing/application/ActionExecutor.java | 140 +++++++++--------- .../swing/application/ApplicationRunner.java | 41 +++--- .../runtime/swing/editor/BooleanCellEditor.java | 6 +- .../jaxx/runtime/swing/editor/ColorCellEditor.java | 6 +- .../jaxx/runtime/swing/help/JAXXHelpBroker.java | 2 +- .../model/AbstractGenericListSelectionModel.java | 2 +- .../jaxx/runtime/swing/model/GenericListEvent.java | 2 +- .../swing/model/GenericListSelectionModel.java | 2 +- .../runtime/swing/model/JaxxDefaultListModel.java | 2 +- .../swing/model/JaxxFilterableComboBoxModel.java | 4 +- .../swing/model/JaxxFilterableListModel.java | 4 +- .../model/WillChangeSelectedItemListener.java | 2 +- .../model/WillChangeSelectedItemVetoException.java | 2 +- .../nuiton/jaxx/runtime/swing/nav/NavHelper.java | 91 ++++++------ .../jaxx/runtime/swing/nav/NavNodeChildLoador.java | 2 +- .../swing/nav/treetable/NavTreeTableModel.java | 2 +- .../swing/renderer/BooleanCellRenderer.java | 7 +- .../runtime/swing/renderer/ColorCellRenderer.java | 2 +- .../swing/renderer/DecoratorListCellRenderer.java | 4 +- .../DecoratorProviderListCellRenderer.java | 4 +- .../DecoratorProviderTableCellRenderer.java | 4 +- .../swing/renderer/DecoratorTableCellRenderer.java | 4 +- .../renderer/EmptyNumberTableCellRenderer.java | 2 +- .../swing/renderer/EnumTableCellRenderer.java | 4 +- .../swing/renderer/I18nTableCellRenderer.java | 2 +- .../renderer/MultiDecoratorListCellRenderer.java | 4 +- .../renderer/MultiDecoratorTableCelleRenderer.java | 4 +- .../jaxx/runtime/swing/session/SwingSession.java | 24 ++-- .../jaxx/runtime/swing/wizard/WizardUILancher.java | 56 +++----- .../jaxx/runtime/swing/wizard/WizardUtil.java | 149 ++++++++----------- .../runtime/swing/wizard/ext/WizardExtModel.java | 4 +- .../runtime/swing/wizard/ext/WizardExtUtil.java | 82 +++++------ .../context/DefaultApplicationContextTest.java | 12 +- .../SimpleBeanValidatorMessageTableModel.java | 6 +- .../validator/swing/SwingListValidatorMessage.java | 2 +- .../swing/SwingListValidatorMessageTableModel.java | 6 +- ...wingListValidatorMessageTableMouseListener.java | 4 +- .../swing/SwingListValidatorMessageWidget.java | 97 ++++++------- ...SwingListValidatorTableEditorModelListener.java | 2 +- .../validator/swing/SwingValidatorMessage.java | 2 +- .../swing/SwingValidatorMessageListModel.java | 6 +- .../SwingValidatorMessageListMouseListener.java | 2 +- .../swing/SwingValidatorMessageListRenderer.java | 2 +- .../swing/SwingValidatorMessageTableModel.java | 6 +- .../SwingValidatorMessageTableMouseListener.java | 4 +- .../swing/SwingValidatorMessageWidget.java | 97 ++++++------- .../jaxx/validator/swing/SwingValidatorUtil.java | 16 +-- .../jaxx/validator/swing/ui/IconValidationUI.java | 2 +- .../jaxx/validator/swing/ui/ImageValidationUI.java | 2 +- .../swing/unified/UnifiedValidatorMessage.java | 2 +- .../unified/UnifiedValidatorMessageTableModel.java | 120 ++++++++-------- .../UnifiedValidatorMessageTableMouseListener.java | 2 +- .../unified/UnifiedValidatorMessageWidget.java | 97 ++++++------- .../nuiton/jaxx/widgets/about/AboutUIBuilder.java | 17 +-- .../jaxx/widgets/datetime/DateTimeEditorModel.java | 9 +- .../jaxx/widgets/datetime/TimeEditorModel.java | 9 +- .../widgets/datetime/TimeSliderInitializer.java | 33 ++--- .../org/nuiton/jaxx/widgets/extra/AboutFrame.java | 8 +- .../nuiton/jaxx/widgets/extra/GridFlowLayout.java | 2 +- .../org/nuiton/jaxx/widgets/extra/IconFactory.java | 4 +- .../widgets/extra/JComboBoxAutoCompletionKit.java | 4 +- .../nuiton/jaxx/widgets/extra/SplashScreen.java | 10 +- .../org/nuiton/jaxx/widgets/extra/WidgetUtil.java | 2 +- .../nuiton/jaxx/widgets/extra/XMLGridLayout.java | 2 +- .../widgets/extra/XMLGridParseConstraints.java | 4 +- .../widgets/extra/datatips/DataTipComponent.java | 8 +- .../widgets/extra/datatips/DataTipListener.java | 10 +- .../widgets/extra/datatips/DataTipManager.java | 6 +- .../jaxx/widgets/extra/datatips/DataTipPopup.java | 2 +- .../jaxx/widgets/extra/editor/DefaultEditor.java | 6 +- .../nuiton/jaxx/widgets/extra/editor/Editor.java | 30 ++-- .../jaxx/widgets/extra/editor/EditorHelper.java | 8 +- .../jaxx/widgets/extra/editor/JEditEditor.java | 4 +- .../jaxx/widgets/extra/editor/RSyntaxEditor.java | 4 +- .../jaxx/widgets/extra/editor/SDocEditor.java | 4 +- .../jaxx/widgets/extra/tooltip/FocusableTip.java | 96 ++++++------- .../nuiton/jaxx/widgets/extra/tooltip/TipUtil.java | 14 +- .../jaxx/widgets/extra/tooltip/TipWindow.java | 12 +- .../jaxx/widgets/extra/tree/FilterTreeModel.java | 4 +- .../jaxx/widgets/gis/DmsCoordinateConverter.java | 1 - .../AbsoluteDdCoordinateEditorHandler.java | 13 +- .../AbsoluteDmdCoordinateEditorHandler.java | 13 +- .../AbsoluteDmsCoordinateEditorHandler.java | 13 +- .../gis/absolute/CoordinatesEditorModel.java | 65 ++++----- .../signed/SignedDdCoordinateEditorHandler.java | 13 +- .../signed/SignedDmdCoordinateEditorHandler.java | 13 +- .../signed/SignedDmsCoordinateEditorHandler.java | 13 +- .../absolute/AbsoluteDdCoordinateEditorTest.java | 9 +- .../absolute/AbsoluteDmsCoordinateEditorTest.java | 9 +- .../gis/signed/SignedDmdCoordinateEditorTest.java | 36 ++--- .../gis/signed/SignedDmsCoordinateEditorTest.java | 36 ++--- .../jaxx/widgets/number/NumberCellEditor.java | 16 +-- .../jaxx/widgets/number/NumberEditorHandler.java | 96 +++++-------- .../jaxx/widgets/number/NumberEditorModel.java | 7 +- .../select/FilterableDoubleListHandler.java | 87 +++++------ .../plaf/basic/ExtendedBasicDatePickerUI.java | 18 +-- .../jaxx/runtime/swing/AboutPanelHandler.java | 16 +-- .../nuiton/jaxx/runtime/swing/CompoundIcon.java | 6 +- .../jaxx/runtime/swing/HidorButtonHandler.java | 20 +-- .../jaxx/runtime/swing/JSearchTextField.java | 4 +- .../jaxx/runtime/swing/ListSelectorModel.java | 20 +-- .../runtime/swing/MemoryStatusWidgetHandler.java | 4 +- .../runtime/swing/editor/FileEditorHandler.java | 6 +- .../runtime/swing/editor/I18nEditorHandler.java | 2 +- .../jaxx/runtime/swing/editor/KeyStrokeEditor.java | 7 +- .../runtime/swing/editor/NumberEditorHandler.java | 106 +++++--------- .../swing/editor/SimpleTimeEditorHandler.java | 63 ++++---- .../runtime/swing/editor/TimeEditorHandler.java | 52 +++---- .../swing/editor/bean/BeanComboBoxHandler.java | 2 +- .../swing/editor/bean/BeanDoubleListHandler.java | 30 ++-- .../swing/editor/bean/BeanDoubleListModel.java | 8 +- .../editor/bean/BeanFilterableComboBoxHandler.java | 32 ++--- .../swing/editor/bean/BeanListHeaderHandler.java | 2 +- .../runtime/swing/editor/cell/DateCellEditor.java | 2 +- .../runtime/swing/editor/cell/FileCellEditor.java | 10 +- .../swing/editor/cell/KeyStrokeCellEditor.java | 12 +- .../swing/editor/cell/NumberCellEditor.java | 16 +-- .../editor/gis/DmdCoordinateEditorHandler.java | 13 +- .../editor/gis/DmsCoordinateEditorHandler.java | 13 +- .../jaxx/runtime/swing/list/CheckListAction.java | 2 +- .../jaxx/runtime/swing/log/JAXXLog4jAppender.java | 2 +- .../jaxx/runtime/swing/log/JAXXLog4jHandler.java | 2 +- .../runtime/swing/renderer/DateCellRenderer.java | 4 +- .../swing/table/filter/AbstractTableFilter.java | 17 +-- .../runtime/swing/table/filter/JTableFilter.java | 2 +- .../runtime/swing/table/filter/TableFilter.java | 2 +- .../swing/table/filter/TableFilterColumnPopup.java | 25 +--- .../swing/table/filter/TableRowFilterSupport.java | 18 +-- .../swing/editor/gis/DmdCoordinateEditorTest.java | 36 ++--- .../swing/editor/gis/DmsCoordinateEditorTest.java | 36 ++--- 259 files changed, 1822 insertions(+), 2769 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit d2cebf3a8e176a4675dd5299e87349a86047bd5d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 30 12:28:04 2016 +0100 [iso] clean code + use some java 7-8 api (part 2) --- .../JavaBeanObjectPropagateChangeListener.java | 4 +- .../jaxx/application/bean/JavaBeanObjectUtil.java | 7 +- .../listener/PropagatePropertyChangeListener.java | 6 +- .../swing/AbstractApplicationFormUIModel.java | 30 ++-- .../swing/AbstractApplicationUIHandler.java | 53 +++---- .../jaxx/application/swing/ApplicationUI.java | 28 ++-- .../swing/action/AbstractApplicationAction.java | 4 +- .../swing/action/ApplicationActionSwingWorker.java | 40 ++---- .../swing/action/ApplicationActionUIHandler.java | 127 ++++++++-------- .../swing/action/ApplicationUIAction.java | 57 +++----- .../jaxx/application/swing/tab/CustomTab.java | 18 +-- .../swing/table/AbstractApplicationTableModel.java | 8 +- .../swing/util/ApplicationColorHighlighter.java | 4 +- .../swing/util/ApplicationErrorHelper.java | 2 +- .../java/org/nuiton/jaxx/compiler/ClassMap.java | 2 +- .../org/nuiton/jaxx/compiler/CompiledObject.java | 16 +-- .../org/nuiton/jaxx/compiler/EventHandler.java | 12 +- .../org/nuiton/jaxx/compiler/JAXXCompiler.java | 42 +++--- .../java/org/nuiton/jaxx/compiler/JAXXProfile.java | 17 ++- .../java/org/nuiton/jaxx/compiler/SymbolTable.java | 6 +- .../nuiton/jaxx/compiler/beans/JAXXBeanInfo.java | 6 +- .../compiler/beans/JAXXEventSetDescriptor.java | 6 +- .../jaxx/compiler/beans/JAXXIntrospector.java | 14 +- .../nuiton/jaxx/compiler/binding/DataBinding.java | 8 +- .../nuiton/jaxx/compiler/css/parser/CSSParser.java | 15 +- .../compiler/css/parser/JJTCSSParserState.java | 4 +- .../org/nuiton/jaxx/compiler/css/parser/Node.java | 14 +- .../jaxx/compiler/css/parser/SimpleNode.java | 2 +- .../HelpRootCompiledObjectDecorator.java | 2 +- .../compiler/finalizers/ValidatorFinalizer.java | 2 +- .../nuiton/jaxx/compiler/java/JavaArgument.java | 2 +- .../nuiton/jaxx/compiler/java/JavaConstructor.java | 6 +- .../org/nuiton/jaxx/compiler/java/JavaField.java | 6 +- .../org/nuiton/jaxx/compiler/java/JavaFile.java | 6 +- .../org/nuiton/jaxx/compiler/java/JavaMethod.java | 8 +- .../compiler/java/parser/JJTJavaParserState.java | 4 +- .../jaxx/compiler/java/parser/JavaParser.java | 100 +------------ .../java/parser/JavaParserTokenManager.java | 2 +- .../jaxx/compiler/java/parser/ParseException.java | 4 +- .../jaxx/compiler/java/parser/SimpleNode.java | 2 +- .../jaxx/compiler/reflect/ClassDescriptor.java | 26 ++-- .../compiler/reflect/ClassDescriptorHelper.java | 4 +- .../compiler/reflect/ClassDescriptorResolver.java | 2 +- .../jaxx/compiler/reflect/FieldDescriptor.java | 4 +- .../jaxx/compiler/reflect/MemberDescriptor.java | 6 +- .../jaxx/compiler/reflect/MethodDescriptor.java | 4 +- .../ClassDescriptorResolverFromJavaFile.java | 12 +- .../nuiton/jaxx/compiler/script/ScriptManager.java | 2 +- .../jaxx/compiler/tags/DefaultObjectHandler.java | 10 +- .../org/nuiton/jaxx/compiler/tags/TagManager.java | 22 +-- .../compiler/tags/swing/CompiledItemContainer.java | 2 +- .../jaxx/compiler/tags/swing/ItemHandler.java | 2 +- .../jaxx/compiler/tags/swing/JSpinnerHandler.java | 6 +- .../jaxx/compiler/tags/swing/TableHandler.java | 4 +- .../tags/validator/BeanValidatorHandler.java | 10 +- .../validator/ExcludeFieldValidatorHandler.java | 2 +- .../tags/validator/FieldValidatorHandler.java | 2 +- .../tools/jaxxcapture/AbstractContextNode.java | 2 +- .../compiler/tools/jaxxcapture/CapturedObject.java | 16 +-- .../compiler/tools/jaxxcapture/JAXXCapture.java | 8 +- .../compiler/tools/jaxxcapture/LiteralNode.java | 4 +- .../compiler/tools/jaxxcapture/MethodNode.java | 2 +- .../compiler/tools/jaxxcapture/PropertyNode.java | 2 +- .../jaxx/compiler/tools/jaxxcapture/ValueNode.java | 2 +- .../jaxx/compiler/binding/JavaParserUtilTest.java | 6 +- .../jaxx/config/ConfigCallBackUIHandler.java | 24 ++-- .../org/nuiton/jaxx/config/ConfigTableEditor.java | 2 +- .../org/nuiton/jaxx/config/ConfigUIHandler.java | 11 +- .../nuiton/jaxx/config/model/CallBackEntry.java | 2 +- .../nuiton/jaxx/config/model/CallBacksManager.java | 2 +- .../nuiton/jaxx/config/model/CategoryModel.java | 8 +- .../nuiton/jaxx/config/model/ConfigTableModel.java | 10 +- .../nuiton/jaxx/config/model/ConfigUIModel.java | 2 +- .../nuiton/jaxx/config/model/MyDelegateConfig.java | 23 ++- .../jaxx/config/model/MyDelegateConfigTest.java | 12 +- .../jaxx/config/model/MyInheritedConfig.java | 21 ++- .../jaxx/config/model/MyInheritedConfigTest.java | 12 +- .../org/nuiton/jaxx/demo/DemoSourcesHandler.java | 10 +- .../java/org/nuiton/jaxx/demo/DemoUIHandler.java | 152 +++++++++----------- .../main/java/org/nuiton/jaxx/demo/RunDemo.java | 2 +- .../jaxx/editor/BeanDoubleListDemoHandler.java | 22 +-- .../jaxx/editor/gis/CoordinateDemoHandler.java | 57 +++----- .../jaxx/demo/entities/DemoDataProvider.java | 4 +- .../jaxx/demo/feature/nav/NavDemoHandler.java | 73 ++++------ .../feature/nav/tree/ActorsTreeNodeLoador.java | 2 +- .../feature/nav/tree/MoviesTreeNodeLoador.java | 4 +- .../feature/nav/tree/NavDemoTreeCellRenderer.java | 2 +- .../nav/treetable/ActorsTreeTableNodeLoador.java | 2 +- .../nav/treetable/MoviesTreeTableNodeLoador.java | 4 +- .../nav/treetable/NavDemoTreeTableModel.java | 2 +- .../list/ListBeanValidationDemoHandler.java | 2 +- .../feature/validation/list/PeopleTableModel.java | 9 +- .../org/nuiton/jaxx/demo/fun/CalculatorEngine.java | 4 +- .../nuiton/jaxx/demo/tree/DemoDataProvider.java | 2 +- .../org/nuiton/jaxx/demo/tree/DemoNodeLoador.java | 5 +- .../java/org/nuiton/jaxx/plugin/CompilerTest.java | 5 +- .../nuiton/jaxx/plugin/DataBinding/BeanImpl.java | 2 +- .../java/org/nuiton/jaxx/plugin/JaxxBaseTest.java | 4 +- .../validator/ok/Identity.java | 2 +- .../compilerValidatorTest/validator/ok/Model.java | 2 +- .../java/org/nuiton/jaxx/runtime/Base64Coder.java | 4 +- .../nuiton/jaxx/runtime/ComponentDescriptor.java | 8 +- .../nuiton/jaxx/runtime/DataBindingListener.java | 4 +- .../jaxx/runtime/DataBindingUpdateListener.java | 4 +- .../org/nuiton/jaxx/runtime/FileChooserUtil.java | 4 +- .../nuiton/jaxx/runtime/JAXXObjectDescriptor.java | 4 +- .../java/org/nuiton/jaxx/runtime/JAXXUtil.java | 98 ++++++------- .../org/nuiton/jaxx/runtime/JaxxFileChooser.java | 10 +- .../java/org/nuiton/jaxx/runtime/SwingUtil.java | 159 ++++++++------------- .../awt/visitor/GetCompopentAtPointVisitor.java | 4 +- .../nuiton/jaxx/runtime/context/DataContext.java | 32 +---- .../runtime/context/DefaultApplicationContext.java | 30 +--- .../org/nuiton/jaxx/runtime/css/DataBinding.java | 2 +- .../org/nuiton/jaxx/runtime/css/Pseudoclasses.java | 6 +- .../java/org/nuiton/jaxx/runtime/css/Rule.java | 4 +- .../java/org/nuiton/jaxx/runtime/css/Selector.java | 10 +- .../org/nuiton/jaxx/runtime/swing/Application.java | 8 +- .../org/nuiton/jaxx/runtime/swing/CardLayout2.java | 4 +- .../nuiton/jaxx/runtime/swing/CardLayout2Ext.java | 6 +- .../jaxx/runtime/swing/ComponentResizer.java | 4 +- .../java/org/nuiton/jaxx/runtime/swing/Item.java | 2 +- .../nuiton/jaxx/runtime/swing/JAXXButtonGroup.java | 4 +- .../nuiton/jaxx/runtime/swing/JAXXComboBox.java | 113 +++++++-------- .../org/nuiton/jaxx/runtime/swing/JAXXList.java | 123 ++++++---------- .../org/nuiton/jaxx/runtime/swing/JAXXTree.java | 35 ++--- .../runtime/swing/OneClicListSelectionModel.java | 4 +- .../org/nuiton/jaxx/runtime/swing/TabInfo.java | 22 +-- .../swing/TabInfoPropertyChangeListener.java | 4 +- .../java/org/nuiton/jaxx/runtime/swing/Table.java | 2 +- .../runtime/swing/application/ActionExecutor.java | 140 +++++++++--------- .../swing/application/ApplicationRunner.java | 41 +++--- .../runtime/swing/editor/BooleanCellEditor.java | 6 +- .../jaxx/runtime/swing/editor/ColorCellEditor.java | 6 +- .../jaxx/runtime/swing/help/JAXXHelpBroker.java | 2 +- .../model/AbstractGenericListSelectionModel.java | 2 +- .../jaxx/runtime/swing/model/GenericListEvent.java | 2 +- .../swing/model/GenericListSelectionModel.java | 2 +- .../runtime/swing/model/JaxxDefaultListModel.java | 2 +- .../swing/model/JaxxFilterableComboBoxModel.java | 4 +- .../swing/model/JaxxFilterableListModel.java | 4 +- .../model/WillChangeSelectedItemListener.java | 2 +- .../model/WillChangeSelectedItemVetoException.java | 2 +- .../nuiton/jaxx/runtime/swing/nav/NavHelper.java | 91 ++++++------ .../jaxx/runtime/swing/nav/NavNodeChildLoador.java | 2 +- .../swing/nav/treetable/NavTreeTableModel.java | 2 +- .../swing/renderer/BooleanCellRenderer.java | 7 +- .../runtime/swing/renderer/ColorCellRenderer.java | 2 +- .../swing/renderer/DecoratorListCellRenderer.java | 4 +- .../DecoratorProviderListCellRenderer.java | 4 +- .../DecoratorProviderTableCellRenderer.java | 4 +- .../swing/renderer/DecoratorTableCellRenderer.java | 4 +- .../renderer/EmptyNumberTableCellRenderer.java | 2 +- .../swing/renderer/EnumTableCellRenderer.java | 4 +- .../swing/renderer/I18nTableCellRenderer.java | 2 +- .../renderer/MultiDecoratorListCellRenderer.java | 4 +- .../renderer/MultiDecoratorTableCelleRenderer.java | 4 +- .../jaxx/runtime/swing/session/SwingSession.java | 24 ++-- .../jaxx/runtime/swing/wizard/WizardUILancher.java | 56 +++----- .../jaxx/runtime/swing/wizard/WizardUtil.java | 149 ++++++++----------- .../runtime/swing/wizard/ext/WizardExtModel.java | 4 +- .../runtime/swing/wizard/ext/WizardExtUtil.java | 82 +++++------ .../context/DefaultApplicationContextTest.java | 12 +- .../SimpleBeanValidatorMessageTableModel.java | 6 +- .../validator/swing/SwingListValidatorMessage.java | 2 +- .../swing/SwingListValidatorMessageTableModel.java | 6 +- ...wingListValidatorMessageTableMouseListener.java | 4 +- .../swing/SwingListValidatorMessageWidget.java | 97 ++++++------- ...SwingListValidatorTableEditorModelListener.java | 2 +- .../validator/swing/SwingValidatorMessage.java | 2 +- .../swing/SwingValidatorMessageListModel.java | 6 +- .../SwingValidatorMessageListMouseListener.java | 2 +- .../swing/SwingValidatorMessageListRenderer.java | 2 +- .../swing/SwingValidatorMessageTableModel.java | 6 +- .../SwingValidatorMessageTableMouseListener.java | 4 +- .../swing/SwingValidatorMessageWidget.java | 97 ++++++------- .../jaxx/validator/swing/SwingValidatorUtil.java | 16 +-- .../jaxx/validator/swing/ui/IconValidationUI.java | 2 +- .../jaxx/validator/swing/ui/ImageValidationUI.java | 2 +- .../swing/unified/UnifiedValidatorMessage.java | 2 +- .../unified/UnifiedValidatorMessageTableModel.java | 120 ++++++++-------- .../UnifiedValidatorMessageTableMouseListener.java | 2 +- .../unified/UnifiedValidatorMessageWidget.java | 97 ++++++------- .../nuiton/jaxx/widgets/about/AboutUIBuilder.java | 17 +-- .../jaxx/widgets/datetime/DateTimeEditorModel.java | 9 +- .../jaxx/widgets/datetime/TimeEditorModel.java | 9 +- .../widgets/datetime/TimeSliderInitializer.java | 33 ++--- .../org/nuiton/jaxx/widgets/extra/AboutFrame.java | 8 +- .../nuiton/jaxx/widgets/extra/GridFlowLayout.java | 2 +- .../org/nuiton/jaxx/widgets/extra/IconFactory.java | 4 +- .../widgets/extra/JComboBoxAutoCompletionKit.java | 4 +- .../nuiton/jaxx/widgets/extra/SplashScreen.java | 10 +- .../org/nuiton/jaxx/widgets/extra/WidgetUtil.java | 2 +- .../nuiton/jaxx/widgets/extra/XMLGridLayout.java | 2 +- .../widgets/extra/XMLGridParseConstraints.java | 4 +- .../widgets/extra/datatips/DataTipComponent.java | 8 +- .../widgets/extra/datatips/DataTipListener.java | 10 +- .../widgets/extra/datatips/DataTipManager.java | 6 +- .../jaxx/widgets/extra/datatips/DataTipPopup.java | 2 +- .../jaxx/widgets/extra/editor/DefaultEditor.java | 6 +- .../nuiton/jaxx/widgets/extra/editor/Editor.java | 30 ++-- .../jaxx/widgets/extra/editor/EditorHelper.java | 8 +- .../jaxx/widgets/extra/editor/JEditEditor.java | 4 +- .../jaxx/widgets/extra/editor/RSyntaxEditor.java | 4 +- .../jaxx/widgets/extra/editor/SDocEditor.java | 4 +- .../jaxx/widgets/extra/tooltip/FocusableTip.java | 96 ++++++------- .../nuiton/jaxx/widgets/extra/tooltip/TipUtil.java | 14 +- .../jaxx/widgets/extra/tooltip/TipWindow.java | 12 +- .../jaxx/widgets/extra/tree/FilterTreeModel.java | 4 +- .../jaxx/widgets/gis/DmsCoordinateConverter.java | 1 - .../AbsoluteDdCoordinateEditorHandler.java | 13 +- .../AbsoluteDmdCoordinateEditorHandler.java | 13 +- .../AbsoluteDmsCoordinateEditorHandler.java | 13 +- .../gis/absolute/CoordinatesEditorModel.java | 65 ++++----- .../signed/SignedDdCoordinateEditorHandler.java | 13 +- .../signed/SignedDmdCoordinateEditorHandler.java | 13 +- .../signed/SignedDmsCoordinateEditorHandler.java | 13 +- .../absolute/AbsoluteDdCoordinateEditorTest.java | 9 +- .../absolute/AbsoluteDmsCoordinateEditorTest.java | 9 +- .../gis/signed/SignedDmdCoordinateEditorTest.java | 36 ++--- .../gis/signed/SignedDmsCoordinateEditorTest.java | 36 ++--- .../jaxx/widgets/number/NumberCellEditor.java | 16 +-- .../jaxx/widgets/number/NumberEditorHandler.java | 96 +++++-------- .../jaxx/widgets/number/NumberEditorModel.java | 7 +- .../select/FilterableDoubleListHandler.java | 87 +++++------ .../plaf/basic/ExtendedBasicDatePickerUI.java | 18 +-- .../jaxx/runtime/swing/AboutPanelHandler.java | 16 +-- .../nuiton/jaxx/runtime/swing/CompoundIcon.java | 6 +- .../jaxx/runtime/swing/HidorButtonHandler.java | 20 +-- .../jaxx/runtime/swing/JSearchTextField.java | 4 +- .../jaxx/runtime/swing/ListSelectorModel.java | 20 +-- .../runtime/swing/MemoryStatusWidgetHandler.java | 4 +- .../runtime/swing/editor/FileEditorHandler.java | 6 +- .../runtime/swing/editor/I18nEditorHandler.java | 2 +- .../jaxx/runtime/swing/editor/KeyStrokeEditor.java | 7 +- .../runtime/swing/editor/NumberEditorHandler.java | 106 +++++--------- .../swing/editor/SimpleTimeEditorHandler.java | 63 ++++---- .../runtime/swing/editor/TimeEditorHandler.java | 52 +++---- .../swing/editor/bean/BeanComboBoxHandler.java | 2 +- .../swing/editor/bean/BeanDoubleListHandler.java | 30 ++-- .../swing/editor/bean/BeanDoubleListModel.java | 8 +- .../editor/bean/BeanFilterableComboBoxHandler.java | 32 ++--- .../swing/editor/bean/BeanListHeaderHandler.java | 2 +- .../runtime/swing/editor/cell/DateCellEditor.java | 2 +- .../runtime/swing/editor/cell/FileCellEditor.java | 10 +- .../swing/editor/cell/KeyStrokeCellEditor.java | 12 +- .../swing/editor/cell/NumberCellEditor.java | 16 +-- .../editor/gis/DmdCoordinateEditorHandler.java | 13 +- .../editor/gis/DmsCoordinateEditorHandler.java | 13 +- .../jaxx/runtime/swing/list/CheckListAction.java | 2 +- .../jaxx/runtime/swing/log/JAXXLog4jAppender.java | 2 +- .../jaxx/runtime/swing/log/JAXXLog4jHandler.java | 2 +- .../runtime/swing/renderer/DateCellRenderer.java | 4 +- .../swing/table/filter/AbstractTableFilter.java | 17 +-- .../runtime/swing/table/filter/JTableFilter.java | 2 +- .../runtime/swing/table/filter/TableFilter.java | 2 +- .../swing/table/filter/TableFilterColumnPopup.java | 25 +--- .../swing/table/filter/TableRowFilterSupport.java | 18 +-- .../swing/editor/gis/DmdCoordinateEditorTest.java | 36 ++--- .../swing/editor/gis/DmsCoordinateEditorTest.java | 36 ++--- 259 files changed, 1822 insertions(+), 2769 deletions(-) diff --git a/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectPropagateChangeListener.java b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectPropagateChangeListener.java index 758778a..27e7d8f 100644 --- a/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectPropagateChangeListener.java +++ b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectPropagateChangeListener.java @@ -50,9 +50,9 @@ public class JavaBeanObjectPropagateChangeListener implements PropertyChangeList producer.addPropertyChangeListener(listener); } - private String propertyName; + private final String propertyName; - private JavaBeanObject editor; + private final JavaBeanObject editor; public JavaBeanObjectPropagateChangeListener(String propertyName, JavaBeanObject editor) { diff --git a/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectUtil.java b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectUtil.java index 2ddd259..394e1f8 100644 --- a/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectUtil.java +++ b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectUtil.java @@ -58,12 +58,7 @@ public class JavaBeanObjectUtil { public static void removeAllRemovablePropertyChangeListeners(JavaBeanObject bean) { - removePropertyChangeListeners(bean, new Predicate<PropertyChangeListener>() { - @Override - public boolean apply(PropertyChangeListener input) { - return input instanceof RemoveablePropertyChangeListener; - } - }); + removePropertyChangeListeners(bean, input -> input instanceof RemoveablePropertyChangeListener); } diff --git a/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/listener/PropagatePropertyChangeListener.java b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/listener/PropagatePropertyChangeListener.java index 7a88202..36d6083 100644 --- a/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/listener/PropagatePropertyChangeListener.java +++ b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/listener/PropagatePropertyChangeListener.java @@ -38,7 +38,7 @@ import java.beans.PropertyChangeListener; @Deprecated public class PropagatePropertyChangeListener implements PropertyChangeListener { - public static interface PropagatePropertyChange { + public interface PropagatePropertyChange { void firePropertyChanged(String propertyName, Object oldValue, Object newValue); @@ -61,9 +61,9 @@ public class PropagatePropertyChangeListener implements PropertyChangeListener { producer.addPropertyChangeListener(listener); } - private String propertyName; + private final String propertyName; - private PropagatePropertyChange editor; + private final PropagatePropertyChange editor; public PropagatePropertyChangeListener(String propertyName, PropagatePropertyChange editor) { diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationFormUIModel.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationFormUIModel.java index e6b9736..f32128f 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationFormUIModel.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationFormUIModel.java @@ -248,35 +248,27 @@ public abstract class AbstractApplicationFormUIModel<E, B extends AbstractApplic //------------------------------------------------------------------------// protected static <E, B extends AbstractApplicationFormUIModel<E, B>> Function<B, E> modelToEntity() { - return new Function<B, E>() { - @Override - public E apply(B model) { - return model.toEntity(); - } - }; + return AbstractApplicationFormUIModel::toEntity; } protected static <E, B extends AbstractApplicationFormUIModel<E, B>> Function<E, B> entityToModel(final Class<B> modelType) { - return new Function<E, B>() { - @Override - public B apply(E entity) { - try { - B model = modelType.newInstance(); - model.fromEntity(entity); - return model; - } catch (Exception e) { - throw new ApplicationTechnicalException("Can't create new model " + modelType.getName(), e); - } - + return entity -> { + try { + B model = modelType.newInstance(); + model.fromEntity(entity); + return model; + } catch (Exception e) { + throw new ApplicationTechnicalException("Can't create new model " + modelType.getName(), e); } + }; } protected static class ModifyPropertyChangeListener implements PropertyChangeListener { - private AbstractApplicationFormUIModel consumer; + private final AbstractApplicationFormUIModel consumer; - private Set<String> propertiesToIgnore; + private final Set<String> propertiesToIgnore; public ModifyPropertyChangeListener(AbstractApplicationFormUIModel consumer, Set<String> propertiesToIgnore) { this.consumer = consumer; diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java index f39860d..c032b1f 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java @@ -91,8 +91,6 @@ import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.border.LineBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionEvent; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; @@ -110,7 +108,6 @@ import java.awt.event.ActionEvent; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import java.awt.event.HierarchyEvent; -import java.awt.event.HierarchyListener; import java.awt.event.ItemEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; @@ -584,15 +581,12 @@ public abstract class AbstractApplicationUIHandler<M, UI extends ApplicationUI<M } protected void initComponentToFocus(Component ui) { - ui.addHierarchyListener(new HierarchyListener() { - @Override - public void hierarchyChanged(HierarchyEvent e) { - JComponent component = getComponentToFocus(); - if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) > 0 - && e.getChanged().isShowing() - && component != null) { - component.requestFocus(); - } + ui.addHierarchyListener(e -> { + JComponent component = getComponentToFocus(); + if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) > 0 + && e.getChanged().isShowing() + && component != null) { + component.requestFocus(); } }); } @@ -903,13 +897,10 @@ public abstract class AbstractApplicationUIHandler<M, UI extends ApplicationUI<M scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); final JViewport viewport = scrollPane.getViewport(); - viewport.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - Dimension newDimension = new Dimension(viewport.getExtentSize().width, - viewport.getViewSize().height); - viewport.setViewSize(newDimension); - } + viewport.addChangeListener(e -> { + Dimension newDimension = new Dimension(viewport.getExtentSize().width, + viewport.getViewSize().height); + viewport.setViewSize(newDimension); }); } } @@ -954,12 +945,9 @@ public abstract class AbstractApplicationUIHandler<M, UI extends ApplicationUI<M jTextField.addFocusListener(new FocusAdapter() { @Override public void focusGained(final FocusEvent e) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - JTextField source = (JTextField) e.getSource(); - source.selectAll(); - } + SwingUtilities.invokeLater(() -> { + JTextField source = (JTextField) e.getSource(); + source.selectAll(); }); } @@ -1185,17 +1173,14 @@ public abstract class AbstractApplicationUIHandler<M, UI extends ApplicationUI<M } protected TableCellRenderer newNumberCellRenderer(final TableCellRenderer defaultRenderer) { - return new TableCellRenderer() { - @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - Component result1 = defaultRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - if (result1 instanceof JLabel) { - JLabel jLabel = (JLabel) result1; - jLabel.setHorizontalTextPosition(SwingConstants.RIGHT); + return (table, value, isSelected, hasFocus, row, column) -> { + Component result1 = defaultRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + if (result1 instanceof JLabel) { + JLabel jLabel = (JLabel) result1; + jLabel.setHorizontalTextPosition(SwingConstants.RIGHT); - } - return result1; } + return result1; }; } diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUI.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUI.java index 2d08b9b..2e81858 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUI.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUI.java @@ -43,63 +43,63 @@ public interface ApplicationUI<M, H extends AbstractApplicationUIHandler<M, ?>> * * @since 0.2 */ - public static final String INT_1_DIGITS_PATTERN = "\\d{0,1}"; + String INT_1_DIGITS_PATTERN = "\\d{0,1}"; /** * Pattern to use for short numeric values in editors with max 2 digits. * * @since 0.1 */ - public static final String INT_2_DIGITS_PATTERN = "\\d{0,2}"; + String INT_2_DIGITS_PATTERN = "\\d{0,2}"; /** * Pattern to use for signed numeric values in editors with max 2 digits. * * @since 2.8 */ - public static final String SIGNED_INT_2_DIGITS_PATTERN = "-?\\d{0,2}"; + String SIGNED_INT_2_DIGITS_PATTERN = "-?\\d{0,2}"; /** * Pattern to use for short numeric values in editors with max 3 digits. * * @since 0.1 */ - public static final String INT_3_DIGITS_PATTERN = "\\d{0,3}"; + String INT_3_DIGITS_PATTERN = "\\d{0,3}"; /** * Pattern to use for singed numeric values in editors with max 3 digits. * * @since 2.8 */ - public static final String SIGNED_INT_3_DIGITS_PATTERN = "-?\\d{0,3}"; + String SIGNED_INT_3_DIGITS_PATTERN = "-?\\d{0,3}"; /** * Pattern to use for short numeric values in editors with max 4 digits. * * @since 0.2 */ - public static final String INT_4_DIGITS_PATTERN = "\\d{0,4}"; + String INT_4_DIGITS_PATTERN = "\\d{0,4}"; /** * Pattern to use for integer numeric values in editors with max 6 digits. * * @since 0.1 */ - public static final String INT_6_DIGITS_PATTERN = "\\d{0,6}"; + String INT_6_DIGITS_PATTERN = "\\d{0,6}"; /** * Pattern to use for integer numeric values in editors with max 7 digits. * * @since 0.1 */ - public static final String INT_7_DIGITS_PATTERN = "\\d{0,7}"; + String INT_7_DIGITS_PATTERN = "\\d{0,7}"; /** * Pattern to use for integer numeric values in editors with max 10 digits. * * @since 2.10 */ - public static final String INT_10_DIGITS_PATTERN = "\\d{0,10}"; + String INT_10_DIGITS_PATTERN = "\\d{0,10}"; /** * Pattern to use for decimal numeric values with 1 decimal digits in @@ -107,7 +107,7 @@ public interface ApplicationUI<M, H extends AbstractApplicationUIHandler<M, ?>> * * @since 0.1 */ - public static final String DECIMAL1_PATTERN = "\\d{0,6}(\\.\\d{0,1})?"; + String DECIMAL1_PATTERN = "\\d{0,6}(\\.\\d{0,1})?"; /** * Pattern to use for decimal numeric values with 2 decimal digits in @@ -115,7 +115,7 @@ public interface ApplicationUI<M, H extends AbstractApplicationUIHandler<M, ?>> * * @since 0.1 */ - public static final String DECIMAL2_PATTERN = "\\d{0,6}(\\.\\d{0,2})?"; + String DECIMAL2_PATTERN = "\\d{0,6}(\\.\\d{0,2})?"; /** * Pattern to use for decimal numeric values with 3 decimal digits in @@ -123,7 +123,7 @@ public interface ApplicationUI<M, H extends AbstractApplicationUIHandler<M, ?>> * * @since 0.1 */ - public static final String DECIMAL3_PATTERN = "\\d{0,6}(\\.\\d{0,3})?"; + String DECIMAL3_PATTERN = "\\d{0,6}(\\.\\d{0,3})?"; /** * Pattern to use for decimal numeric values with 4 decimal digits in @@ -131,7 +131,7 @@ public interface ApplicationUI<M, H extends AbstractApplicationUIHandler<M, ?>> * * @since 2.6 */ - public static final String DECIMAL4_PATTERN = "\\d{0,6}(\\.\\d{0,4})?"; + String DECIMAL4_PATTERN = "\\d{0,6}(\\.\\d{0,4})?"; /** * Pattern to use for decimal numeric values with 2 digits + 3 decimal digits in @@ -139,5 +139,5 @@ public interface ApplicationUI<M, H extends AbstractApplicationUIHandler<M, ?>> * * @since 2.8 */ - public static final String DECIMAL2_DIGITS_PATTERN = "\\d{0,2}(\\.\\d*)?"; + String DECIMAL2_DIGITS_PATTERN = "\\d{0,2}(\\.\\d*)?"; } diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java index 1bbda7f..dadf821 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java @@ -66,14 +66,14 @@ public abstract class AbstractApplicationAction<M extends AbstractBean, UI exten protected final Object lock = new Object(); - public abstract void doAction() throws Exception; + public abstract void doAction(); protected AbstractApplicationAction(H handler, boolean hideBody) { this.handler = handler; this.hideBody = hideBody; } - public boolean prepareAction() throws Exception { + public boolean prepareAction() { // by default nothing to prepare return true; } diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionSwingWorker.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionSwingWorker.java index 58c2e8e..d63af00 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionSwingWorker.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionSwingWorker.java @@ -156,15 +156,9 @@ public class ApplicationActionSwingWorker<A extends AbstractApplicationAction> e // we do NOT want the timer to wake up then the actionUI dialog cancel(); - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - //if (actionUI.isVisible()) { - actionUI.close(); - //} - } - }); + //if (actionUI.isVisible()) { +//} + SwingUtilities.invokeLater(actionUI::close); } }); } @@ -182,25 +176,21 @@ public class ApplicationActionSwingWorker<A extends AbstractApplicationAction> e log.debug("Task [" + action + "] is started, show waiting dialog"); } - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { + SwingUtilities.invokeLater(() -> { - synchronized (actionUI) { + synchronized (actionUI) { - try { - actionUI.open(action); - } catch (Exception e) { + try { + actionUI.open(action); + } catch (Exception e) { - // swallow any exception due to ui bad initialisation - // this should not happen, but it does :( - // See https://forge.codelutin.com/issues/7489 - // See http://stackoverflow.com/questions/15545055/nimbus-java-lang-classcastexcept... - // See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6785663 - if (log.isErrorEnabled()) { - log.error("Something was wrong while opening the action ui, but we do not care", e); - } + // swallow any exception due to ui bad initialisation + // this should not happen, but it does :( + // See https://forge.codelutin.com/issues/7489 + // See http://stackoverflow.com/questions/15545055/nimbus-java-lang-classcastexcept... + // See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6785663 + if (log.isErrorEnabled()) { + log.error("Something was wrong while opening the action ui, but we do not care", e); } } } diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java index 48e4829..3651fd2 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java @@ -36,7 +36,6 @@ import java.awt.Cursor; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import static org.nuiton.i18n.I18n.t; @@ -51,9 +50,12 @@ public class ApplicationActionUIHandler extends AbstractApplicationUIHandler<App private static final Log log = LogFactory.getLog(ApplicationActionUIHandler.class); - protected PropertyChangeListener progressionListener = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + protected final PropertyChangeListener progressionListener; + + protected final ComponentListener listener; + + public ApplicationActionUIHandler() { + progressionListener = evt -> { String propertyName = evt.getPropertyName(); if (ApplicationProgressionModel.PROPERTY_MESSAGE.equals(propertyName)) { @@ -72,46 +74,45 @@ public class ApplicationActionUIHandler extends AbstractApplicationUIHandler<App // change value of progress bar ui.getTaskProgressBar().setValue((Integer) evt.getNewValue()); } - } - }; + }; + listener = new ComponentAdapter() { + boolean moving; - protected ComponentListener listener = new ComponentAdapter() { - boolean moving; + boolean resizing; - boolean resizing; - - @Override - public void componentMoved(ComponentEvent e) { + @Override + public void componentMoved(ComponentEvent e) { - Component mainUI = (Component) e.getSource(); + Component mainUI = (Component) e.getSource(); - if (!moving && mainUI.isShowing()) { + if (!moving && mainUI.isShowing()) { - moving = true; - try { - setLocation(mainUI); - } finally { - moving = false; + moving = true; + try { + setLocation(mainUI); + } finally { + moving = false; + } } } - } - @Override - public void componentResized(ComponentEvent e) { + @Override + public void componentResized(ComponentEvent e) { - Component mainUI = (Component) e.getSource(); + Component mainUI = (Component) e.getSource(); - if (!resizing && mainUI.isShowing()) { + if (!resizing && mainUI.isShowing()) { - resizing = true; - try { - setSize(mainUI); - } finally { - resizing = false; + resizing = true; + try { + setSize(mainUI); + } finally { + resizing = false; + } } } - } - }; + }; + } //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// @@ -123,55 +124,49 @@ public class ApplicationActionUIHandler extends AbstractApplicationUIHandler<App ApplicationActionUIModel model = new ApplicationActionUIModel(); ui.setContextValue(model); - model.addPropertyChangeListener(ApplicationActionUIModel.PROPERTY_ACTION, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + model.addPropertyChangeListener(ApplicationActionUIModel.PROPERTY_ACTION, evt -> { - // udpate global label - AbstractApplicationAction action = (AbstractApplicationAction) evt.getNewValue(); + // udpate global label + AbstractApplicationAction action = (AbstractApplicationAction) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("Action to use: " + action); - } - if (action == null) { + if (log.isDebugEnabled()) { + log.debug("Action to use: " + action); + } + if (action == null) { - // stoping action - hideAction(); - } else { + // stoping action + hideAction(); + } else { - // starting action - showAction(action); - } + // starting action + showAction(action); } }); - model.addPropertyChangeListener(ApplicationActionUIModel.PROPERTY_PROGRESSION_MODEL, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + model.addPropertyChangeListener(ApplicationActionUIModel.PROPERTY_PROGRESSION_MODEL, evt -> { - // change progression model + // change progression model - ApplicationProgressionModel oldValue = (ApplicationProgressionModel) evt.getOldValue(); - ApplicationProgressionModel newValue = (ApplicationProgressionModel) evt.getNewValue(); + ApplicationProgressionModel oldValue = (ApplicationProgressionModel) evt.getOldValue(); + ApplicationProgressionModel newValue = (ApplicationProgressionModel) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("progression model: " + newValue); - } - if (oldValue != null) { - oldValue.removePropertyChangeListener(progressionListener); - } + if (log.isDebugEnabled()) { + log.debug("progression model: " + newValue); + } + if (oldValue != null) { + oldValue.removePropertyChangeListener(progressionListener); + } - if (newValue == null) { + if (newValue == null) { - // remove progression model - ApplicationActionUIHandler.this.ui.getTaskPanel().setVisible(false); - } else { + // remove progression model + ApplicationActionUIHandler.this.ui.getTaskPanel().setVisible(false); + } else { - // use progression model - ApplicationActionUIHandler.this.ui.getTaskPanel().setVisible(true); + // use progression model + ApplicationActionUIHandler.this.ui.getTaskPanel().setVisible(true); - newValue.addPropertyChangeListener(progressionListener); - } + newValue.addPropertyChangeListener(progressionListener); } }); } diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java index d8b0594..0aaa5dc 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java @@ -32,8 +32,6 @@ import javax.swing.AbstractButton; import javax.swing.Icon; import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -80,12 +78,7 @@ public class ApplicationUIAction<A extends AbstractApplicationAction> extends Ab setEnabled(button.isEnabled()); // see https://forge.nuiton.org/issues/3525 - button.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - setEnabled(button.isEnabled()); - } - }); + button.addPropertyChangeListener(evt -> setEnabled(button.isEnabled())); } } @@ -137,14 +130,11 @@ public class ApplicationUIAction<A extends AbstractApplicationAction> extends Ab final ApplicationActionSwingWorker<A> worker = new ApplicationActionSwingWorker<>(action); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { + SwingUtilities.invokeLater(() -> { - // make ui busy - worker.updateBusyState(true); + // make ui busy + worker.updateBusyState(true); - } }); if (log.isDebugEnabled()) { @@ -156,32 +146,25 @@ public class ApplicationUIAction<A extends AbstractApplicationAction> extends Ab // wait until action is done waitingThread.execute( - new Runnable() { - @Override - public void run() { + () -> { - A action = getLogicAction(); + A action1 = getLogicAction(); + try { try { - try { - worker.get(); - } catch (ExecutionException e) { - // don't care . - } catch (CancellationException e) { - // dont care ? - } catch (InterruptedException e) { - // don't care ? - } - if (log.isDebugEnabled()) { - log.debug("After execute of action " + action + " (worker done? " + worker.isDone() + ")"); - } - - if (worker.isFailed()) { - - throw ApplicationActionException.propagateError(action, worker.getError()); - } - } finally { - unlock(); + worker.get(); + } catch (ExecutionException | InterruptedException | CancellationException e) { + // don't care . + } + if (log.isDebugEnabled()) { + log.debug("After execute of action " + action1 + " (worker done? " + worker.isDone() + ")"); + } + + if (worker.isFailed()) { + + throw ApplicationActionException.propagateError(action1, worker.getError()); } + } finally { + unlock(); } } ); diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java index b1535d8..ccb27c7 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java @@ -47,8 +47,6 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import static org.nuiton.i18n.I18n.t; @@ -65,11 +63,11 @@ public class CustomTab extends JPanel { private static final Log log = LogFactory.getLog(CustomTab.class); - protected TabContentModel model; + protected final TabContentModel model; - protected TabContainerHandler handler; + protected final TabContainerHandler handler; - protected JLabel title = new JLabel(); + protected final JLabel title = new JLabel(); public TabContentModel getModel() { return model; @@ -83,13 +81,7 @@ public class CustomTab extends JPanel { try { BeanUtil.addPropertyChangeListener( - new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - updateTitle(); - } - }, this.model); + evt -> updateTitle(), this.model); } catch (Exception ex) { log.error("Error while adding the listener to the model modifications", ex); @@ -208,7 +200,7 @@ public class CustomTab extends JPanel { } } - private MouseListener buttonMouseListener = new MouseAdapter() { + private final MouseListener buttonMouseListener = new MouseAdapter() { public void mouseEntered(MouseEvent e) { Component component = e.getComponent(); if (component instanceof AbstractButton) { diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractApplicationTableModel.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractApplicationTableModel.java index f6d4540..8121894 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractApplicationTableModel.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractApplicationTableModel.java @@ -23,7 +23,6 @@ package org.nuiton.jaxx.application.swing.table; */ import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -319,12 +318,7 @@ public abstract class AbstractApplicationTableModel<R extends Serializable> exte } public int getColumnIndex(final String propertyName) { - return Iterables.indexOf(identifiers, new Predicate<ColumnIdentifier<R>>() { - @Override - public boolean apply(ColumnIdentifier<R> input) { - return ObjectUtils.equals(propertyName, input.getPropertyName()); - } - }); + return Iterables.indexOf(identifiers, input -> ObjectUtils.equals(propertyName, input.getPropertyName())); } public Pair<Integer, Integer> getCell(R row, final String propertyName) { diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationColorHighlighter.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationColorHighlighter.java index 57214ee..d65b274 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationColorHighlighter.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationColorHighlighter.java @@ -36,9 +36,9 @@ import java.awt.Component; */ public class ApplicationColorHighlighter extends AbstractHighlighter { - protected Color color; + protected final Color color; - protected boolean foreground; + protected final boolean foreground; public ApplicationColorHighlighter(HighlightPredicate predicate, Color color, boolean foreground) { super(predicate); diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationErrorHelper.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationErrorHelper.java index 7b9d4fc..d968182 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationErrorHelper.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationErrorHelper.java @@ -42,7 +42,7 @@ import static org.nuiton.i18n.I18n.t; */ public class ApplicationErrorHelper implements ErrorReporter { - protected ApplicationUIContext context; + protected final ApplicationUIContext context; public ApplicationErrorHelper(ApplicationUIContext context) { this.context = context; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/ClassMap.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/ClassMap.java index 7ddbb43..053ef55 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/ClassMap.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/ClassMap.java @@ -57,7 +57,7 @@ public class ClassMap<T> extends HashMap<ClassDescriptor, T> { * calls to speed up subsequent requests, but they must be updated when the mappings * for their superclasses are modified. */ - private List<ClassDescriptor> autoKeys = new ArrayList<>(); + private final List<ClassDescriptor> autoKeys = new ArrayList<>(); /** * Returns the value associated with the key <code>Class</code>. If the class itself does not have diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObject.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObject.java index 3d95e23..2fc627b 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObject.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObject.java @@ -46,10 +46,10 @@ import java.util.Map; public class CompiledObject { /** The object's id. */ - private String id; + private final String id; /** Java code referring to the object. */ - private String javaCode; + private final String javaCode; /** The object's class. */ private ClassDescriptor objectClass; @@ -85,7 +85,7 @@ public class CompiledObject { * Because CompiledObject initialization order cannot be guaranteed, it is not safe to refer to other * CompiledObjects from initializationCode -- you must refer to them from additionCode instead. */ - private StringBuilder initializationCode = new StringBuilder(); + private final StringBuilder initializationCode = new StringBuilder(); /** * Java code snippet which completes setup by adding any child objects, or otherwise manipulates any refererenced @@ -95,10 +95,10 @@ public class CompiledObject { private StringBuilder additionCode = new StringBuilder(); /** List of all registered event handlers. */ - private List<EventHandler> eventHandlers = new ArrayList<>(); + private final List<EventHandler> eventHandlers = new ArrayList<>(); /** All properties that have been applied to this CompiledObject. */ - private Map<String, String> properties = new HashMap<>(); + private final Map<String, String> properties = new HashMap<>(); /** generic types of the compiled object */ private String[] genericTypes; @@ -130,13 +130,13 @@ public class CompiledObject { public class ChildRef { - CompiledObject child; + final CompiledObject child; - String constraints; + final String constraints; String childJavaCode; - private String delegateCode; + private final String delegateCode; public ChildRef(CompiledObject child, String constraints, diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/EventHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/EventHandler.java index 9ae8cd1..8b285a4 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/EventHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/EventHandler.java @@ -27,17 +27,17 @@ import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; public class EventHandler { - private String eventId; + private final String eventId; - private String objectCode; + private final String objectCode; - private ClassDescriptor listenerClass; + private final ClassDescriptor listenerClass; - private MethodDescriptor addMethod; + private final MethodDescriptor addMethod; - private MethodDescriptor listenerMethod; + private final MethodDescriptor listenerMethod; - private String javaCode; + private final String javaCode; public EventHandler(String eventId, String objectCode, diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java index 1fab187..0968425 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java @@ -126,7 +126,7 @@ public class JAXXCompiler { public static final int INLINE_THRESHOLD = 300; /** Line separator cached value */ - protected static String lineSeparator = + protected static final String lineSeparator = System.getProperty("line.separator", "\n"); public static final String BORDER_LAYOUT_PREFIX = BorderLayout.class.getSimpleName() + "."; @@ -145,13 +145,13 @@ public class JAXXCompiler { protected CompiledObject root; /** Contains strings of the form "javax.swing." */ - protected Set<String> importedPackages; + protected final Set<String> importedPackages; /** Contains strings of the form "javax.swing.Timer" */ - protected Set<String> importedClasses; + protected final Set<String> importedClasses; /** Keeps track of open components (components still having children added). */ - protected Stack<CompiledObject> openComponents; + protected final Stack<CompiledObject> openComponents; /** to generate ids */ protected final IDHelper idHelper; @@ -160,25 +160,25 @@ public class JAXXCompiler { protected final DataBindingHelper bindingHelper; /** table of symbols for this compiler */ - protected SymbolTable symbolTable; + protected final SymbolTable symbolTable; /** * Base directory used for path resolution (normally the directory in * which the .jaxx file resides). */ - protected File baseDir; + protected final File baseDir; /** jaxx file being compiled. */ - protected File src; + protected final File src; /** Parsed XML of src file. */ protected Document document; /** Name of class being compiled. */ - protected String outputClassName; + protected final String outputClassName; /** script manager */ - protected ScriptManager scriptManager; + protected final ScriptManager scriptManager; /** * Combination of all stylesheets registered using @@ -187,7 +187,7 @@ public class JAXXCompiler { protected Stylesheet stylesheet; /** Contains all attributes defined inline on class tags. */ - protected List<Rule> inlineStyles; + protected final List<Rule> inlineStyles; /** * Maps objects (expressed in Java code) to event listener classes @@ -195,10 +195,10 @@ public class JAXXCompiler { * contains all event handlers of a particular type attached to a * particular object (again, as represented by a Java expression). */ - protected Map<String, Map<ClassDescriptor, List<EventHandler>>> eventHandlers; + protected final Map<String, Map<ClassDescriptor, List<EventHandler>>> eventHandlers; /** Map of event handler method names used in compiler */ - protected Map<EventHandler, String> eventHandlerMethodNames; + protected final Map<EventHandler, String> eventHandlerMethodNames; /** * ClassLoader which searches the user-specified class path in @@ -213,7 +213,7 @@ public class JAXXCompiler { * which cannot be created during the first pass and must be created * in document order. */ - protected List<Runnable> initializers; + protected final List<Runnable> initializers; /** * extra interfaces which can by passed to root object via the @@ -231,13 +231,13 @@ public class JAXXCompiler { private String superGenericType; /** Extra code to be added to the instance initializer. */ - protected StringBuilder initializer; + protected final StringBuilder initializer; /** Extra code to be added at the end of the instance initializer. */ - protected StringBuilder lateInitializer; + protected final StringBuilder lateInitializer; /** Extra code to be added to the class body. */ - protected StringBuilder bodyCode; + protected final StringBuilder bodyCode; /** true if a main() method has been declared in a script */ protected boolean mainDeclared; @@ -246,24 +246,24 @@ public class JAXXCompiler { protected JavaFile javaFile; /** Used for error reporting purposes, so we can report the right line number. */ - protected Stack<Element> tagsBeingCompiled; + protected final Stack<Element> tagsBeingCompiled; /** Used for error reporting purposes, so we can report the right source file. */ - protected Stack<File> sourceFiles; + protected final Stack<File> sourceFiles; /** * Maps object ID strings to the objects themselves. * * These are created during the second compilation pass. */ - protected Map<String, CompiledObject> objects; + protected final Map<String, CompiledObject> objects; /** * Maps objects to their ID strings. * * These are created during the second compilation pass. */ - protected Map<CompiledObject, String> ids; + protected final Map<CompiledObject, String> ids; /** default decodator to use if none specified */ protected CompiledObjectDecorator defaultDecorator; @@ -1027,7 +1027,7 @@ public class JAXXCompiler { return identCssFound; } - public void registerStyleSheetFile(File styleFile, boolean warnAutoCssImport) throws IOException { + public void registerStyleSheetFile(File styleFile, boolean warnAutoCssImport) { if (!identCssFound) { // detects if the given css file is ident to jaxx file diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXProfile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXProfile.java index d9261f7..e8f3c42 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXProfile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXProfile.java @@ -54,9 +54,9 @@ public class JAXXProfile { protected class CompilerEntry { - JAXXCompiler compiler; + final JAXXCompiler compiler; - SortedMap<String, Long> times; + final SortedMap<String, Long> times; public CompilerEntry(JAXXCompiler compiler) { this.compiler = compiler; @@ -66,11 +66,14 @@ public class JAXXProfile { public static class ProfileResult { - long min, max, average, total; + final long min; + final long max; + long average; + long total; - Map<JAXXCompiler, Long> delta; + final Map<JAXXCompiler, Long> delta; - List<Long> times; + final List<Long> times; ProfileResult(Map<JAXXCompiler, Long> delta) { this.delta = delta; @@ -110,9 +113,9 @@ public class JAXXProfile { } } - SortedMap<Integer, CompilerEntry> entries; + final SortedMap<Integer, CompilerEntry> entries; - List<JAXXCompiler> compilers; + final List<JAXXCompiler> compilers; public JAXXProfile() { compilers = new ArrayList<>(); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/SymbolTable.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/SymbolTable.java index ff46043..620a0ce 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/SymbolTable.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/SymbolTable.java @@ -37,11 +37,11 @@ public class SymbolTable { // maps ID strings to class names -- we can't map directly to CompiledObjects, because we // can't create those until after the first pass - private Map<String, String> ids = new HashMap<>(); + private final Map<String, String> ids = new HashMap<>(); - private List<FieldDescriptor> scriptFields = new ArrayList<>(); + private final List<FieldDescriptor> scriptFields = new ArrayList<>(); - private List<MethodDescriptor> scriptMethods = new ArrayList<>(); + private final List<MethodDescriptor> scriptMethods = new ArrayList<>(); private String[] interfaces; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXBeanInfo.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXBeanInfo.java index b0f4a21..0a4bb11 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXBeanInfo.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXBeanInfo.java @@ -31,11 +31,11 @@ import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; */ public class JAXXBeanInfo { - private JAXXBeanDescriptor beanDescriptor; + private final JAXXBeanDescriptor beanDescriptor; - private JAXXPropertyDescriptor[] propertyDescriptors; + private final JAXXPropertyDescriptor[] propertyDescriptors; - private JAXXEventSetDescriptor[] eventSetDescriptors; + private final JAXXEventSetDescriptor[] eventSetDescriptors; public JAXXBeanInfo(JAXXBeanDescriptor beanDescriptor, JAXXPropertyDescriptor[] propertyDescriptors, diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXEventSetDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXEventSetDescriptor.java index 76cafcd..88baa76 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXEventSetDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXEventSetDescriptor.java @@ -32,11 +32,11 @@ import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; */ public class JAXXEventSetDescriptor extends JAXXFeatureDescriptor { - private MethodDescriptor addListenerMethod; + private final MethodDescriptor addListenerMethod; - private MethodDescriptor removeListenerMethod; + private final MethodDescriptor removeListenerMethod; - private MethodDescriptor[] listenerMethods; + private final MethodDescriptor[] listenerMethods; public JAXXEventSetDescriptor(ClassDescriptor classDescriptor, String name, MethodDescriptor addListenerMethod, MethodDescriptor removeListenerMethod, MethodDescriptor[] listenerMethods) { diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXIntrospector.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXIntrospector.java index 92366d1..cbd97dd 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXIntrospector.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXIntrospector.java @@ -50,11 +50,11 @@ import java.util.Map; */ public class JAXXIntrospector { - private ClassDescriptor classDescriptor; + private final ClassDescriptor classDescriptor; - private Map<String, JAXXPropertyDescriptor> propertyDescriptors = new HashMap<>(); + private final Map<String, JAXXPropertyDescriptor> propertyDescriptors = new HashMap<>(); - private Map<String, JAXXEventSetDescriptor> eventSetDescriptors = new HashMap<>(); + private final Map<String, JAXXEventSetDescriptor> eventSetDescriptors = new HashMap<>(); private JAXXIntrospector(ClassDescriptor classDescriptor) { this.classDescriptor = classDescriptor; @@ -175,15 +175,11 @@ public class JAXXIntrospector { Method findExplicitBeanInfo = Introspector.class.getDeclaredMethod("findExplicitBeanInfo", Class.class); findExplicitBeanInfo.setAccessible(true); return (BeanInfo) findExplicitBeanInfo.invoke(null, beanClass); - } catch (ClassNotFoundException e) { + } catch (ClassNotFoundException | NoClassDefFoundError e) { return null; // happens for uncompiled classes - } catch (NoClassDefFoundError e) { - return null; // wrong case, etc. } catch (NoSuchMethodException e) { throw new RuntimeException("Error: could not find method 'findExplicitBeanInfo' in java.beans.Introspector. You are most likely running a version of Java against which JAXX has not been tested."); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { + } catch (InvocationTargetException | IllegalAccessException e) { throw new RuntimeException(e); } } diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataBinding.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataBinding.java index d0823e5..a5a67d4 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataBinding.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataBinding.java @@ -48,7 +48,7 @@ public class DataBinding { protected static final Log log = LogFactory.getLog(DataBinding.class); /** Id of the data binding */ - private String id; + private final String id; /** Real Id of the data binding (can be suffix by a number for css binding to avoid collisions) */ private String realId; @@ -57,16 +57,16 @@ public class DataBinding { protected String constantId; /** source of the data binding */ - private String source; + private final String source; /** * A Java snippet which will cause the destination property to be updated with the current value of * the binding. */ - private String assignment; + private final String assignment; /** A internal flag to */ - private boolean quickNoDependencies; + private final boolean quickNoDependencies; /** Compiled data source */ protected DataSource dataSource; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParser.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParser.java index 7c2d3d3..5a7c78c 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParser.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParser.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.compiler.css.parser; public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSParserConstants {/*@bgen(jjtree)*/ - protected JJTCSSParserState jjtree = new JJTCSSParserState(); + protected final JJTCSSParserState jjtree = new JJTCSSParserState(); public SimpleNode popNode() { if (jjtree.nodeArity() > 0) // number of child nodes @@ -71,7 +71,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa case 29: case 30: case 31: - ; break; default: jj_la1[0] = jj_gen; @@ -128,7 +127,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: - ; break; default: jj_la1[1] = jj_gen; @@ -141,7 +139,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa break; default: jj_la1[2] = jj_gen; - ; } } jj_consume_token(RIGHT_BRACE); @@ -185,7 +182,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case 28: - ; break; default: jj_la1[3] = jj_gen; @@ -239,7 +235,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa break; default: jj_la1[4] = jj_gen; - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case 31: @@ -247,7 +242,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa break; default: jj_la1[5] = jj_gen; - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PSEUDOCLASS_COLON: @@ -255,7 +249,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa break; default: jj_la1[6] = jj_gen; - ; } break; case 30: @@ -266,7 +259,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa break; default: jj_la1[7] = jj_gen; - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PSEUDOCLASS_COLON: @@ -274,7 +266,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa break; default: jj_la1[8] = jj_gen; - ; } break; case 31: @@ -285,7 +276,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa break; default: jj_la1[9] = jj_gen; - ; } break; case PSEUDOCLASS_COLON: @@ -411,7 +401,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa break; default: jj_la1[13] = jj_gen; - ; } } catch (Throwable jjte000) { if (jjtc000) { @@ -454,7 +443,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case 28: - ; break; default: jj_la1[14] = jj_gen; @@ -508,7 +496,6 @@ public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSPa break; default: jj_la1[15] = jj_gen; - ; } } finally { if (jjtc000) { diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/JJTCSSParserState.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/JJTCSSParserState.java index 91030ab..041debd 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/JJTCSSParserState.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/JJTCSSParserState.java @@ -25,9 +25,9 @@ package org.nuiton.jaxx.compiler.css.parser; class JJTCSSParserState { - private java.util.Stack<Node> nodes; + private final java.util.Stack<Node> nodes; - private java.util.Stack<Integer> marks; + private final java.util.Stack<Integer> marks; private int sp; // number of nodes on stack diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/Node.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/Node.java index a5c4716..9a0821c 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/Node.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/Node.java @@ -34,13 +34,13 @@ public interface Node { * This method is called after the node has been made the current * node. It indicates that child nodes can now be added to it. */ - public void jjtOpen(); + void jjtOpen(); /** * This method is called after all the child nodes have been * added. */ - public void jjtClose(); + void jjtClose(); /** * This pair of methods are used to inform the node of its @@ -48,9 +48,9 @@ public interface Node { * * @param n node */ - public void jjtSetParent(Node n); + void jjtSetParent(Node n); - public Node jjtGetParent(); + Node jjtGetParent(); /** * This method tells the node to add its argument to the node's @@ -59,15 +59,15 @@ public interface Node { * @param n node * @param i pos */ - public void jjtAddChild(Node n, int i); + void jjtAddChild(Node n, int i); /** * @param i pos * @return a child node. The children are numbered * from zero, left to right. */ - public Node jjtGetChild(int i); + Node jjtGetChild(int i); /** @return the number of children the node has. */ - public int jjtGetNumChildren(); + int jjtGetNumChildren(); } diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/SimpleNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/SimpleNode.java index d8123ac..bac5960 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/SimpleNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/SimpleNode.java @@ -29,7 +29,7 @@ public class SimpleNode implements Node { protected Node[] children; - protected int id; + protected final int id; protected CSSParser parser; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java index 8289a33..45a925d 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java @@ -50,7 +50,7 @@ import static org.nuiton.jaxx.compiler.java.JavaElementFactory.newArgument; public class HelpRootCompiledObjectDecorator extends DefaultCompiledObjectDecorator { /** the list of discovered helpId */ - protected static Set<String> helpIds = new HashSet<>(); + protected static final Set<String> helpIds = new HashSet<>(); @Override public String getName() { diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/ValidatorFinalizer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/ValidatorFinalizer.java index 4e4d8c9..e48a650 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/ValidatorFinalizer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/ValidatorFinalizer.java @@ -58,7 +58,7 @@ import java.util.List; public class ValidatorFinalizer extends AbstractFinalizer { /** Logger. */ - static Log log = LogFactory.getLog(ValidatorFinalizer.class); + static final Log log = LogFactory.getLog(ValidatorFinalizer.class); protected static final JavaField VALIDATOR_IDS_FIELD = JavaElementFactory.newField( diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaArgument.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaArgument.java index 986e10b..4ad2624 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaArgument.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaArgument.java @@ -31,7 +31,7 @@ public class JavaArgument extends JavaElement { private String type; - private boolean isFinal; + private final boolean isFinal; /** * Creates a new <code>JavaArgument</code> with the specified name and type. For example, the method <code>main()</code> diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaConstructor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaConstructor.java index dff5afd..f2411e6 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaConstructor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaConstructor.java @@ -39,13 +39,13 @@ import java.lang.reflect.Modifier; public class JavaConstructor extends JavaElement { /** arguments of the method (can be empty) */ - private JavaArgument[] arguments; + private final JavaArgument[] arguments; /** exceptions thrown by the method (can be empty) */ - private String[] exceptions; + private final String[] exceptions; /** body of the method (can be empty) */ - private String body; + private final String body; /** * Constructs a new <code>JavaMethod</code> containing the specified body code. The <code>modifiers</code> parameter diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaField.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaField.java index c8bc810..1d57e2a 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaField.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaField.java @@ -48,11 +48,11 @@ public class JavaField extends JavaElement implements Comparable<JavaField> { * * @since 2.4 */ - private String[] initializerTypes; + private final String[] initializerTypes; /** flag to known where a field overrides a super-field */ - private boolean override; + private final boolean override; /** * Constructs a new <code>JavaField</code>. The <code>modifiers</code> parameter is a bit mask of the @@ -201,7 +201,7 @@ public class JavaField extends JavaElement implements Comparable<JavaField> { private final String header; - private int modifier; + private final int modifier; FieldOrder(int modifier, String header) { this.header = JavaFileGenerator.getHeader(header); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaFile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaFile.java index 6f23ba5..d62415d 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaFile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaFile.java @@ -45,7 +45,7 @@ import java.util.Set; public class JavaFile extends JavaElement { /** Logger. */ - static Log log = LogFactory.getLog(JavaFile.class); + static final Log log = LogFactory.getLog(JavaFile.class); protected static final String GETTER_PATTERN = "return %1$s;"; @@ -61,13 +61,13 @@ public class JavaFile extends JavaElement { private List<JavaConstructor> constructors = new ArrayList<>(); - private List<JavaFile> innerClasses = new ArrayList<>(); + private final List<JavaFile> innerClasses = new ArrayList<>(); private String superClass; private List<String> interfaces; - private StringBuilder rawBodyCode = new StringBuilder(); + private final StringBuilder rawBodyCode = new StringBuilder(); private boolean superclassIsJAXXObject; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaMethod.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaMethod.java index cf2c7e6..fa56677 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaMethod.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaMethod.java @@ -43,16 +43,16 @@ public class JavaMethod extends JavaElement implements Comparable<JavaMethod> { private String returnType; /** arguments of the method (can be empty) */ - private JavaArgument[] arguments; + private final JavaArgument[] arguments; /** exceptions thrown by the method (can be empty) */ - private String[] exceptions; + private final String[] exceptions; /** body of the method (can be empty) */ private String body; /** flag to known if the method overrids a super-method */ - private boolean override; + private final boolean override; /** * Constructs a new <code>JavaMethod</code> containing the specified body code. The <code>modifiers</code> parameter @@ -261,7 +261,7 @@ public class JavaMethod extends JavaElement implements Comparable<JavaMethod> { private final String header; - private int modifier; + private final int modifier; MethodOrder(int modifier, String header) { this.header = JavaFileGenerator.getHeader(header); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JJTJavaParserState.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JJTJavaParserState.java index d4ddc70..fc8f161 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JJTJavaParserState.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JJTJavaParserState.java @@ -25,9 +25,9 @@ package org.nuiton.jaxx.compiler.java.parser; class JJTJavaParserState { - private java.util.Stack<Node> nodes; + private final java.util.Stack<Node> nodes; - private java.util.Stack<Integer> marks; + private final java.util.Stack<Integer> marks; private int sp; // number of nodes on stack diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParser.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParser.java index 2507f6a..80fdd63 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParser.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParser.java @@ -33,7 +33,7 @@ import java.io.FileInputStream; */ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, JavaParserConstants {/*@bgen(jjtree)*/ - protected JJTJavaParserState jjtree = new JJTJavaParserState(); + protected final JJTJavaParserState jjtree = new JJTJavaParserState(); /** Class to hold modifiers. */ static public final class ModifierSet { @@ -288,13 +288,11 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav if (jj_2_5(2147483647)) { PackageDeclaration(); } else { - ; } label_1: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IMPORT: - ; break; default: break label_1; @@ -320,7 +318,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav case VOLATILE: case SEMICOLON: case AT: - ; break; default: break label_2; @@ -332,14 +329,12 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav jj_consume_token(123); break; default: - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case STUFF_TO_IGNORE: jj_consume_token(STUFF_TO_IGNORE); break; default: - ; } jj_consume_token(0); } catch (Throwable jjte000) { @@ -422,7 +417,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav jj_consume_token(STATIC); break; default: - ; } Name(); switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -431,7 +425,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav jj_consume_token(STAR); break; default: - ; } jj_consume_token(SEMICOLON); } catch (Throwable jjte000) { @@ -478,7 +471,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav label_3: while (true) { if (jj_2_6(2)) { - ; } else { break label_3; } @@ -675,21 +667,18 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav TypeParameters(); break; default: - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case EXTENDS: ExtendsList(isInterface); break; default: - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IMPLEMENTS: ImplementsList(isInterface); break; default: - ; } ClassOrInterfaceBody(isInterface); } catch (Throwable jjte000) { @@ -734,7 +723,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_4; @@ -791,7 +779,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_5; @@ -848,7 +835,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav ImplementsList(false); break; default: - ; } EnumBody(); } catch (Throwable jjte000) { @@ -905,7 +891,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav label_6: while (true) { if (jj_2_7(2)) { - ; } else { break label_6; } @@ -914,14 +899,12 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav } break; default: - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: jj_consume_token(COMMA); break; default: - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: @@ -957,7 +940,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav case SEMICOLON: case AT: case LT: - ; break; default: break label_7; @@ -966,7 +948,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav } break; default: - ; } jj_consume_token(RBRACE); } catch (Throwable jjte000) { @@ -1011,14 +992,12 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav Arguments(); break; default: - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACE: ClassOrInterfaceBody(false); break; default: - ; } } catch (Throwable jjte000) { if (jjtc000) { @@ -1061,7 +1040,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_8; @@ -1111,7 +1089,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav TypeBound(); break; default: - ; } } catch (Throwable jjte000) { if (jjtc000) { @@ -1154,7 +1131,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case BIT_AND: - ; break; default: break label_9; @@ -1229,7 +1205,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav case SEMICOLON: case AT: case LT: - ; break; default: break label_10; @@ -1396,7 +1371,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_11; @@ -1447,7 +1421,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav VariableInitializer(); break; default: - ; } } catch (Throwable jjte000) { if (jjtc000) { @@ -1489,7 +1462,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACKET: - ; break; default: break label_12; @@ -1618,7 +1590,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav label_13: while (true) { if (jj_2_11(2)) { - ; } else { break label_13; } @@ -1627,14 +1598,12 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav } break; default: - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: jj_consume_token(COMMA); break; default: - ; } jj_consume_token(RBRACE); } catch (Throwable jjte000) { @@ -1677,7 +1646,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav TypeParameters(); break; default: - ; } ResultType(); MethodDeclarator(); @@ -1687,7 +1655,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav NameList(); break; default: - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACE: @@ -1764,7 +1731,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACKET: - ; break; default: break label_14; @@ -1835,7 +1801,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_15; @@ -1845,7 +1810,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav } break; default: - ; } jj_consume_token(RPAREN); } catch (Throwable jjte000) { @@ -1890,7 +1854,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav jj_consume_token(ELLIPSIS); break; default: - ; } VariableDeclaratorId(); } catch (Throwable jjte000) { @@ -1933,7 +1896,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav TypeParameters(); break; default: - ; } jj_consume_token(IDENTIFIER); FormalParameters(); @@ -1943,13 +1905,11 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav NameList(); break; default: - ; } jj_consume_token(LBRACE); if (jj_2_12(2147483647)) { ExplicitConstructorInvocation(); } else { - ; } // >>> -------------------------- Only keep one node with text for constructor body @@ -2029,7 +1989,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENTIFIER: - ; break; default: break label_17; @@ -2041,14 +2000,12 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav jj_consume_token(THIS); jj_consume_token(DOT); } else { - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LT: TypeArguments(); break; default: - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case THIS: @@ -2103,7 +2060,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav jj_consume_token(STATIC); break; default: - ; } Block(); } catch (Throwable jjte000) { @@ -2213,7 +2169,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav jj_consume_token(LBRACKET); jj_consume_token(RBRACKET); if (jj_2_15(2)) { - ; } else { break label_18; } @@ -2224,7 +2179,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav label_19: while (true) { if (jj_2_16(2)) { - ; } else { break label_19; } @@ -2275,12 +2229,10 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav if (jj_2_17(2)) { TypeArguments(); } else { - ; } label_20: while (true) { if (jj_2_18(2)) { - ; } else { break label_20; } @@ -2289,7 +2241,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav if (jj_2_19(2)) { TypeArguments(); } else { - ; } } } catch (Throwable jjte000) { @@ -2333,7 +2284,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_21; @@ -2389,7 +2339,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_21; @@ -2453,7 +2402,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav WildcardBounds(); break; default: - ; } break; default: @@ -2645,7 +2593,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav label_22: while (true) { if (jj_2_20(2)) { - ; } else { break label_22; } @@ -2672,7 +2619,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_23; @@ -2723,7 +2669,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav AssignmentOperator(); Expression(); } else { - ; } } catch (Throwable jjte000) { if (jjtc000) { @@ -2863,7 +2808,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav Expression(); break; default: - ; } } catch (Throwable jjte000) { if (jjtc000) { @@ -2905,7 +2849,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SC_OR: - ; break; default: break label_24; @@ -2953,7 +2896,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SC_AND: - ; break; default: break label_25; @@ -3001,7 +2943,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case BIT_OR: - ; break; default: break label_26; @@ -3049,7 +2990,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case XOR: - ; break; default: break label_27; @@ -3097,7 +3037,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case BIT_AND: - ; break; default: break label_28; @@ -3146,7 +3085,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case EQ: case NE: - ; break; default: break label_29; @@ -3206,7 +3144,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav Type(); break; default: - ; } } catch (Throwable jjte000) { if (jjtc000) { @@ -3251,7 +3188,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav case LE: case GE: case GT: - ; break; default: break label_30; @@ -3314,7 +3250,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav label_31: while (true) { if (jj_2_22(1)) { - ; } else { break label_31; } @@ -3375,7 +3310,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case MINUS: - ; break; default: break label_32; @@ -3435,7 +3369,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav case STAR: case SLASH: case REM: - ; break; default: break label_33; @@ -3837,7 +3770,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav PostfixOperator(); break; default: - ; } } catch (Throwable jjte000) { if (jjtc000) { @@ -3957,7 +3889,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav label_34: while (true) { if (jj_2_29(2)) { - ; } else { break label_34; } @@ -4052,7 +3983,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENTIFIER: - ; break; default: break label_35; @@ -4327,7 +4257,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav ArgumentList(); break; default: - ; } jj_consume_token(RPAREN); } catch (Throwable jjte000) { @@ -4370,7 +4299,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_36; @@ -4427,7 +4355,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav TypeArgumentsForAllocation(); break; default: - ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACKET: @@ -4440,7 +4367,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav ClassOrInterfaceBody(false); break; default: - ; } break; default: @@ -4499,7 +4425,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav Expression(); jj_consume_token(RBRACKET); if (jj_2_37(2)) { - ; } else { break label_37; } @@ -4507,7 +4432,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav label_38: while (true) { if (jj_2_38(2)) { - ; } else { break label_38; } @@ -4523,7 +4447,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav jj_consume_token(RBRACKET); switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACKET: - ; break; default: break label_39; @@ -4694,7 +4617,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav Expression(); break; default: - ; } jj_consume_token(SEMICOLON); } catch (Throwable jjte000) { @@ -4824,7 +4746,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav case AT: case INCR: case DECR: - ; break; default: break label_40; @@ -4962,7 +4883,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_41; @@ -5107,7 +5027,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case CASE: case _DEFAULT: - ; break; default: break label_42; @@ -5166,7 +5085,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav case AT: case INCR: case DECR: - ; break; default: break label_43; @@ -5270,7 +5188,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav Statement(); break; default: - ; } } catch (Throwable jjte000) { if (jjtc000) { @@ -5474,7 +5391,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav ForInit(); break; default: - ; } jj_consume_token(SEMICOLON); switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -5508,7 +5424,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav Expression(); break; default: - ; } jj_consume_token(SEMICOLON); switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -5538,7 +5453,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav ForUpdate(); break; default: - ; } break; default: @@ -5657,7 +5571,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_44; @@ -5742,7 +5655,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav jj_consume_token(IDENTIFIER); break; default: - ; } jj_consume_token(SEMICOLON); } finally { @@ -5766,7 +5678,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav jj_consume_token(IDENTIFIER); break; default: - ; } jj_consume_token(SEMICOLON); } finally { @@ -5816,7 +5727,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav Expression(); break; default: - ; } jj_consume_token(SEMICOLON); } catch (Throwable jjte000) { @@ -5938,7 +5848,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case CATCH: - ; break; default: break label_45; @@ -5955,7 +5864,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav Block(); break; default: - ; } } catch (Throwable jjte000) { if (jjtc000) { @@ -6102,7 +6010,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav MemberValuePairs(); break; default: - ; } jj_consume_token(RPAREN); } catch (Throwable jjte000) { @@ -6222,7 +6129,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: - ; break; default: break label_46; @@ -6383,7 +6289,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav label_47: while (true) { if (jj_2_47(2)) { - ; } else { break label_47; } @@ -6395,7 +6300,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav jj_consume_token(COMMA); break; default: - ; } jj_consume_token(RBRACE); } catch (Throwable jjte000) { @@ -6502,7 +6406,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav case IDENTIFIER: case SEMICOLON: case AT: - ; break; default: break label_48; @@ -6582,7 +6485,6 @@ public class JavaParser/*@bgen(jjtree)*/ implements JavaParserTreeConstants, Jav DefaultValue(); break; default: - ; } jj_consume_token(SEMICOLON); } else { diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTokenManager.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTokenManager.java index a8438d2..2f4394b 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTokenManager.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTokenManager.java @@ -1989,7 +1989,7 @@ public class JavaParserTokenManager implements JavaParserConstants { int curLexState = 0; - int defaultLexState = 0; + final int defaultLexState = 0; int jjnewStateCnt; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/ParseException.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/ParseException.java index 59bc494..7eecaff 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/ParseException.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/ParseException.java @@ -101,7 +101,7 @@ public class ParseException extends CompilerException { * this object and thereby affects the semantics of the * "getMessage" method (see below). */ - protected boolean specialConstructor; + protected final boolean specialConstructor; /** * This is the last token that has been consumed successfully. If @@ -184,7 +184,7 @@ public class ParseException extends CompilerException { } /** The end of line string for this machine. */ - protected String eol = System.getProperty("line.separator", "\n"); + protected final String eol = System.getProperty("line.separator", "\n"); /** * Used to convert raw characters to their escaped version diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/SimpleNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/SimpleNode.java index e709676..fe34319 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/SimpleNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/SimpleNode.java @@ -31,7 +31,7 @@ public class SimpleNode implements Node { protected Node[] children; - protected int id; + protected final int id; protected JavaParser parser; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptor.java index e4a6267..cb5a480 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptor.java @@ -42,31 +42,31 @@ public abstract class ClassDescriptor { public static final FieldDescriptor[] EMPTY_FIELD_DESCRIPTORS_ARRAY = new FieldDescriptor[0]; - private String name; + private final String name; - private String packageName; + private final String packageName; - private String superclass; + private final String superclass; - private String[] interfaces; + private final String[] interfaces; - private boolean isInterface; + private final boolean isInterface; - private boolean isArray; + private final boolean isArray; - private String componentType; + private final String componentType; - private JAXXObjectDescriptor jaxxObjectDescriptor; + private final JAXXObjectDescriptor jaxxObjectDescriptor; - private ClassLoader classLoader; + private final ClassLoader classLoader; - private MethodDescriptor[] constructorDescriptors; + private final MethodDescriptor[] constructorDescriptors; - private MethodDescriptor[] methodDescriptors; + private final MethodDescriptor[] methodDescriptors; - private FieldDescriptor[] fieldDescriptors; + private final FieldDescriptor[] fieldDescriptors; - protected FieldDescriptor[] declaredFieldDescriptors; + protected final FieldDescriptor[] declaredFieldDescriptors; protected final ClassDescriptorHelper.ResolverType resolverType; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorHelper.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorHelper.java index 98daf67..52b2f82 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorHelper.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorHelper.java @@ -76,7 +76,7 @@ public class ClassDescriptorHelper { private static boolean SHOW_LOADING = log.isDebugEnabled(); - private static Map<String, ClassDescriptor> descriptors = + private static final Map<String, ClassDescriptor> descriptors = new HashMap<>(); private static Map<ResolverType, ClassDescriptorResolver> descriptorResolvers; @@ -96,7 +96,7 @@ public class ClassDescriptorHelper { } public static boolean isAssignableFrom(ClassDescriptor classDescriptor, - Class<?> awareClass) throws ClassNotFoundException { + Class<?> awareClass) { ClassDescriptor awareDescriptor = getClassDescriptor(awareClass); return awareDescriptor.isAssignableFrom(classDescriptor); } diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorResolver.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorResolver.java index 052d899..1947ff1 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorResolver.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorResolver.java @@ -36,7 +36,7 @@ public abstract class ClassDescriptorResolver { private ClassLoader classLoader; - private ClassDescriptorHelper.ResolverType resolverType; + private final ClassDescriptorHelper.ResolverType resolverType; protected ClassDescriptorResolver(ClassDescriptorHelper.ResolverType resolverType) { this.resolverType = resolverType; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/FieldDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/FieldDescriptor.java index 2c1805d..58f33fe 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/FieldDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/FieldDescriptor.java @@ -30,7 +30,7 @@ package org.nuiton.jaxx.compiler.reflect; */ public class FieldDescriptor extends MemberDescriptor { - private String type; + private final String type; public FieldDescriptor(String name, int modifiers, String type, ClassLoader classLoader) { super(name, modifiers, classLoader); @@ -40,8 +40,6 @@ public class FieldDescriptor extends MemberDescriptor { public ClassDescriptor getType() { try { return ClassDescriptorHelper.getClassDescriptor(type, getClassLoader()); - } catch (ClassNotFoundException e) { - throw new RuntimeException("Type not found for field " + this, e); } catch (Exception e) { throw new RuntimeException("Type not found for field " + this, e); } diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MemberDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MemberDescriptor.java index 3cf4b9b..27a80ad 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MemberDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MemberDescriptor.java @@ -30,11 +30,11 @@ package org.nuiton.jaxx.compiler.reflect; */ public abstract class MemberDescriptor { - private String name; + private final String name; - private int modifiers; + private final int modifiers; - private ClassLoader classLoader; + private final ClassLoader classLoader; MemberDescriptor(String name, int modifiers, ClassLoader classLoader) { this.name = name; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MethodDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MethodDescriptor.java index dabc5ca..5ddb0eb 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MethodDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MethodDescriptor.java @@ -34,9 +34,9 @@ import java.util.Arrays; */ public class MethodDescriptor extends MemberDescriptor { - private String returnType; + private final String returnType; - private String[] parameterTypes; + private final String[] parameterTypes; public MethodDescriptor(String name, int modifiers, String returnType, String[] parameterTypes, ClassLoader classLoader) { super(name, modifiers, classLoader); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java index 895c08f..e74b859 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java @@ -162,7 +162,7 @@ public class ClassDescriptorResolverFromJavaFile extends ClassDescriptorResolver * FIXME-TC20100504 We should remove this link : should not need of a * compiler to parse a java files. */ - private JAXXCompiler compiler; + private final JAXXCompiler compiler; /** fully qualified name of the class */ private String className; @@ -186,21 +186,21 @@ public class ClassDescriptorResolverFromJavaFile extends ClassDescriptorResolver private boolean isInterface; /** set of fully qualified names of interfaces of the class. */ - private Set<String> interfaces; + private final Set<String> interfaces; /** public methods of the class */ - private List<MethodDescriptor> methods; + private final List<MethodDescriptor> methods; - private List<MethodDescriptor> constructors; + private final List<MethodDescriptor> constructors; /** none public methods of the class */ // private List<MethodDescriptor> declaredMethods; /** public fields of the class */ - private List<FieldDescriptor> fields; + private final List<FieldDescriptor> fields; /** none public fields of the class */ - private List<FieldDescriptor> declaredFields; + private final List<FieldDescriptor> declaredFields; /** * If sets, compressed value of the $jaxxObjectDescriptor field, this means diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/script/ScriptManager.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/script/ScriptManager.java index 5587f82..8b33072 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/script/ScriptManager.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/script/ScriptManager.java @@ -45,7 +45,7 @@ import java.util.List; public class ScriptManager { - private JAXXCompiler compiler; + private final JAXXCompiler compiler; public ScriptManager(JAXXCompiler compiler) { this.compiler = compiler; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultObjectHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultObjectHandler.java index ae403ce..ce59896 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultObjectHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultObjectHandler.java @@ -122,7 +122,7 @@ public class DefaultObjectHandler implements TagHandler { public static final String BORDER_LAYOUT_PREFIX = BorderLayout.class.getSimpleName() + "("; /** The class that this handler provides support for. */ - private ClassDescriptor beanClass; + private final ClassDescriptor beanClass; /** The JAXXBeanInfo for the beanClass. */ protected JAXXBeanInfo jaxxBeanInfo; @@ -137,7 +137,7 @@ public class DefaultObjectHandler implements TagHandler { private Map<String, ProxyEventInfo> eventInfos; /** Maps XML tags to the CompiledObjects created from them. */ - protected static Map<Element, CompiledObject> objectMap = new WeakHashMap<>(); + protected static final Map<Element, CompiledObject> objectMap = new WeakHashMap<>(); public ProxyEventInfo getEventInfo(String memberName) { return eventInfos != null ? eventInfos.get(memberName) : null; @@ -260,7 +260,7 @@ public class DefaultObjectHandler implements TagHandler { * @return the class' <code>JAXXBeanInfo</code> * @throws IntrospectionException if any pb */ - public static JAXXBeanInfo getJAXXBeanInfo(ClassDescriptor beanClass) throws IntrospectionException { + public static JAXXBeanInfo getJAXXBeanInfo(ClassDescriptor beanClass) { return JAXXIntrospector.getJAXXBeanInfo(beanClass); } @@ -829,8 +829,6 @@ public class DefaultObjectHandler implements TagHandler { ); setProperty(object, propertyName, value, compiler); return; - } catch (NumberFormatException e) { - compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); } catch (IllegalArgumentException e) { compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); } catch (ClassNotFoundException e) { @@ -925,8 +923,6 @@ public class DefaultObjectHandler implements TagHandler { ); setProperty(object, propertyName, value, compiler); return; - } catch (NumberFormatException e) { - compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); } catch (IllegalArgumentException e) { compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); } catch (ClassNotFoundException e) { diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagManager.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagManager.java index 8a5d123..2158d2b 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagManager.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagManager.java @@ -47,15 +47,15 @@ public class TagManager { protected static final Log log = LogFactory.getLog(TagManager.class); /** Maps simple tag names to their default namespaces (package names). */ - private static Map<String, String> defaultNamespaces = + private static final Map<String, String> defaultNamespaces = new HashMap<>(); /** Maps qualified tag names to the TagHandlers responsible for processing them. */ - private static Map<QName, TagHandler> registeredTags = + private static final Map<QName, TagHandler> registeredTags = new HashMap<>(); /** Keeps track of whether or not named classes exist. */ - private static Map<String, Boolean> classExistenceCache = + private static final Map<String, Boolean> classExistenceCache = new HashMap<>(); /** @@ -65,7 +65,7 @@ public class TagManager { * TagHandler (assuming no more specific mappings exist), which requires * creating a new instance of the TagHandler. */ - private static ClassMap<Class<? extends TagHandler>> registeredBeans = + private static final ClassMap<Class<? extends TagHandler>> registeredBeans = new ClassMap<>(); // still targeting 1.4, so I can't use javax.xml.namespace.QName @@ -295,13 +295,7 @@ public class TagManager { registerTag(namespace, tag, handler); } return handler; - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (NoSuchMethodException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InvocationTargetException e) { + } catch (InstantiationException | InvocationTargetException | IllegalAccessException | NoSuchMethodException e) { throw new RuntimeException(e); } } @@ -316,12 +310,8 @@ public class TagManager { try { Class.forName(className, true, classLoader); found = true; - } catch (ClassNotFoundException e) { + } catch (ClassNotFoundException | NoClassDefFoundError e) { // ignore ? - } catch (NoClassDefFoundError e) { - // we obtain this instead of ClassNotFoundException on - // case-insensitive file systems when looking up a class with the - // wrong case } if (!found) { diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CompiledItemContainer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CompiledItemContainer.java index d732767..52d679f 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CompiledItemContainer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CompiledItemContainer.java @@ -37,7 +37,7 @@ class CompiledItemContainer extends CompiledObject { private List<Item> items = new ArrayList<>(); - private Stack<Item> openNodes = new Stack<>(); + private final Stack<Item> openNodes = new Stack<>(); public CompiledItemContainer(String id, ClassDescriptor objectClass, JAXXCompiler compiler) throws CompilerException { super(id, objectClass, compiler); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ItemHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ItemHandler.java index f59bf38..cb690cc 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ItemHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ItemHandler.java @@ -43,7 +43,7 @@ public class ItemHandler implements TagHandler { public static final String TAG_NAME = "item"; - private String DATA_BINDING = "<data binding has not been processed yet>"; + private final String DATA_BINDING = "<data binding has not been processed yet>"; public static final String ATTRIBUTE_ID = "id"; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSpinnerHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSpinnerHandler.java index e87fea8..8819203 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSpinnerHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSpinnerHandler.java @@ -36,11 +36,11 @@ import javax.swing.event.ChangeListener; public class JSpinnerHandler extends DefaultComponentHandler { - public static String MINIMUM_PROPERTY = "minimum"; + public static final String MINIMUM_PROPERTY = "minimum"; - public static String MAXIMUM_PROPERTY = "maximum"; + public static final String MAXIMUM_PROPERTY = "maximum"; - public static String VALUE_PROPERTY = "value"; + public static final String VALUE_PROPERTY = "value"; public JSpinnerHandler(ClassDescriptor beanClass) { super(beanClass); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TableHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TableHandler.java index 85a7190..82b3089 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TableHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TableHandler.java @@ -80,9 +80,9 @@ public class TableHandler extends DefaultComponentHandler { class CompiledTable extends CompiledObject { - private List<Integer> rowSpans = new ArrayList<>(); + private final List<Integer> rowSpans = new ArrayList<>(); - private GridBagConstraints tableConstraints; + private final GridBagConstraints tableConstraints; private GridBagConstraints rowConstraints; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/BeanValidatorHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/BeanValidatorHandler.java index 22599b2..7fbd8a7 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/BeanValidatorHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/BeanValidatorHandler.java @@ -94,12 +94,12 @@ public class BeanValidatorHandler extends DefaultObjectHandler { public static final String PARENT_VALIDATOR_ATTRIBUTE = "parentValidator"; /** Logger */ - static Log log = LogFactory.getLog(BeanValidatorHandler.class); + static final Log log = LogFactory.getLog(BeanValidatorHandler.class); - protected static Map<JAXXCompiler, List<CompiledBeanValidator>> validators = + protected static final Map<JAXXCompiler, List<CompiledBeanValidator>> validators = new HashMap<>(); - protected static Map<JAXXCompiler, List<String>> validatedComponents = + protected static final Map<JAXXCompiler, List<String>> validatedComponents = new HashMap<>(); public BeanValidatorHandler(ClassDescriptor beanClass) { @@ -218,14 +218,14 @@ public class BeanValidatorHandler extends DefaultObjectHandler { * * Keys are editors, Values are bean properties. */ - protected Multimap<String, String> fields; + protected final Multimap<String, String> fields; /** * Map of field to exclude. * * Keys are bean properties, Values are editors. */ - protected Map<String, String> excludeFields; + protected final Map<String, String> excludeFields; protected String bean; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java index a5becfb..062c5e7 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java @@ -44,7 +44,7 @@ public class ExcludeFieldValidatorHandler implements TagHandler { public static final String COMPONENT_ATTRIBUTE = "component"; /** Logger */ - static private Log log = LogFactory.getLog(ExcludeFieldValidatorHandler.class); + static private final Log log = LogFactory.getLog(ExcludeFieldValidatorHandler.class); @Override public void compileFirstPass(Element tag, diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/FieldValidatorHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/FieldValidatorHandler.java index 3960847..55790b1 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/FieldValidatorHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/FieldValidatorHandler.java @@ -46,7 +46,7 @@ public class FieldValidatorHandler implements TagHandler { public static final String COMPONENT_ATTRIBUTE = "component"; /** Logger */ - static private Log log = LogFactory.getLog(FieldValidatorHandler.class); + static private final Log log = LogFactory.getLog(FieldValidatorHandler.class); public void compileFirstPass(Element tag, JAXXCompiler compiler) throws CompilerException, IOException { diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java index 754288f..ee34cbc 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; public abstract class AbstractContextNode implements ContextNode { - private List<ContextNode> arguments = new ArrayList<>(); + private final List<ContextNode> arguments = new ArrayList<>(); @Override diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/CapturedObject.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/CapturedObject.java index e817221..ec428b1 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/CapturedObject.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/CapturedObject.java @@ -31,26 +31,26 @@ import java.util.LinkedHashMap; import java.util.Map; public class CapturedObject extends AbstractContextNode { - private String className; + private final String className; - private ObjectHandler handler; + private final ObjectHandler handler; /** Maps children to their constraints. */ - private Map<CapturedObject, ContextNode> children = new LinkedHashMap<>(); + private final Map<CapturedObject, ContextNode> children = new LinkedHashMap<>(); private CapturedObject parent; - private Map<String, String> properties = new LinkedHashMap<>(); + private final Map<String, String> properties = new LinkedHashMap<>(); - private Map<String, Object> additionalData = new HashMap<>(); + private final Map<String, Object> additionalData = new HashMap<>(); - private StringBuilder innerXML = new StringBuilder(); + private final StringBuilder innerXML = new StringBuilder(); - private StringBuilder script = new StringBuilder(); + private final StringBuilder script = new StringBuilder(); private boolean inlineable = true; - private JAXXCapture capture; + private final JAXXCapture capture; public CapturedObject(ObjectHandler handler, String className, JAXXCapture capture) { this.handler = handler; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java index e52eeb1..d82fd62 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java @@ -71,7 +71,7 @@ import java.util.jar.Manifest; public class JAXXCapture { - private static ClassMap<Object> objectHandlers = new ClassMap<>(); + private static final ClassMap<Object> objectHandlers = new ClassMap<>(); static { //TODO make a serviceLoader mecanism to allow inter-module loading @@ -84,9 +84,9 @@ public class JAXXCapture { } } - private Map<String, Object> sourceObjects = new HashMap<>(); + private final Map<String, Object> sourceObjects = new HashMap<>(); - private Map<String, CapturedObject> capturedObjects = new HashMap<>(); + private final Map<String, CapturedObject> capturedObjects = new HashMap<>(); private ClassLoader classLoader; @@ -94,7 +94,7 @@ public class JAXXCapture { private static class CaptureEventQueue extends EventQueue { - private ClassLoader classLoader; + private final ClassLoader classLoader; private CaptureEventQueue(ClassLoader classLoader) { this.classLoader = classLoader; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/LiteralNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/LiteralNode.java index eff19fa..ddc61b1 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/LiteralNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/LiteralNode.java @@ -23,9 +23,9 @@ package org.nuiton.jaxx.compiler.tools.jaxxcapture; public class LiteralNode extends AbstractContextNode { - private String javaCode; + private final String javaCode; - private Object value; + private final Object value; public LiteralNode(String javaCode, Object value) { this.javaCode = javaCode; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/MethodNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/MethodNode.java index b028ba5..8cf4be3 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/MethodNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/MethodNode.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.compiler.tools.jaxxcapture; public class MethodNode extends AbstractContextNode { - private String methodName; + private final String methodName; public MethodNode(String methodName) { this.methodName = methodName; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/PropertyNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/PropertyNode.java index 6cfbeba..5c06a00 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/PropertyNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/PropertyNode.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.compiler.tools.jaxxcapture; public class PropertyNode extends AbstractContextNode { - private String property; + private final String property; public PropertyNode(String property) { this.property = property; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/ValueNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/ValueNode.java index 0213e1c..f816f0e 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/ValueNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/ValueNode.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.compiler.tools.jaxxcapture; public class ValueNode extends AbstractContextNode { - private Object value; + private final Object value; public ValueNode(Object value) { this.value = value; diff --git a/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/binding/JavaParserUtilTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/binding/JavaParserUtilTest.java index b29bd25..4b8ca36 100644 --- a/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/binding/JavaParserUtilTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/binding/JavaParserUtilTest.java @@ -47,9 +47,9 @@ public class JavaParserUtilTest { */ private static final Log log = LogFactory.getLog(JavaParserUtilTest.class); - Map<SimpleNode, List<SimpleNode>> store = new LinkedHashMap<>(); - Map<SimpleNode, List<SimpleNode>> casts = new LinkedHashMap<>(); - List<SimpleNode> literals = new ArrayList<>(); + final Map<SimpleNode, List<SimpleNode>> store = new LinkedHashMap<>(); + final Map<SimpleNode, List<SimpleNode>> casts = new LinkedHashMap<>(); + final List<SimpleNode> literals = new ArrayList<>(); Set<String> requirements; Iterator<SimpleNode> simpleNodeIterator; Iterator<String> requirementsIterator; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUIHandler.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUIHandler.java index 952148a..cde0f98 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUIHandler.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUIHandler.java @@ -170,21 +170,17 @@ public class ConfigCallBackUIHandler { parent.dispose(); } - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - - List<CallBackEntry> callBacks; - callBacks = ui.getContextValue( - List.class, - ConfigUIHandler.CALLBACKS); - for (CallBackEntry e : callBacks) { - if (log.isInfoEnabled()) { - log.info("launch callBack " + t(e.getDescription())); - } - e.getAction().run(); + SwingUtilities.invokeLater(() -> { + + List<CallBackEntry> callBacks; + callBacks = ui.getContextValue( + List.class, + ConfigUIHandler.CALLBACKS); + for (CallBackEntry e : callBacks) { + if (log.isInfoEnabled()) { + log.info("launch callBack " + t(e.getDescription())); } + e.getAction().run(); } }); } diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java index d28b723..061bcef 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java @@ -54,7 +54,7 @@ public class ConfigTableEditor implements TableCellEditor { protected TableCellEditor delegate; - protected ConfigTableModel model; + protected final ConfigTableModel model; public ConfigTableEditor(ConfigTableModel model) { this.model = model; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java index 1071629..480e3fe 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java @@ -25,7 +25,6 @@ package org.nuiton.jaxx.config; import org.nuiton.jaxx.runtime.JAXXUtil; import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; -import org.nuiton.jaxx.config.model.CallBackEntry; import org.nuiton.jaxx.config.model.CallBackMap; import org.nuiton.jaxx.config.model.CategoryModel; import org.nuiton.jaxx.config.model.ConfigUIModel; @@ -92,7 +91,7 @@ public class ConfigUIHandler { * * @since 2.6 */ - public static interface ChangeCategoryCallBack { + public interface ChangeCategoryCallBack { boolean canChangeCategory(String categoryName); } @@ -288,13 +287,7 @@ public class ConfigUIHandler { parentContainer.remove(ui); parentContainer.add(lastUI); - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - parentContainer.validate(); - } - }); + SwingUtilities.invokeLater(parentContainer::validate); } }; } diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackEntry.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackEntry.java index 9740af5..59d92e5 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackEntry.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackEntry.java @@ -38,7 +38,7 @@ public class CallBackEntry { protected final String description; protected final Icon icon; protected final Runnable action; - protected List<OptionModel> options; + protected final List<OptionModel> options; public CallBackEntry(String name, String description, diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBacksManager.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBacksManager.java index f991989..63dd299 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBacksManager.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBacksManager.java @@ -36,7 +36,7 @@ import java.util.Map; public class CallBacksManager { /** lists of registred callback. */ - protected List<CallBackEntry> callbacks; + protected final List<CallBackEntry> callbacks; /** optional callbacks finalizer */ protected CallBackFinalizer finalizer; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java index a4464d7..039965f 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java @@ -52,16 +52,16 @@ public class CategoryModel implements Iterable<OptionModel>, Serializable { public static final String VALID_PROPERTY_NAME = "valid"; /** category short name (i18n key) */ - protected String category; + protected final String category; /** category long name (i18n key) */ - protected String categoryLabel; + protected final String categoryLabel; /** options of the category */ - protected List<OptionModel> entries; + protected final List<OptionModel> entries; /** suport of modification */ - protected PropertyChangeSupport pcs = new PropertyChangeSupport(this); + protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); protected CategoryModel(String category, String categoryLabel) { this.category = category; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigTableModel.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigTableModel.java index 4d0d610..d7559ba 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigTableModel.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigTableModel.java @@ -26,8 +26,6 @@ import org.apache.commons.lang3.StringUtils; import org.nuiton.converter.ConverterUtil; import javax.swing.table.AbstractTableModel; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; /** * le modele du tableau d'options pour une categorie donnee. @@ -51,13 +49,7 @@ public class ConfigTableModel extends AbstractTableModel { this.categoryModel = categoryModel; // listen of property reload of the category model // to known when to refresh table - this.categoryModel.addPropertyChangeListener(CategoryModel.RELOAD_PROPERTY_NAME, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - fireTableDataChanged(); - } - }); + this.categoryModel.addPropertyChangeListener(CategoryModel.RELOAD_PROPERTY_NAME, evt -> fireTableDataChanged()); } public CategoryModel getCategoryModel() { diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java index 6dad48c..1176e21 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java @@ -97,7 +97,7 @@ public class ConfigUIModel implements Iterable<CategoryModel> { protected boolean standalone; /** Callbacks manager */ - protected CallBacksManager callBacksManager; + protected final CallBacksManager callBacksManager; /** * optional action to execute (if not null) if no call backs fits. diff --git a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfig.java b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfig.java index 6850089..5d28b05 100644 --- a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfig.java +++ b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfig.java @@ -30,7 +30,6 @@ import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ConfigOptionDef; import java.awt.Color; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Date; import java.util.Locale; @@ -86,20 +85,16 @@ public class MyDelegateConfig extends AbstractBean implements Supplier<Applicati } } - protected final PropertyChangeListener saveAction = new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (isAdjusting()) { - if (log.isDebugEnabled()) { - log.debug("skip save while adjusting"); - } - } else { - if (log.isDebugEnabled()) { - log.debug("Saving configuration at " + new Date()); - } - saveForUser(); + protected final PropertyChangeListener saveAction = evt -> { + if (isAdjusting()) { + if (log.isDebugEnabled()) { + log.debug("skip save while adjusting"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("Saving configuration at " + new Date()); } + saveForUser(); } }; diff --git a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfigTest.java b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfigTest.java index 1b75e72..35ecef2 100644 --- a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfigTest.java +++ b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfigTest.java @@ -100,11 +100,7 @@ public class MyDelegateConfigTest { @Test(expected = NullPointerException.class) public void testRegisterCallbackLimitCase4() throws Exception { - Runnable callback = new Runnable() { - - @Override - public void run() { - } + Runnable callback = () -> { }; builder.createModel(config) .registerCallBack("yo", "yo description", null, callback); @@ -112,11 +108,7 @@ public class MyDelegateConfigTest { @Test public void testRegisterCallback() throws Exception { - Runnable callback = new Runnable() { - - @Override - public void run() { - } + Runnable callback = () -> { }; ImageIcon icon = SwingUtil.createActionIcon("add"); ConfigUIModel configModel = builder.createModel(config) diff --git a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfig.java b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfig.java index 2af222a..e3c7a25 100644 --- a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfig.java +++ b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfig.java @@ -28,7 +28,6 @@ import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ConfigOptionDef; import java.awt.Color; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Date; import java.util.Locale; @@ -65,21 +64,17 @@ public class MyInheritedConfig extends ApplicationConfig { // */ // protected boolean adjusting; - protected final PropertyChangeListener saveAction = new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (isAdjusting()) { - if (log.isDebugEnabled()) { - log.debug("skip save while adjusting"); - } - return; - } + protected final PropertyChangeListener saveAction = evt -> { + if (isAdjusting()) { if (log.isDebugEnabled()) { - log.debug("Saving configuration at " + new Date()); + log.debug("skip save while adjusting"); } - saveForUser(); + return; + } + if (log.isDebugEnabled()) { + log.debug("Saving configuration at " + new Date()); } + saveForUser(); }; @Override diff --git a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfigTest.java b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfigTest.java index f67efe3..bf7103b 100644 --- a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfigTest.java +++ b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfigTest.java @@ -99,11 +99,7 @@ public class MyInheritedConfigTest { @Test(expected = NullPointerException.class) public void testRegisterCallbackLimitCase4() throws Exception { - Runnable callback = new Runnable() { - - @Override - public void run() { - } + Runnable callback = () -> { }; builder.createModel(config) .registerCallBack("yo", "yo description", null, callback); @@ -112,11 +108,7 @@ public class MyInheritedConfigTest { @Test public void testRegisterCallback() throws Exception { - Runnable callback = new Runnable() { - - @Override - public void run() { - } + Runnable callback = () -> { }; ImageIcon icon = SwingUtil.createActionIcon("add"); ConfigUIModel configModel = builder diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java index 299084f..945ecc1 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java @@ -150,13 +150,9 @@ public class DemoSourcesHandler implements UIHandler<DemoSources> { //fontSizor.setDefaultFontSize(getConfig().getFontSize()); final FontSizor fontSizor = ui.getFontSizor(); fontSizor.init(); - fontSizor.setCallBack(new Runnable() { - - @Override - public void run() { - log.info("update font size : " + fontSizor.getFontSize()); - ui.getConfig().setFontSize(fontSizor.getFontSize()); - } + fontSizor.setCallBack(() -> { + log.info("update font size : " + fontSizor.getFontSize()); + ui.getConfig().setFontSize(fontSizor.getFontSize()); }); } diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java index cdfa344..2d6ffb7 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java @@ -49,14 +49,11 @@ import javax.swing.JPanel; import javax.swing.JTree; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; -import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; import java.awt.Component; import java.awt.Desktop; import java.awt.event.ActionEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.lang.reflect.Constructor; import java.net.URL; import java.util.Arrays; @@ -74,13 +71,42 @@ import static org.nuiton.i18n.I18n.t; public class DemoUIHandler implements UIHandler<DemoUI> { /** Logger */ - static private Log log = LogFactory.getLog(DemoUIHandler.class); + static private final Log log = LogFactory.getLog(DemoUIHandler.class); static final JAXXContextEntryDef<DemoUI> MAIN_UI_ENTRY_DEF = JAXXUtil.newContextEntryDef("mainui", DemoUI.class); public static final String OPEN_CONFIG_ACTION = "openConfig"; + public DemoUIHandler() { + reloadUICallback = () -> { + if (log.isInfoEnabled()) { + log.info("will reload ui"); + } + DefaultApplicationContext context = DemoApplicationContext.get(); + DemoUI ui = getUI(context); + DemoConfig config = ui.getConfig(); + reloadUI(context, config); + }; + reloadApplicationCallback = () -> { + if (log.isInfoEnabled()) { + log.info("will reload appplication"); + } + close(DemoApplicationContext.get()); + }; + reloadLogAppenderCallback = () -> { + if (log.isInfoEnabled()) { + log.info("will reload log appender"); + } + DefaultApplicationContext context = DemoApplicationContext.get(); + DemoUI ui = getUI(context); + DemoConfig config = ui.getConfig(); + + // init jaxx logger + JAXXLog4jUI.init(config.getLogLevel(), config.getLogPatternLayout()); + }; + } + /** * Methode pour initialiser l'ui principale sans l'afficher. * @@ -156,14 +182,10 @@ public class DemoUIHandler implements UIHandler<DemoUI> { } }); final InputMap inputMap = mainPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - config.addPropertyChangeListener(DemoConfig.PROPERTY_KEY_OPEN_CONFIG, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - KeyStroke oldValue = (KeyStroke) evt.getOldValue(); - inputMap.remove(oldValue); - setShowConfigInputMap(inputMap, (KeyStroke) evt.getNewValue()); - } + config.addPropertyChangeListener(DemoConfig.PROPERTY_KEY_OPEN_CONFIG, evt -> { + KeyStroke oldValue = (KeyStroke) evt.getOldValue(); + inputMap.remove(oldValue); + setShowConfigInputMap(inputMap, (KeyStroke) evt.getNewValue()); }); setShowConfigInputMap(inputMap, config.getKeyOpenConfig()); } @@ -181,23 +203,20 @@ public class DemoUIHandler implements UIHandler<DemoUI> { public void afterInit(final DemoUI ui) { // Creation of selection listener to open ui when tree selection change - TreeSelectionListener listener = new TreeSelectionListener() { - @Override - public void valueChanged(TreeSelectionEvent event) { - TreePath path = event.getPath(); - DemoNode node = (DemoNode) path.getLastPathComponent(); + TreeSelectionListener listener = event -> { + TreePath path = event.getPath(); + DemoNode node = (DemoNode) path.getLastPathComponent(); - if (log.isDebugEnabled()) { - log.debug("Select node " + node); - } + if (log.isDebugEnabled()) { + log.debug("Select node " + node); + } - if (node == null || node.isStringNode()) { + if (node == null || node.isStringNode()) { - // noeud de présentation, rien a faire - return; - } - showUI(ui, node.getInternalClass()); + // noeud de présentation, rien a faire + return; } + showUI(ui, node.getInternalClass()); }; JTree tree = ui.getNavigation(); @@ -267,40 +286,32 @@ public class DemoUIHandler implements UIHandler<DemoUI> { // expend all nodes of the demo tree SwingUtil.expandTree(ui.getNavigation()); - SwingUtilities.invokeLater(new Runnable() { + SwingUtilities.invokeLater(() -> { - @Override - public void run() { + String[] path; + if (nodePath == null) { + // take first node + path = new String[]{"jaxxdemo.tree"}; + } else { + // take selected node + path = nodePath; - String[] path; - if (nodePath == null) { - // take first node - path = new String[]{"jaxxdemo.tree"}; - } else { - // take selected node - path = nodePath; - - } - log.info("node to re select " + Arrays.toString(path)); - // select node - ui.getTreeHelper().selectNode(path); - - // use best dimensions - ui.getSplitPane().resetToPreferredSizes(); } + log.info("node to re select " + Arrays.toString(path)); + // select node + ui.getTreeHelper().selectNode(path); + + // use best dimensions + ui.getSplitPane().resetToPreferredSizes(); }); // show ui after all (in another invocation, tu avoid layout adjustement // to be seen). - SwingUtilities.invokeLater(new Runnable() { + SwingUtilities.invokeLater(() -> { - @Override - public void run() { - - // show ui - ui.setVisible(true); - } + // show ui + ui.setVisible(true); }); } @@ -393,46 +404,11 @@ public class DemoUIHandler implements UIHandler<DemoUI> { } } - final Runnable reloadUICallback = new Runnable() { + final Runnable reloadUICallback; - @Override - public void run() { - if (log.isInfoEnabled()) { - log.info("will reload ui"); - } - DefaultApplicationContext context = DemoApplicationContext.get(); - DemoUI ui = getUI(context); - DemoConfig config = ui.getConfig(); - reloadUI(context, config); - } - }; + final Runnable reloadApplicationCallback; - final Runnable reloadApplicationCallback = new Runnable() { - - @Override - public void run() { - if (log.isInfoEnabled()) { - log.info("will reload appplication"); - } - close(DemoApplicationContext.get()); - } - }; - - final Runnable reloadLogAppenderCallback = new Runnable() { - - @Override - public void run() { - if (log.isInfoEnabled()) { - log.info("will reload log appender"); - } - DefaultApplicationContext context = DemoApplicationContext.get(); - DemoUI ui = getUI(context); - DemoConfig config = ui.getConfig(); - - // init jaxx logger - JAXXLog4jUI.init(config.getLogLevel(), config.getLogPatternLayout()); - } - }; + final Runnable reloadLogAppenderCallback; public void showConfig(JAXXContext context) { DemoUI ui = getUI(context); diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java index 135a527..34403b7 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java @@ -44,7 +44,7 @@ import static org.nuiton.i18n.I18n.t; public class RunDemo { /** Logger */ - private static Log log = LogFactory.getLog(RunDemo.class); + private static final Log log = LogFactory.getLog(RunDemo.class); public static void main(String... args) { diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java index ee6f9b6..fe61fdd 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java @@ -34,8 +34,6 @@ import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; import org.nuiton.jaxx.demo.entities.Movie; import org.nuiton.jaxx.demo.entities.People; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import java.util.List; /** @author kmorin */ @@ -56,21 +54,13 @@ public class BeanDoubleListDemoHandler implements UIHandler<BeanDoubleListDemo> ui.getDoubleList().init(decorator, data, data.subList(0, 1)); final Movie nacho = demoDataProvider.getMovie("0"); - final Predicate<People> filter = new Predicate<People>() { + final Predicate<People> filter = input -> nacho.getActors().contains(input); + ui.getFilterOnNachoButton().addChangeListener(e -> { + if (BeanDoubleListDemoHandler.this.ui.getFilterOnNachoButton().isSelected()) { + BeanDoubleListDemoHandler.this.ui.getDoubleList().getHandler().addFilter(filter); - public boolean apply(People input) { - return nacho.getActors().contains(input); - } - }; - ui.getFilterOnNachoButton().addChangeListener(new ChangeListener() { - - public void stateChanged(ChangeEvent e) { - if (BeanDoubleListDemoHandler.this.ui.getFilterOnNachoButton().isSelected()) { - BeanDoubleListDemoHandler.this.ui.getDoubleList().getHandler().addFilter(filter); - - } else { - BeanDoubleListDemoHandler.this.ui.getDoubleList().getHandler().clearFilters(); - } + } else { + BeanDoubleListDemoHandler.this.ui.getDoubleList().getHandler().clearFilters(); } }); } diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java index 8399ca6..43cf927 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java @@ -28,9 +28,6 @@ import org.nuiton.jaxx.runtime.swing.editor.gis.DmsCoordinate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - import static org.nuiton.i18n.I18n.t; /** @@ -69,50 +66,32 @@ public class CoordinateDemoHandler implements UIHandler<CoordinateDemo> { ui.getLongitudeDmdEditor().init(true); ui.getLongitudeDdEditor().init(); - ui.getLatitudeDms().addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DmsCoordinate source = (DmsCoordinate) evt.getSource(); - getModel().setLatitude(source.toDecimal()); - } + ui.getLatitudeDms().addPropertyChangeListener(evt -> { + DmsCoordinate source = (DmsCoordinate) evt.getSource(); + getModel().setLatitude(source.toDecimal()); }); - ui.getLatitudeDmd().addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DmdCoordinate source = (DmdCoordinate) evt.getSource(); - getModel().setLatitude(source.toDecimal()); - } + ui.getLatitudeDmd().addPropertyChangeListener(evt -> { + DmdCoordinate source = (DmdCoordinate) evt.getSource(); + getModel().setLatitude(source.toDecimal()); }); - ui.addPropertyChangeListener("latitudeDd", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Float source = (Float) evt.getNewValue(); - getModel().setLatitude(source); - } + ui.addPropertyChangeListener("latitudeDd", evt -> { + Float source = (Float) evt.getNewValue(); + getModel().setLatitude(source); }); - ui.getLongitudeDms().addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DmsCoordinate source = (DmsCoordinate) evt.getSource(); - getModel().setLongitude(source.toDecimal()); - } + ui.getLongitudeDms().addPropertyChangeListener(evt -> { + DmsCoordinate source = (DmsCoordinate) evt.getSource(); + getModel().setLongitude(source.toDecimal()); }); - ui.getLongitudeDmd().addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DmdCoordinate source = (DmdCoordinate) evt.getSource(); - getModel().setLongitude(source.toDecimal()); - } + ui.getLongitudeDmd().addPropertyChangeListener(evt -> { + DmdCoordinate source = (DmdCoordinate) evt.getSource(); + getModel().setLongitude(source.toDecimal()); }); - ui.addPropertyChangeListener("longitudeDd", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Float source = (Float) evt.getNewValue(); - getModel().setLongitude(source); - } + ui.addPropertyChangeListener("longitudeDd", evt -> { + Float source = (Float) evt.getNewValue(); + getModel().setLongitude(source); }); useLatitudeDmsEditor(); diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java index 7d12993..5751ef1 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java @@ -40,9 +40,9 @@ public class DemoDataProvider implements NavDataProvider { /** Logger */ static private final Log log = LogFactory.getLog(DemoDataProvider.class); - protected Map<String, Movie> movies; + protected final Map<String, Movie> movies; - protected Map<String, People> peoples; + protected final Map<String, People> peoples; public DemoDataProvider() { diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java index a89ed44..0dee5c6 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java @@ -49,7 +49,6 @@ import javax.swing.ImageIcon; import javax.swing.JPanel; import javax.swing.JTree; import javax.swing.SwingUtilities; -import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; import java.awt.Component; @@ -71,9 +70,9 @@ public class NavDemoHandler implements UIHandler<NavDemo> { protected NavDemo ui; - public static String MOVIES_CATEGORY_NODE = n("jaxxdemo.common.movies"); + public static final String MOVIES_CATEGORY_NODE = n("jaxxdemo.common.movies"); - public static String ACTORS_CATEGORY_NODE = n("jaxxdemo.common.actors"); + public static final String ACTORS_CATEGORY_NODE = n("jaxxdemo.common.actors"); @Override public void beforeInit(NavDemo ui) { @@ -89,43 +88,37 @@ public class NavDemoHandler implements UIHandler<NavDemo> { ui.setContextValue(ui.getTreeTableHelper(), "treeTableHelper"); // Creation of selection listener to open ui when tree selection change - TreeSelectionListener treeSelectionListener = new TreeSelectionListener() { - @Override - public void valueChanged(TreeSelectionEvent event) { - TreePath path = event.getPath(); - NavDemoTreeNode demoNode = - (NavDemoTreeNode) path.getLastPathComponent(); - - if (log.isDebugEnabled()) { - log.debug("Select demoNode " + demoNode); - } - - // Do nothing for root - if (demoNode.isRoot()) { - return; - } - openUI(demoNode); + TreeSelectionListener treeSelectionListener = event -> { + TreePath path = event.getPath(); + NavDemoTreeNode demoNode = + (NavDemoTreeNode) path.getLastPathComponent(); + + if (log.isDebugEnabled()) { + log.debug("Select demoNode " + demoNode); } + + // Do nothing for root + if (demoNode.isRoot()) { + return; + } + openUI(demoNode); }; // Creation of selection listener to open ui when tree selection change - TreeSelectionListener treeTableSelectionListener = new TreeSelectionListener() { - @Override - public void valueChanged(TreeSelectionEvent event) { - TreePath path = event.getPath(); - NavDemoTreeTableNode demoNode = - (NavDemoTreeTableNode) path.getLastPathComponent(); - - if (log.isDebugEnabled()) { - log.debug("Select demoNode " + demoNode); - } - - // Do nothing for root - if (demoNode.isRoot()) { - return; - } - openUI(demoNode); + TreeSelectionListener treeTableSelectionListener = event -> { + TreePath path = event.getPath(); + NavDemoTreeTableNode demoNode = + (NavDemoTreeTableNode) path.getLastPathComponent(); + + if (log.isDebugEnabled()) { + log.debug("Select demoNode " + demoNode); } + + // Do nothing for root + if (demoNode.isRoot()) { + return; + } + openUI(demoNode); }; final JTree tree = ui.getNavigationTree(); @@ -144,13 +137,9 @@ public class NavDemoHandler implements UIHandler<NavDemo> { // Register tree table ui.getTreeTableHelper().setUI(table, true, treeTableSelectionListener); - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - tree.setSelectionInterval(0, 0); - ui.getSplitPane().resetToPreferredSizes(); - } + SwingUtilities.invokeLater(() -> { + tree.setSelectionInterval(0, 0); + ui.getSplitPane().resetToPreferredSizes(); }); // expand the tree diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java index 78aae84..ee84932 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java @@ -44,7 +44,7 @@ public class ActorsTreeNodeLoador extends NavTreeNodeChildLoador<People, People, @Override public List<People> getData(Class<?> parentClass, String moviesId, - NavDataProvider dataProvider) throws Exception { + NavDataProvider dataProvider) { // Get people for parentId DemoDataProvider provider = (DemoDataProvider) dataProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java index 928910a..891776f 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java @@ -41,7 +41,7 @@ public class MoviesTreeNodeLoador extends NavTreeNodeChildLoador<Movie, Movie, N private static final long serialVersionUID = 1L; - protected boolean isTreeTable; + protected final boolean isTreeTable; public MoviesTreeNodeLoador() { this(false); @@ -55,7 +55,7 @@ public class MoviesTreeNodeLoador extends NavTreeNodeChildLoador<Movie, Movie, N @Override public List<Movie> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws Exception { + NavDataProvider dataProvider) { DemoDataProvider provider = (DemoDataProvider) dataProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java index b474434..f4b7209 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java @@ -45,7 +45,7 @@ public class NavDemoTreeCellRenderer extends AbstractNavTreeCellRenderer<Default protected static final Log log = LogFactory.getLog(NavDemoTreeCellRenderer.class); - protected DecoratorProvider decoratorProvider; + protected final DecoratorProvider decoratorProvider; public NavDemoTreeCellRenderer(DecoratorProvider decoratorProvider, DemoDataProvider provider) { diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java index d0bae12..75cc275 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java @@ -44,7 +44,7 @@ public class ActorsTreeTableNodeLoador extends NavTreeTableNodeChildLoador<Peopl @Override public List<People> getData(Class<?> parentClass, String moviesId, - NavDataProvider dataProvider) throws Exception { + NavDataProvider dataProvider) { // Get people for parentId DemoDataProvider provider = (DemoDataProvider) dataProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java index 68c660c..a84c111 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java @@ -41,7 +41,7 @@ public class MoviesTreeTableNodeLoador extends NavTreeTableNodeChildLoador<Movie private static final long serialVersionUID = 1L; - protected boolean isTreeTable; + protected final boolean isTreeTable; public MoviesTreeTableNodeLoador() { this(false); @@ -55,7 +55,7 @@ public class MoviesTreeTableNodeLoador extends NavTreeTableNodeChildLoador<Movie @Override public List<Movie> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws Exception { + NavDataProvider dataProvider) { DemoDataProvider provider = (DemoDataProvider) dataProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java index f507018..de4288e 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java @@ -35,7 +35,7 @@ import static org.nuiton.i18n.I18n.t; */ public class NavDemoTreeTableModel extends NavTreeTableModel.MyDefaultTreeTableModel { - protected DemoDataProvider dataProvider; + protected final DemoDataProvider dataProvider; public NavDemoTreeTableModel(DemoDataProvider dataProvider) { this.dataProvider = dataProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java index 5f5fc5f..31ff7e5 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java @@ -94,7 +94,7 @@ public class ListBeanValidationDemoHandler implements UIHandler<ListBeanValidati private static final long serialVersionUID = 1L; - Decorator<People> decorator + final Decorator<People> decorator = new DemoDecoratorProvider().getDecoratorByType(People.class); @Override diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java index 423d688..2a04858 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java @@ -117,14 +117,12 @@ public class PeopleTableModel extends AbstractTableModel { public int getBeanIndex(People bean) { - int row = data.indexOf(bean); - return row; + return data.indexOf(bean); } public People getBean(int row) { SwingUtil.ensureRowIndex(this, row); - People bean = data.get(row); - return bean; + return data.get(row); } public Pair<Integer, Integer> getCell(People bean, String fieldName) { @@ -132,8 +130,7 @@ public class PeopleTableModel extends AbstractTableModel { int row = getBeanIndex(bean); int col = columnNames.indexOf(fieldName); - Pair<Integer, Integer> cell = Pair.of(row, col); - return cell; + return Pair.of(row, col); } public void removeBean(int selectedRow) { diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CalculatorEngine.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CalculatorEngine.java index cc903a6..5208333 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CalculatorEngine.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/fun/CalculatorEngine.java @@ -47,7 +47,7 @@ public class CalculatorEngine { private BigDecimal value; - private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this); + private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this); public String getDisplayText() { @@ -139,7 +139,7 @@ public class CalculatorEngine { public static String toString(BigDecimal decimal) { // can't use stripTrailingZeros, as it wasn't introduced until 1.5 String result = decimal.toString(); - if (result.indexOf("") != -1) { + if (result.contains("")) { while (result.endsWith("0")) { result = result.substring(0, result.length() - 1); } diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java index 324baf3..fc4080b 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java @@ -89,7 +89,7 @@ public class DemoDataProvider implements NavDataProvider { static private final Log log = LogFactory.getLog(DemoDataProvider.class); /** mapping of demo per package */ - protected Map<String, List<Object>> mapping; + protected final Map<String, List<Object>> mapping; public DemoDataProvider() { diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNodeLoador.java index ee3cf3d..3656b61 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNodeLoador.java @@ -48,11 +48,10 @@ public class DemoNodeLoador extends NavTreeNodeChildLoador<Object, Object, DemoN @Override public List<Object> getData(Class<?> parentClass, String packageName, - NavDataProvider dataProvider) throws Exception { + NavDataProvider dataProvider) { DemoDataProvider provider = (DemoDataProvider) dataProvider; - List<Object> implementations = provider.getImplementations(packageName); - return implementations; + return provider.getImplementations(packageName); } @Override diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java index 537d041..96a98ec 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java @@ -314,10 +314,7 @@ public class CompilerTest extends JaxxBaseTest { try { getMojo().execute(); - } catch (MojoExecutionException e) { - log.error(e); - throw e; - } catch (MojoFailureException e) { + } catch (MojoExecutionException | MojoFailureException e) { log.error(e); throw e; } diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java index dc35117..d815427 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java @@ -27,7 +27,7 @@ import java.beans.PropertyChangeSupport; public class BeanImpl implements Bean{ protected String text; - PropertyChangeSupport p; + final PropertyChangeSupport p; public BeanImpl() { p = new PropertyChangeSupport(this); diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java index 26a38a0..210046c 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java @@ -53,7 +53,7 @@ public abstract class JaxxBaseTest { private static final Log log = LogFactory.getLog(JaxxBaseTest.class); @Rule - public MojoTestRule<GenerateMojo> rule = new MojoTestRule<GenerateMojo>(getClass(), "generate") { + public final MojoTestRule<GenerateMojo> rule = new MojoTestRule<GenerateMojo>(getClass(), "generate") { @Override protected void setUpMojo(GenerateMojo mojo, File pomFile) throws Exception { @@ -131,7 +131,7 @@ public abstract class JaxxBaseTest { } @SuppressWarnings("unchecked") - protected void assertError(JAXXEngine engine, String file, int nbCompiler) throws Exception { + protected void assertError(JAXXEngine engine, String file, int nbCompiler) { JAXXCompilerFile[] compilers = engine.getCompiledFiles(); assertEquals(nbCompiler, compilers.length); diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Identity.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Identity.java index b6b4d5a..de0034f 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Identity.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Identity.java @@ -35,7 +35,7 @@ public class Identity { protected int age = 51; - PropertyChangeSupport p; + final PropertyChangeSupport p; public Identity() { p = new PropertyChangeSupport(this); diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Model.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Model.java index 56e4c09..79e5857 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Model.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Model.java @@ -32,7 +32,7 @@ public class Model { protected int ratio = 51; - PropertyChangeSupport p; + final PropertyChangeSupport p; public Model() { p = new PropertyChangeSupport(this); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/Base64Coder.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/Base64Coder.java index 412f92e..5bdb64f 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/Base64Coder.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/Base64Coder.java @@ -57,7 +57,7 @@ public class Base64Coder { // Mapping table from 6-bit nibbles to Base64 characters. - private static char[] map1 = new char[64]; + private static final char[] map1 = new char[64]; static { int i = 0; @@ -76,7 +76,7 @@ public class Base64Coder { // Mapping table from Base64 characters to 6-bit nibbles. - private static byte[] map2 = new byte[128]; + private static final byte[] map2 = new byte[128]; static { for (int i = 0; i < map2.length; i++) { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/ComponentDescriptor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/ComponentDescriptor.java index cf68946..e0a93ec 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/ComponentDescriptor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/ComponentDescriptor.java @@ -24,13 +24,13 @@ package org.nuiton.jaxx.runtime; import java.io.Serializable; public class ComponentDescriptor implements Serializable { - String id; + final String id; - String javaClassName; + final String javaClassName; - String styleClass; + final String styleClass; - ComponentDescriptor parent; + final ComponentDescriptor parent; private static final long serialVersionUID = 1L; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingListener.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingListener.java index a558d41..9f9e290 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingListener.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingListener.java @@ -30,9 +30,9 @@ import java.beans.PropertyChangeListener; * <code>PropertyChangeEvent</code>. */ public class DataBindingListener implements PropertyChangeListener { - private JAXXObject object; + private final JAXXObject object; - private String dest; + private final String dest; /** * Creates a new <code>DataBindingListener</code> which will run the given data binding diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingUpdateListener.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingUpdateListener.java index 2523d87..e834a78 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingUpdateListener.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingUpdateListener.java @@ -30,9 +30,9 @@ import java.beans.PropertyChangeListener; * when it receives a <code>PropertyChangeEvent</code>. */ public class DataBindingUpdateListener implements PropertyChangeListener { - private JAXXObject object; + private final JAXXObject object; - private String dest; + private final String dest; /** * Creates a new <code>DataBindingUpdateListener</code> which will remove and re-apply a diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/FileChooserUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/FileChooserUtil.java index b51124b..032afab 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/FileChooserUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/FileChooserUtil.java @@ -67,9 +67,9 @@ public class FileChooserUtil { public static class PatternChooserFilter extends javax.swing.filechooser.FileFilter { - protected String pattern; + protected final String pattern; - protected String description; + protected final String description; public PatternChooserFilter(String pattern, String description) { this.pattern = pattern; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXObjectDescriptor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXObjectDescriptor.java index f442d6a..bc8f803 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXObjectDescriptor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXObjectDescriptor.java @@ -26,9 +26,9 @@ import org.nuiton.jaxx.runtime.css.Stylesheet; import java.io.Serializable; public class JAXXObjectDescriptor implements Serializable { - private ComponentDescriptor[] descriptors; + private final ComponentDescriptor[] descriptors; - private Stylesheet stylesheet; + private final Stylesheet stylesheet; private static final long serialVersionUID = 1L; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXUtil.java index d4b03cd..c38ce8b 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXUtil.java @@ -21,11 +21,11 @@ */ package org.nuiton.jaxx.runtime; -import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef; -import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import org.apache.commons.beanutils.ConstructorUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef; +import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import java.awt.Component; import java.awt.Toolkit; @@ -36,7 +36,6 @@ import java.beans.PropertyChangeListenerProxy; import java.beans.PropertyChangeSupport; import java.io.IOException; import java.lang.ref.WeakReference; -import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -58,10 +57,10 @@ public class JAXXUtil { // Maps root objects to lists of event listeners - private static Map<Object, WeakReference<List<EventListenerDescriptor>>> + private static final Map<Object, WeakReference<List<EventListenerDescriptor>>> eventListeners = new WeakHashMap<>(); - private static Map<JAXXObject, WeakReference<List<DataBindingUpdateListener>>> + private static final Map<JAXXObject, WeakReference<List<DataBindingUpdateListener>>> dataBindingUpdateListeners = new WeakHashMap<>(); private static final PropertyChangeListener[] EMPTY_ARRAY_PROPERTY_CHANGE_LISTENERS = new PropertyChangeListener[0]; @@ -92,9 +91,7 @@ public class JAXXUtil { try { return (JAXXObjectDescriptor) Base64Coder.deserialize(descriptor, false); - } catch (IOException e) { - throw new RuntimeException("Internal error: can't-happen error", e); - } catch (ClassNotFoundException e) { + } catch (IOException | ClassNotFoundException e) { throw new RuntimeException("Internal error: can't-happen error", e); } } @@ -104,9 +101,7 @@ public class JAXXUtil { try { return (JAXXObjectDescriptor) Base64Coder.deserialize(descriptor, true); - } catch (IOException e) { - throw new RuntimeException("Internal error: can't-happen error", e); - } catch (ClassNotFoundException e) { + } catch (IOException | ClassNotFoundException e) { throw new RuntimeException("Internal error: can't-happen error", e); } } @@ -175,7 +170,7 @@ public class JAXXUtil { WeakReference<List<EventListenerDescriptor>> ref = eventListeners.get(methodContainer); List<EventListenerDescriptor> descriptors = ref != null ? - ref.get() : null; + ref.get() : null; if (descriptors == null) { descriptors = new ArrayList<>(); eventListeners.put( @@ -185,11 +180,11 @@ public class JAXXUtil { } else { for (EventListenerDescriptor descriptor : descriptors) { if (descriptor.listenerClass.equals(listenerClass) && - (listenerMethodName == null ? - descriptor.listenerMethodName == null : - listenerMethodName.equals( - descriptor.listenerMethodName)) && - methodName.equals(descriptor.methodName)) { + (listenerMethodName == null ? + descriptor.listenerMethodName == null : + listenerMethodName.equals( + descriptor.listenerMethodName)) && + methodName.equals(descriptor.methodName)) { return (E) descriptor.eventListener; } } @@ -215,7 +210,7 @@ public class JAXXUtil { if (listenerMethodName != null && listenerMethod == null) { throw new IllegalArgumentException( "no method named " + listenerMethodName + - " found in class " + listenerClass.getName()); + " found in class " + listenerClass.getName()); } // tchemit 2010-12-01 : we must the exact method found, some none javaBeans // api does use different signature for some of them listener @@ -238,39 +233,33 @@ public class JAXXUtil { descriptor.eventListener = Proxy.newProxyInstance(listenerClass.getClassLoader(), new Class<?>[]{listenerClass}, - new InvocationHandler() { - - @Override - public Object invoke(Object proxy, - Method method, - Object[] args) { - String methodName = method.getName(); - if (listenerMethodName == null && + (proxy, method, args) -> { + String methodName1 = method.getName(); + if (listenerMethodName == null && listenerMethods.contains(method) || - methodName.equals(listenerMethodName)) { - try { - targetMethod.setAccessible(true); - return targetMethod.invoke( - methodContainer, args); - } catch (IllegalAccessException e) { - throw new RuntimeException( - "could not invoke on container " + - methodContainer, e); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } - } - if (methodName.equals("toString")) { - return toString(); + methodName1.equals(listenerMethodName)) { + try { + targetMethod.setAccessible(true); + return targetMethod.invoke( + methodContainer, args); + } catch (IllegalAccessException e) { + throw new RuntimeException( + "could not invoke on container " + + methodContainer, e); + } catch (InvocationTargetException e) { + throw new RuntimeException(e); } - if (methodName.equals("equals")) { - return descriptor.eventListener == args[0]; - } - if (methodName.equals("hashCode")) { - return hashCode(); - } - return null; } + if (methodName1.equals("toString")) { + return descriptor.toString(); + } + if (methodName1.equals("equals")) { + return descriptor.eventListener == args[0]; + } + if (methodName1.equals("hashCode")) { + return descriptor.hashCode(); + } + return null; }); descriptors.add(descriptor); return (E) descriptor.eventListener; @@ -292,7 +281,7 @@ public class JAXXUtil { WeakReference<List<DataBindingUpdateListener>> ref = dataBindingUpdateListeners.get(object); List<DataBindingUpdateListener> listeners = ref == null ? null : - ref.get(); + ref.get(); if (listeners == null) { listeners = new ArrayList<>(); dataBindingUpdateListeners.put( @@ -437,7 +426,6 @@ public class JAXXUtil { * Test if some entries exists in a given context and throw an * IllegalArgumentException if not. * - * * @param context the context to test * @param defs the definitions of entries to seek in context * @throws IllegalArgumentException if the entry is not found in context. @@ -452,7 +440,7 @@ public class JAXXUtil { if (value == null) { throw new IllegalArgumentException( "the context entry [" + def + "] ] was not found in " + - "context " + context); + "context " + context); } } } @@ -478,7 +466,7 @@ public class JAXXUtil { if (value == null) { throw new IllegalArgumentException( "the context entry [" + def + "] ] was not found in " + - "context " + context); + "context " + context); } return value; @@ -612,11 +600,11 @@ public class JAXXUtil { pName = plistener.getPropertyName(); } if (plistener != null && - pName != null && - listener instanceof DataBindingListener) { + pName != null && + listener instanceof DataBindingListener) { if (log.isDebugEnabled()) { log.debug("find config listener to remove [" + pName + - "] : " + listener); + "] : " + listener); } toRemove.add(plistener); //toRemove.add(listener); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java index e0c1811..ba9b9af 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java @@ -89,7 +89,7 @@ public class JaxxFileChooser { protected static File currentDirectory = DEFAULT_CURRENT_DIRECTORY_FILE; - public static interface ToLoadFile { + public interface ToLoadFile { ToLoadFile setTitle(String title); @@ -123,7 +123,7 @@ public class JaxxFileChooser { } - public static interface ToLoadDirectory { + public interface ToLoadDirectory { ToLoadDirectory setTitle(String title); @@ -139,7 +139,7 @@ public class JaxxFileChooser { } - public static interface ToSave { + public interface ToSave { ToSave setTitle(String title); @@ -475,9 +475,9 @@ public class JaxxFileChooser { } public static class PatternChooserFilter extends FileFilter { - protected String pattern; + protected final String pattern; - protected String description; + protected final String description; public PatternChooserFilter(String pattern, String description) { this.pattern = StringUtils.lowerCase(pattern); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java index 52a3ac1..f2cdbcc 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java @@ -57,10 +57,6 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.event.HyperlinkEvent; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; @@ -167,13 +163,9 @@ public class SwingUtil extends JAXXUtil { } if ((Integer) numReaders.get(document) > 0) { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - if (!c.getText().equals(text)) { - c.setText(text); - } + SwingUtilities.invokeLater(() -> { + if (!c.getText().equals(text)) { + c.setText(text); } }); return; @@ -183,9 +175,7 @@ public class SwingUtil extends JAXXUtil { if (oldText == null || !oldText.equals(text)) { c.setText(text); } - } catch (NoSuchFieldException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { + } catch (NoSuchFieldException | IllegalAccessException e) { throw new RuntimeException(e); } catch (SecurityException e) { c.setText(text); @@ -1075,11 +1065,7 @@ public class SwingUtil extends JAXXUtil { u.getProtocol().equalsIgnoreCase("ftp")) { Desktop.getDesktop().browse(u.toURI()); } - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("Error while opening link", e); - } - } catch (URISyntaxException e) { + } catch (IOException | URISyntaxException e) { if (log.isErrorEnabled()) { log.error("Error while opening link", e); } @@ -1121,14 +1107,10 @@ public class SwingUtil extends JAXXUtil { * @param tree the tree to expand */ public static void expandTree(final JTree tree) { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - int i = 0; - while (i < tree.getRowCount()) { - tree.expandRow(i++); - } + SwingUtilities.invokeLater(() -> { + int i = 0; + while (i < tree.getRowCount()) { + tree.expandRow(i++); } }); } @@ -1141,14 +1123,10 @@ public class SwingUtil extends JAXXUtil { * @param treeTable the tree to expand */ public static void expandTreeTable(final JXTreeTable treeTable) { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - int i = 0; - while (i < treeTable.getRowCount()) { - treeTable.expandRow(i++); - } + SwingUtilities.invokeLater(() -> { + int i = 0; + while (i < treeTable.getRowCount()) { + treeTable.expandRow(i++); } }); } @@ -1162,30 +1140,22 @@ public class SwingUtil extends JAXXUtil { public static void addExpandOnClickListener(final JTree tree) { tree.getSelectionModel().addTreeSelectionListener( - new TreeSelectionListener() { - - @Override - public void valueChanged(final TreeSelectionEvent e) { - TreeNode node = (TreeNode) - e.getPath().getLastPathComponent(); - if (node != null && !node.isLeaf()) { - - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - for (TreePath path : e.getPaths()) { - if (e.isAddedPath(path) && - !tree.isExpanded(path)) { - log.info("expand node [" + path - + "]"); - // will expand the node - tree.expandPath(path); - } - } + e -> { + TreeNode node = (TreeNode) + e.getPath().getLastPathComponent(); + if (node != null && !node.isLeaf()) { + + SwingUtilities.invokeLater(() -> { + for (TreePath path : e.getPaths()) { + if (e.isAddedPath(path) && + !tree.isExpanded(path)) { + log.info("expand node [" + path + + "]"); + // will expand the node + tree.expandPath(path); } - }); - } + } + }); } }); } @@ -1200,28 +1170,20 @@ public class SwingUtil extends JAXXUtil { */ public static void addExpandOnClickListener(final JXTreeTable treeTable) { - treeTable.addTreeSelectionListener(new TreeSelectionListener() { - - @Override - public void valueChanged(final TreeSelectionEvent e) { - TreeNode node = (TreeNode) e.getPath().getLastPathComponent(); - if (node != null && !node.isLeaf()) { - - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - for (TreePath path : e.getPaths()) { - if (e.isAddedPath(path) && - !treeTable.isExpanded(path)) { - log.info("expand node [" + path + "]"); - // will expand the node - treeTable.expandPath(path); - } - } + treeTable.addTreeSelectionListener(e -> { + TreeNode node = (TreeNode) e.getPath().getLastPathComponent(); + if (node != null && !node.isLeaf()) { + + SwingUtilities.invokeLater(() -> { + for (TreePath path : e.getPaths()) { + if (e.isAddedPath(path) && + !treeTable.isExpanded(path)) { + log.info("expand node [" + path + "]"); + // will expand the node + treeTable.expandPath(path); } - }); - } + } + }); } }); } @@ -1449,31 +1411,28 @@ public class SwingUtil extends JAXXUtil { */ public static void scrollToTableSelection(final JTable table) { - table.getSelectionModel().addListSelectionListener(new ListSelectionListener() { - @Override - public void valueChanged(ListSelectionEvent e) { - ListSelectionModel listSelectionModel = - (ListSelectionModel) e.getSource(); - int firstIndex = e.getFirstIndex(); - int lastIndex = e.getLastIndex(); - Integer newSelectedRow = null; + table.getSelectionModel().addListSelectionListener(e -> { + ListSelectionModel listSelectionModel = + (ListSelectionModel) e.getSource(); + int firstIndex = e.getFirstIndex(); + int lastIndex = e.getLastIndex(); + Integer newSelectedRow = null; - if (listSelectionModel.isSelectionEmpty()) { + if (listSelectionModel.isSelectionEmpty()) { - // no selection - } else if (listSelectionModel.isSelectedIndex(firstIndex)) { + // no selection + } else if (listSelectionModel.isSelectedIndex(firstIndex)) { - // use first index - newSelectedRow = firstIndex; - } else if (listSelectionModel.isSelectedIndex(lastIndex)) { + // use first index + newSelectedRow = firstIndex; + } else if (listSelectionModel.isSelectedIndex(lastIndex)) { - // use last index - newSelectedRow = lastIndex; - } - if (newSelectedRow != null) { - Rectangle rect = table.getCellRect(newSelectedRow, 0, true); - table.scrollRectToVisible(rect); - } + // use last index + newSelectedRow = lastIndex; + } + if (newSelectedRow != null) { + Rectangle rect = table.getCellRect(newSelectedRow, 0, true); + table.scrollRectToVisible(rect); } }); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java index 7aabd9a..f410976 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java @@ -45,9 +45,9 @@ public class GetCompopentAtPointVisitor implements ComponentTreeNodeVisitor { private static final Log log = LogFactory.getLog(GetCompopentAtPointVisitor.class); - int currentX; + final int currentX; - int currentY; + final int currentY; final List<ComponentTreeNode> components = Lists.newArrayList(); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DataContext.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DataContext.java index afe0a33..0bb219d 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DataContext.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DataContext.java @@ -42,7 +42,7 @@ import java.util.regex.Pattern; public abstract class DataContext { /** Logger */ - static private Log log = LogFactory.getLog(DataContext.class); + static private final Log log = LogFactory.getLog(DataContext.class); public static final DataContextEntry<?>[] EMPTY_DATA_CONTEXT_ENTRY_ARRAY = new DataContextEntry<?>[0]; @@ -56,7 +56,7 @@ public abstract class DataContext { /** to manage properties modifications */ protected final PropertyChangeSupport pcs; - protected DataContextEntry<?>[] entries; + protected final DataContextEntry<?>[] entries; protected final String[] DEFAULT_JAXX_PCS; @@ -103,35 +103,17 @@ public abstract class DataContext { } public Iterable<? extends DataContextEntry<?>> iterateOnAll() { - return new Iterable<DataContextEntry<?>>() { - - @Override - public Iterator<DataContextEntry<?>> iterator() { - return new DataContextEntryIterator(entries); - } - }; + return (Iterable<DataContextEntry<?>>) () -> new DataContextEntryIterator(entries); } public Iterable<? extends DataContextEntry<?>> iterateToLevel( final int level) { - return new Iterable<DataContextEntry<?>>() { - - @Override - public Iterator<DataContextEntry<?>> iterator() { - return new DataContextEntryIterator(entries, level); - } - }; + return (Iterable<DataContextEntry<?>>) () -> new DataContextEntryIterator(entries, level); } public Iterable<? extends DataContextEntry<?>> reverseIterateOnAll() { - return new Iterable<DataContextEntry<?>>() { - - @Override - public Iterator<DataContextEntry<?>> iterator() { - return new DataContextEntryIterator(entries, true); - } - }; + return (Iterable<DataContextEntry<?>>) () -> new DataContextEntryIterator(entries, true); } public DataContextEntry<?> getCurrentEntry() { @@ -291,7 +273,7 @@ public abstract class DataContext { return result; } - public void close() throws Exception { + public void close() { clear(); // suppression des ecouteurs @@ -313,7 +295,7 @@ public abstract class DataContext { private final DataContextEntry<?>[] parents; - private Class<E> klass; + private final Class<E> klass; public DataContextEntry(Class<E> klass, DataContextEntry<?> previous) { this.previous = previous; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContext.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContext.java index c2e807b..cfc9686 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContext.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContext.java @@ -101,7 +101,7 @@ public class DefaultApplicationContext extends DefaultJAXXContext { } /** Map of forwarded classes (key) to classes (values). */ - protected Map<Class<?>, Class<?>> forwards; + protected final Map<Class<?>, Class<?>> forwards; /** * Map of entries to watch associated with the property to fires if a @@ -119,7 +119,7 @@ public class DefaultApplicationContext extends DefaultJAXXContext { LogFactory.getLog(DefaultApplicationContext.class); /** to manage properties modifications */ - protected PropertyChangeSupport pcs; + protected final PropertyChangeSupport pcs; @SuppressWarnings({"unchecked"}) @Override @@ -406,19 +406,13 @@ public class DefaultApplicationContext extends DefaultJAXXContext { throw new IllegalArgumentException( clazz + " has no public constructor"); } - } catch (NoSuchMethodException ex) { - throw new IllegalArgumentException(ex); - } catch (SecurityException ex) { + } catch (NoSuchMethodException | SecurityException ex) { throw new IllegalArgumentException(ex); } try { value = constructor.newInstance(); - } catch (InstantiationException ex) { - throw new IllegalArgumentException(ex); - } catch (IllegalAccessException ex) { - throw new IllegalArgumentException(ex); - } catch (InvocationTargetException ex) { + } catch (InstantiationException | InvocationTargetException | IllegalAccessException ex) { throw new IllegalArgumentException(ex); } return value; @@ -434,13 +428,7 @@ public class DefaultApplicationContext extends DefaultJAXXContext { Method m = clazz.getMethod(methodName, String.class); value = m.invoke(parent, name); return value; - } catch (NoSuchMethodException ex) { - throw new IllegalArgumentException(ex); - } catch (SecurityException ex) { - throw new IllegalArgumentException(ex); - } catch (IllegalAccessException ex) { - throw new IllegalArgumentException(ex); - } catch (InvocationTargetException ex) { + } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | SecurityException ex) { throw new IllegalArgumentException(ex); } } @@ -454,13 +442,7 @@ public class DefaultApplicationContext extends DefaultJAXXContext { Method m = clazz.getMethod(methodName); value = m.invoke(parent); return value; - } catch (NoSuchMethodException ex) { - throw new IllegalArgumentException(ex); - } catch (SecurityException ex) { - throw new IllegalArgumentException(ex); - } catch (IllegalAccessException ex) { - throw new IllegalArgumentException(ex); - } catch (InvocationTargetException ex) { + } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | SecurityException ex) { throw new IllegalArgumentException(ex); } } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/DataBinding.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/DataBinding.java index 89054be..69ef748 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/DataBinding.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/DataBinding.java @@ -27,7 +27,7 @@ package org.nuiton.jaxx.runtime.css; */ public class DataBinding { - private String id; + private final String id; public DataBinding(String id) { this.id = id; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Pseudoclasses.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Pseudoclasses.java index 88afe7e..f5ed1fc 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Pseudoclasses.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Pseudoclasses.java @@ -34,13 +34,13 @@ public class Pseudoclasses { public static final String NO_PSEUDOCLASS = "no pseudoclass"; - private static Map<Object, Map<String, List<PropertyValue>>> properties = new WeakHashMap<>(); + private static final Map<Object, Map<String, List<PropertyValue>>> properties = new WeakHashMap<>(); private static class PropertyValue implements Comparable<PropertyValue> { - private Object value; + private final Object value; - private int id; + private final int id; public PropertyValue(Object value, int id) { this.value = value; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Rule.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Rule.java index dbc1b8e..e224f54 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Rule.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Rule.java @@ -29,9 +29,9 @@ public class Rule implements java.io.Serializable, Comparable<Rule> { public static final String DATA_BINDING = "<data binding>"; - private Selector[] selectors; + private final Selector[] selectors; - private Map<String, String> properties; + private final Map<String, String> properties; private static final long serialVersionUID = 1L; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Selector.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Selector.java index 954f339..6f60567 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Selector.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Selector.java @@ -33,15 +33,15 @@ public class Selector implements java.io.Serializable, Comparable<Selector> { public static final int ALWAYS_APPLIES = 4; - private String javaClassName; + private final String javaClassName; - private String styleClass; + private final String styleClass; - private String pseudoClass; + private final String pseudoClass; - private String id; + private final String id; - private boolean inline; + private final boolean inline; private static final long serialVersionUID = 1L; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Application.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Application.java index 1352701..29ad177 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Application.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Application.java @@ -59,13 +59,7 @@ public class Application extends JFrame { if (isDisplayable()) { SwingUtilities.updateComponentTreeUI(this); } - } catch (ClassNotFoundException e) { - throw new RuntimeException(e); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (UnsupportedLookAndFeelException e) { + } catch (ClassNotFoundException | UnsupportedLookAndFeelException | IllegalAccessException | InstantiationException e) { throw new RuntimeException(e); } } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2.java index 14df9ca..4e9c6a9 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2.java @@ -50,12 +50,12 @@ import java.util.List; public class CardLayout2 extends CardLayout { /** log */ - static private Log log = LogFactory.getLog(CardLayout2.class); + static private final Log log = LogFactory.getLog(CardLayout2.class); private static final long serialVersionUID = 1L; /** list of already loaded context (since the {@link #vector} attribute is package visible... */ - protected List<Serializable> contexts = new LinkedList<>(); + protected final List<Serializable> contexts = new LinkedList<>(); /** * A flag to compute dimension only on visible component. diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2Ext.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2Ext.java index a07a7ca..a412592 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2Ext.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2Ext.java @@ -51,14 +51,14 @@ public class CardLayout2Ext extends CardLayout2 { public static final String SELECTED_PROPERTY_NAME = "selected"; /** pour propager les changements dans le modèle vers l'ui */ - protected PropertyChangeSupport pcs; + protected final PropertyChangeSupport pcs; /** le contenu sélectionné */ protected String selected; - private String containerName; + private final String containerName; - private JAXXObject ui; + private final JAXXObject ui; private Container container; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentResizer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentResizer.java index 19c8eff..2a79b02 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentResizer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentResizer.java @@ -55,7 +55,7 @@ public class ComponentResizer extends MouseAdapter { private final static Dimension MAXIMUM_SIZE = new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE); - private static Map<Integer, Integer> cursors = new HashMap<>(); + private static final Map<Integer, Integer> cursors = new HashMap<>(); static { cursors.put(1, Cursor.N_RESIZE_CURSOR); @@ -96,7 +96,7 @@ public class ComponentResizer extends MouseAdapter { private Dimension maximumSize = MAXIMUM_SIZE; - protected Map<Component, String> authorizedDirectionByComponent = new HashMap<>(); + protected final Map<Component, String> authorizedDirectionByComponent = new HashMap<>(); /** * Convenience contructor. All borders are resizable in increments of diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Item.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Item.java index 55542f2..dda3c16 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Item.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Item.java @@ -41,7 +41,7 @@ public class Item { public static final String SELECTED_PROPERTY = "selected"; - private String id; + private final String id; private String label; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXButtonGroup.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXButtonGroup.java index 9deeba0..c05aff2 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXButtonGroup.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXButtonGroup.java @@ -42,7 +42,7 @@ public class JAXXButtonGroup extends ButtonGroup { public static final String NOT_SELECTED_TIP_CLIENT_PROPERTY = "$not.selected.toolTipText"; - protected EventListenerList listenerList = new EventListenerList(); + protected final EventListenerList listenerList = new EventListenerList(); private PropertyChangeSupport propertyChangeSupport; @@ -52,7 +52,7 @@ public class JAXXButtonGroup extends ButtonGroup { protected transient ChangeEvent changeEvent = new ChangeEvent(this); - private transient ChangeListener changeListener = new ChangeListener() { + private final transient ChangeListener changeListener = new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXComboBox.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXComboBox.java index bb1b9c2..7a5b660 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXComboBox.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXComboBox.java @@ -29,8 +29,6 @@ import javax.swing.JList; import javax.swing.ListModel; import java.awt.Component; import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -44,7 +42,7 @@ public class JAXXComboBox extends JComboBox { public class JAXXComboBoxModel extends AbstractListModel implements ComboBoxModel { - private List<Item> items; + private final List<Item> items; private Object selectedItem; @@ -53,53 +51,49 @@ public class JAXXComboBox extends JComboBox { public JAXXComboBoxModel(List<Item> items) { this.items = items; - PropertyChangeListener listener = new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent e) { - if (e.getPropertyName().equals(Item.SELECTED_PROPERTY)) { - Item item = (Item) e.getSource(); - int itemIndex = JAXXComboBoxModel.this.items.indexOf(item); - // TODO: fix cut-and-pasting badness - int[] oldSelection = new int[]{getSelectedIndex()}; - int[] newSelection; - int index = -1; - for (int i = 0; i < oldSelection.length; i++) { - if (oldSelection[i] == itemIndex) { - index = i; - break; - } - } - if (item.isSelected()) { - if (index != -1) // it was already selected - { - return; - } - newSelection = new int[oldSelection.length + 1]; - System.arraycopy(oldSelection, 0, newSelection, 0, oldSelection.length); - newSelection[newSelection.length - 1] = itemIndex; - } else { - if (index == -1) // it already wasn't selected - { - return; - } - newSelection = new int[oldSelection.length - 1]; - System.arraycopy(oldSelection, 0, newSelection, 0, index); - System.arraycopy(oldSelection, index + 1, newSelection, index, oldSelection.length - 1 - index); + PropertyChangeListener listener = e -> { + if (e.getPropertyName().equals(Item.SELECTED_PROPERTY)) { + Item item = (Item) e.getSource(); + int itemIndex = JAXXComboBoxModel.this.items.indexOf(item); + // TODO: fix cut-and-pasting badness + int[] oldSelection = new int[]{getSelectedIndex()}; + int[] newSelection; + int index = -1; + for (int i = 0; i < oldSelection.length; i++) { + if (oldSelection[i] == itemIndex) { + index = i; + break; } - if (newSelection.length > 0) { - setSelectedIndex(newSelection[0]); + } + if (item.isSelected()) { + if (index != -1) // it was already selected + { + return; } + newSelection = new int[oldSelection.length + 1]; + System.arraycopy(oldSelection, 0, newSelection, 0, oldSelection.length); + newSelection[newSelection.length - 1] = itemIndex; } else { - // TODO: more cut-and-pasting badness - for (int i = 0; i < getSize(); i++) { - if (getElementAt(i) == ((Item) e.getSource()).getValue()) { - fireContentsChanged(JAXXComboBoxModel.this, i, i); - if (getSelectedIndex() == i) { - fireItemStateChanged(new ItemEvent(JAXXComboBox.this, ItemEvent.ITEM_STATE_CHANGED, getElementAt(i), ItemEvent.DESELECTED)); - } - return; + if (index == -1) // it already wasn't selected + { + return; + } + newSelection = new int[oldSelection.length - 1]; + System.arraycopy(oldSelection, 0, newSelection, 0, index); + System.arraycopy(oldSelection, index + 1, newSelection, index, oldSelection.length - 1 - index); + } + if (newSelection.length > 0) { + setSelectedIndex(newSelection[0]); + } + } else { + // TODO: more cut-and-pasting badness + for (int i = 0; i < getSize(); i++) { + if (getElementAt(i) == ((Item) e.getSource()).getValue()) { + fireContentsChanged(JAXXComboBoxModel.this, i, i); + if (getSelectedIndex() == i) { + fireItemStateChanged(new ItemEvent(JAXXComboBox.this, ItemEvent.ITEM_STATE_CHANGED, getElementAt(i), ItemEvent.DESELECTED)); } + return; } } } @@ -172,19 +166,15 @@ public class JAXXComboBox extends JComboBox { } }); - addItemListener(new ItemListener() { - - @Override - public void itemStateChanged(ItemEvent e) { - ListModel model = getModel(); - if (model instanceof JAXXComboBoxModel) { - List<Item> items = ((JAXXComboBoxModel) model).items; - for (int i = items.size() - 1; i >= 0; i--) { - boolean selected = getSelectedIndex() == i; - Item item = items.get(i); - if (selected != item.isSelected()) { - item.setSelected(selected); - } + addItemListener(e -> { + ListModel model = getModel(); + if (model instanceof JAXXComboBoxModel) { + List<Item> items = ((JAXXComboBoxModel) model).items; + for (int i = items.size() - 1; i >= 0; i--) { + boolean selected = getSelectedIndex() == i; + Item item = items.get(i); + if (selected != item.isSelected()) { + item.setSelected(selected); } } } @@ -213,10 +203,7 @@ public class JAXXComboBox extends JComboBox { boolean selected = o.equals(select); try { items.add(new Item(o.toString(), (String) m.invoke(o), o, selected)); - } catch (IllegalAccessException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } catch (InvocationTargetException e) { + } catch (IllegalAccessException | InvocationTargetException e) { // shoudl never happen ? throw new RuntimeException(e); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXList.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXList.java index 47419a1..e177c8f 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXList.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXList.java @@ -25,10 +25,7 @@ import javax.swing.AbstractListModel; import javax.swing.DefaultListCellRenderer; import javax.swing.JList; import javax.swing.ListModel; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; import java.awt.Component; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -42,56 +39,52 @@ public class JAXXList extends JList { public class JAXXListModel extends AbstractListModel { - private List<Item> items; + private final List<Item> items; private static final long serialVersionUID = -1598924187490122036L; public JAXXListModel(List<Item> items) { this.items = items; - PropertyChangeListener listener = new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent e) { - if (e.getPropertyName().equals(Item.SELECTED_PROPERTY)) { - Item item = (Item) e.getSource(); - int itemIndex = JAXXListModel.this.items.indexOf(item); - int[] oldSelection = getSelectedIndices(); - int[] newSelection; - int index = -1; - for (int i = 0; i < oldSelection.length; i++) { - if (oldSelection[i] == itemIndex) { - index = i; - break; - } + PropertyChangeListener listener = e -> { + if (e.getPropertyName().equals(Item.SELECTED_PROPERTY)) { + Item item = (Item) e.getSource(); + int itemIndex = JAXXListModel.this.items.indexOf(item); + int[] oldSelection = getSelectedIndices(); + int[] newSelection; + int index = -1; + for (int i = 0; i < oldSelection.length; i++) { + if (oldSelection[i] == itemIndex) { + index = i; + break; } - if (item.isSelected()) { - if (index != -1) // it was already selected - { - return; - } - newSelection = new int[oldSelection.length + 1]; - System.arraycopy(oldSelection, 0, newSelection, 0, oldSelection.length); - newSelection[newSelection.length - 1] = itemIndex; - } else { - if (index == -1) // it already wasn't selected - { - return; - } - newSelection = new int[oldSelection.length - 1]; - System.arraycopy(oldSelection, 0, newSelection, 0, index); - System.arraycopy(oldSelection, index + 1, newSelection, index, oldSelection.length - 1 - index); + } + if (item.isSelected()) { + if (index != -1) // it was already selected + { + return; } - setSelectedIndices(newSelection); + newSelection = new int[oldSelection.length + 1]; + System.arraycopy(oldSelection, 0, newSelection, 0, oldSelection.length); + newSelection[newSelection.length - 1] = itemIndex; } else { - for (int i = 0; i < getSize(); i++) { - if (getElementAt(i) == ((Item) e.getSource()).getValue()) { - fireContentsChanged(JAXXListModel.this, i, i); - if (isSelectedIndex(i)) { - fireSelectionValueChanged(i, i, false); - } - return; + if (index == -1) // it already wasn't selected + { + return; + } + newSelection = new int[oldSelection.length - 1]; + System.arraycopy(oldSelection, 0, newSelection, 0, index); + System.arraycopy(oldSelection, index + 1, newSelection, index, oldSelection.length - 1 - index); + } + setSelectedIndices(newSelection); + } else { + for (int i = 0; i < getSize(); i++) { + if (getElementAt(i) == ((Item) e.getSource()).getValue()) { + fireContentsChanged(JAXXListModel.this, i, i); + if (isSelectedIndex(i)) { + fireSelectionValueChanged(i, i, false); } + return; } } } @@ -135,19 +128,15 @@ public class JAXXList extends JList { } }); - addListSelectionListener(new ListSelectionListener() { - - @Override - public void valueChanged(ListSelectionEvent e) { - ListModel model = getModel(); - if (model instanceof JAXXListModel) { - List<Item> items = ((JAXXListModel) model).items; - for (int i = items.size() - 1; i >= 0; i--) { - boolean selected = isSelectedIndex(i); - Item item = items.get(i); - if (selected != item.isSelected()) { - item.setSelected(selected); - } + addListSelectionListener(e -> { + ListModel model = getModel(); + if (model instanceof JAXXListModel) { + List<Item> items = ((JAXXListModel) model).items; + for (int i = items.size() - 1; i >= 0; i--) { + boolean selected = isSelectedIndex(i); + Item item = items.get(i); + if (selected != item.isSelected()) { + item.setSelected(selected); } } } @@ -353,16 +342,7 @@ public class JAXXList extends JList { } try { items.add(new Item(o.toString(), (String) m.invoke(o), o, selected)); - } catch (SecurityException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } catch (IllegalArgumentException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } catch (InvocationTargetException e) { + } catch (SecurityException | InvocationTargetException | IllegalArgumentException | IllegalAccessException e) { // shoudl never happen ? throw new RuntimeException(e); } @@ -394,16 +374,7 @@ public class JAXXList extends JList { } try { items.add(new Item(o.toString(), (String) m.invoke(o), o, selected)); - } catch (SecurityException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } catch (IllegalArgumentException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } catch (InvocationTargetException e) { + } catch (SecurityException | InvocationTargetException | IllegalArgumentException | IllegalAccessException e) { // shoudl never happen ? throw new RuntimeException(e); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTree.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTree.java index b1acca0..9812ff6 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTree.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTree.java @@ -30,7 +30,6 @@ import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; import java.awt.Component; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; @@ -43,9 +42,9 @@ public class JAXXTree extends JTree { public class JAXXTreeModel implements TreeModel { - private Item root; + private final Item root; - private List<TreeModelListener> listeners = new ArrayList<>(); + private final List<TreeModelListener> listeners = new ArrayList<>(); public JAXXTreeModel(List<Item> items) { if (items.size() == 1) { @@ -57,25 +56,21 @@ public class JAXXTree extends JTree { } } - PropertyChangeListener listener = new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent e) { - if (e.getPropertyName().equals(Item.SELECTED_PROPERTY)) { - Item item = (Item) e.getSource(); - if (item.isSelected()) { - addSelectionPath(getTreePath(item)); - } else { - removeSelectionPath(getTreePath(item)); - } + PropertyChangeListener listener = e -> { + if (e.getPropertyName().equals(Item.SELECTED_PROPERTY)) { + Item item = (Item) e.getSource(); + if (item.isSelected()) { + addSelectionPath(getTreePath(item)); } else { - Item item = (Item) e.getSource(); - boolean root = item.getParent() == null; - TreePath path = !root ? getTreePath(item.getParent()) : null; - fireTreeNodesChanged(new TreeModelEvent(JAXXTreeModel.this, path, - !root ? new int[]{item.getParent().getChildren().indexOf(item)} : null, - new Object[]{item.getValue()})); + removeSelectionPath(getTreePath(item)); } + } else { + Item item = (Item) e.getSource(); + boolean root = item.getParent() == null; + TreePath path = !root ? getTreePath(item.getParent()) : null; + fireTreeNodesChanged(new TreeModelEvent(JAXXTreeModel.this, path, + !root ? new int[]{item.getParent().getChildren().indexOf(item)} : null, + new Object[]{item.getValue()})); } }; addPropertyChangeListener(root, listener); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/OneClicListSelectionModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/OneClicListSelectionModel.java index a9c40b3..ad9d96b 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/OneClicListSelectionModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/OneClicListSelectionModel.java @@ -37,9 +37,9 @@ import java.util.Arrays; public class OneClicListSelectionModel implements ListSelectionModel { /** Logger */ - static private Log log = LogFactory.getLog(OneClicListSelectionModel.class); + static private final Log log = LogFactory.getLog(OneClicListSelectionModel.class); - protected ListSelectionModel delegate; + protected final ListSelectionModel delegate; protected final ListModel model; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfo.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfo.java index 24893c1..79a0eb0 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfo.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfo.java @@ -30,27 +30,27 @@ import java.beans.PropertyChangeSupport; public class TabInfo { - public static String BACKGROUND_PROPERTY = "background"; + public static final String BACKGROUND_PROPERTY = "background"; - public static String TAB_COMPONENT_PROPERTY = "tabComponent"; + public static final String TAB_COMPONENT_PROPERTY = "tabComponent"; - public static String TAB_COMPONENT_STR_PROPERTY = "tabComponentStr"; + public static final String TAB_COMPONENT_STR_PROPERTY = "tabComponentStr"; - public static String DISABLED_ICON_PROPERTY = "disabledIcon"; + public static final String DISABLED_ICON_PROPERTY = "disabledIcon"; - public static String DISPLAYED_MNEMONIC_INDEX_PROPERTY = "displayedMnemonicIndex"; + public static final String DISPLAYED_MNEMONIC_INDEX_PROPERTY = "displayedMnemonicIndex"; - public static String ENABLED_PROPERTY = "enabled"; + public static final String ENABLED_PROPERTY = "enabled"; - public static String FOREGROUND_PROPERTY = "foreground"; + public static final String FOREGROUND_PROPERTY = "foreground"; - public static String ICON_PROPERTY = "icon"; + public static final String ICON_PROPERTY = "icon"; - public static String MNEMONIC_PROPERTY = "mnemonic"; + public static final String MNEMONIC_PROPERTY = "mnemonic"; - public static String TITLE_PROPERTY = "title"; + public static final String TITLE_PROPERTY = "title"; - public static String TOOL_TIP_TEXT_PROPERTY = "toolTipText"; + public static final String TOOL_TIP_TEXT_PROPERTY = "toolTipText"; private String id; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfoPropertyChangeListener.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfoPropertyChangeListener.java index 4289ca7..54d39c0 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfoPropertyChangeListener.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfoPropertyChangeListener.java @@ -30,9 +30,9 @@ import java.beans.PropertyChangeListener; public class TabInfoPropertyChangeListener implements PropertyChangeListener { - private JTabbedPane tabs; + private final JTabbedPane tabs; - private int tabIndex; + private final int tabIndex; public TabInfoPropertyChangeListener(JTabbedPane tabs, int tabIndex) { this.tabs = tabs; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Table.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Table.java index df4a3b7..b18cc12 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Table.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Table.java @@ -38,7 +38,7 @@ public class Table extends JPanel { public static final Insets DEFAULT_INSETS = new Insets(3, 3, 3, 3); - private GridBagConstraints tableConstraints = new GridBagConstraints(); + private final GridBagConstraints tableConstraints = new GridBagConstraints(); private GridBagConstraints rowConstraints; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionExecutor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionExecutor.java index 6844a2b..2eefe4d 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionExecutor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionExecutor.java @@ -26,9 +26,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ReflectUtil; import javax.swing.SwingWorker; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -91,55 +89,51 @@ public abstract class ActionExecutor { public abstract void onAfterAction(ActionWorker<?, ?> source); public ActionExecutor() { - workerListener = new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("action " + evt.getSource() + " property " + - evt.getPropertyName() + " changed <" + - evt.getOldValue() + " - " + evt.getNewValue() + - '>'); - } + workerListener = evt -> { + if (log.isDebugEnabled()) { + log.debug("action " + evt.getSource() + " property " + + evt.getPropertyName() + " changed <" + + evt.getOldValue() + " - " + evt.getNewValue() + + '>'); + } - if ("state".equals(evt.getPropertyName())) { - ActionWorker<?, ?> source = (ActionWorker<?, ?>) evt.getSource(); - SwingWorker.StateValue state = - (SwingWorker.StateValue) evt.getNewValue(); + if ("state".equals(evt.getPropertyName())) { + ActionWorker<?, ?> source = (ActionWorker<?, ?>) evt.getSource(); + SwingWorker.StateValue state = + (SwingWorker.StateValue) evt.getNewValue(); - if (state == SwingWorker.StateValue.STARTED) { - // starting new action + if (state == SwingWorker.StateValue.STARTED) { + // starting new action - onActionStart(source); - return; - } + onActionStart(source); + return; + } - if (state == SwingWorker.StateValue.DONE) { - // on rend la main au thread pour qu'il attende une - // prochaine operation + if (state == SwingWorker.StateValue.DONE) { + // on rend la main au thread pour qu'il attende une + // prochaine operation - ActionWorker.ActionStatus status = source.getStatus(); - if (log.isDebugEnabled()) { - log.debug("Action [" + source.getActionLabel() + - "] status = " + status); - } - try { - switch (status) { - - case OK: - onActionEnd(source); - break; - case CANCEL: - onActionCancel(source); - break; - case FAIL: - onActionFail(source); - break; - } - } finally { - tasks.remove(source); - onAfterAction(source); + ActionWorker.ActionStatus status = source.getStatus(); + if (log.isDebugEnabled()) { + log.debug("Action [" + source.getActionLabel() + + "] status = " + status); + } + try { + switch (status) { + + case OK: + onActionEnd(source); + break; + case CANCEL: + onActionCancel(source); + break; + case FAIL: + onActionFail(source); + break; } + } finally { + tasks.remove(source); + onAfterAction(source); } } } @@ -180,7 +174,7 @@ public abstract class ActionExecutor { * @throws InterruptedException if something wrong while waiting end of * executor */ - public void terminatesAndWaits() throws InterruptedException { + public void terminatesAndWaits() { if (log.isDebugEnabled()) { log.debug("Executor " + this + " is terminating..."); @@ -236,39 +230,33 @@ public abstract class ActionExecutor { result = (Runnable) Proxy.newProxyInstance( getClass().getClassLoader(), new Class<?>[]{Runnable.class}, - new InvocationHandler() { - - @Override - public Object invoke(Object proxy, - Method method, - Object[] args) { - String methodName = method.getName(); - - if ("run".equals(methodName)) { - try { - if (log.isDebugEnabled()) { - log.debug("will invoke run method"); - } - return targetMethod.invoke(methodContainer, arguments); - } catch (IllegalAccessException e) { - throw new RuntimeException( - "could not invoke on container " + - methodContainer, e); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); + (proxy, method, args) -> { + String methodName1 = method.getName(); + + if ("run".equals(methodName1)) { + try { + if (log.isDebugEnabled()) { + log.debug("will invoke run method"); } + return targetMethod.invoke(methodContainer, arguments); + } catch (IllegalAccessException e) { + throw new RuntimeException( + "could not invoke on container " + + methodContainer, e); + } catch (InvocationTargetException e) { + throw new RuntimeException(e); } - if (methodName.equals("toString")) { - return toString(); - } - if (methodName.equals("equals")) { - return equals(args[0]); - } - if (methodName.equals("hashCode")) { - return hashCode(); - } - return null; } + if (methodName1.equals("toString")) { + return toString(); + } + if (methodName1.equals("equals")) { + return equals(args[0]); + } + if (methodName1.equals("hashCode")) { + return hashCode(); + } + return null; } ); return result; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ApplicationRunner.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ApplicationRunner.java index eccf3e4..8d1ead3 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ApplicationRunner.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ApplicationRunner.java @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory; public abstract class ApplicationRunner { /** Logger */ - private static Log log = LogFactory.getLog(ApplicationRunner.class); + private static final Log log = LogFactory.getLog(ApplicationRunner.class); private static final Object lock = new Object(); @@ -131,37 +131,30 @@ public abstract class ApplicationRunner { initOnce(); - runnable = new Runnable() { - @Override - public void run() { - startingTime = System.nanoTime(); - try { + runnable = () -> { + startingTime = System.nanoTime(); + try { - onInit(); + onInit(); - onStart(); + onStart(); - } catch (Exception e) { - error = e; - onError(e); - unlock(); - } + } catch (Exception e) { + error = e; + onError(e); + unlock(); } }; - Thread shutdownHook = new Thread(new Runnable() { + Thread shutdownHook = new Thread(() -> { + try { - @Override - public void run() { - try { + //onClose(false); + onShutdown(); - //onClose(false); - onShutdown(); - - } catch (Exception e) { - error = e; - onShutdown(e); - } + } catch (Exception e) { + error = e; + onShutdown(e); } }, "ShutDown " + getClass().getSimpleName()); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/BooleanCellEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/BooleanCellEditor.java index 08eb6a2..888ff5b 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/BooleanCellEditor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/BooleanCellEditor.java @@ -40,10 +40,10 @@ public class BooleanCellEditor extends AbstractCellEditor implements TableCellRe private static final long serialVersionUID = 1L; - protected TableCellRenderer rendererDelegate; - protected TableCellEditor editorDelegate; + protected final TableCellRenderer rendererDelegate; + protected final TableCellEditor editorDelegate; - protected Icon icon; + protected final Icon icon; public BooleanCellEditor(TableCellRenderer delegate) { this(delegate, null); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/ColorCellEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/ColorCellEditor.java index 5b3d9b3..eafb16e 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/ColorCellEditor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/ColorCellEditor.java @@ -47,11 +47,11 @@ public class ColorCellEditor extends AbstractCellEditor protected Color currentColor; - protected JButton button; + protected final JButton button; - protected JColorChooser colorChooser; + protected final JColorChooser colorChooser; - protected JDialog dialog; + protected final JDialog dialog; protected static final String EDIT = "edit"; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpBroker.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpBroker.java index 7e10e80..b102ee3 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpBroker.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpBroker.java @@ -74,7 +74,7 @@ public class JAXXHelpBroker { public static final String JAXX_CONTEXT_ENTRY = "jaxxcontext"; /** Logger */ - static private Log log = LogFactory.getLog(JAXXHelpBroker.class); + static private final Log log = LogFactory.getLog(JAXXHelpBroker.class); /** name of helpset */ protected final String helpsetName; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java index 41c8f8f..6d8d30d 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java @@ -36,7 +36,7 @@ public abstract class AbstractGenericListSelectionModel<B> extends DefaultListSe public static final String PROPERTY_SELECTED_VALUE = "selectedValues"; - protected EventListenerList listenerList = new EventListenerList(); + protected final EventListenerList listenerList = new EventListenerList(); protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); protected List<B> selectedValues; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListEvent.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListEvent.java index c3f08f8..69e867f 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListEvent.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListEvent.java @@ -29,7 +29,7 @@ import java.util.EventObject; */ public class GenericListEvent<B> extends EventObject { - protected Collection<B> values; + protected final Collection<B> values; public GenericListEvent(Object source, Collection<B> values) { super(source); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListSelectionModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListSelectionModel.java index 07714f8..fccb689 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListSelectionModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListSelectionModel.java @@ -28,7 +28,7 @@ import javax.swing.DefaultListModel; */ public class GenericListSelectionModel<B> extends AbstractGenericListSelectionModel<B> { - protected DefaultListModel listModel; + protected final DefaultListModel listModel; public GenericListSelectionModel(DefaultListModel listModel) { super(); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultListModel.java index 60a741c..625665e 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultListModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultListModel.java @@ -42,7 +42,7 @@ public class JaxxDefaultListModel<E> extends AbstractListModel { private static final long serialVersionUID = 1L; - protected ArrayList<E> delegate = new ArrayList<>(); + protected final ArrayList<E> delegate = new ArrayList<>(); protected boolean valueIsAdjusting; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java index 14d0caf..01a229a 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java @@ -49,7 +49,7 @@ public class JaxxFilterableComboBoxModel<E> extends JaxxDefaultComboBoxModel<E> public static final Character DEFAULT_WILDCARD_CHARACTER = '*'; - protected List<E> filteredItems = Lists.newArrayList(); + protected final List<E> filteredItems = Lists.newArrayList(); protected String filterText; @@ -58,7 +58,7 @@ public class JaxxFilterableComboBoxModel<E> extends JaxxDefaultComboBoxModel<E> /** the decorator of data */ protected JXPathDecorator<E> decorator; - protected List<Predicate<E>> filters = Lists.newArrayList(); + protected final List<Predicate<E>> filters = Lists.newArrayList(); public JaxxFilterableComboBoxModel() { super(); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableListModel.java index dfd40d4..9822a1c 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableListModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableListModel.java @@ -41,14 +41,14 @@ public class JaxxFilterableListModel<E> extends JaxxDefaultListModel<E> { private static final long serialVersionUID = 1L; - protected ArrayList<E> filteredItems = Lists.newArrayList(); + protected final ArrayList<E> filteredItems = Lists.newArrayList(); protected String filterText; /** the decorator of data */ protected JXPathDecorator<E> decorator; - protected List<Predicate<E>> filters = Lists.newArrayList(); + protected final List<Predicate<E>> filters = Lists.newArrayList(); @Override public E getElementAt(int index) { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemListener.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemListener.java index ad304e3..a258f2e 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemListener.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemListener.java @@ -36,6 +36,6 @@ public interface WillChangeSelectedItemListener extends EventListener { /** * Invoked whenever the selected item is about to change in the comboBox. */ - void selectedItemWillChanged(ComboBoxSelectionEvent event) throws WillChangeSelectedItemVetoException; + void selectedItemWillChanged(ComboBoxSelectionEvent event); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemVetoException.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemVetoException.java index 91eb858..7285cde 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemVetoException.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemVetoException.java @@ -33,7 +33,7 @@ public class WillChangeSelectedItemVetoException extends Exception { private static final long serialVersionUID = 1L; /** The event that the exception was created for. */ - protected ComboBoxSelectionEvent event; + protected final ComboBoxSelectionEvent event; /** * Constructs an ExpandVetoException object with no message. diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavHelper.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavHelper.java index a7feb44..8fab3e9 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavHelper.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavHelper.java @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory; import javax.swing.event.TreeExpansionEvent; import javax.swing.event.TreeModelEvent; import javax.swing.event.TreeModelListener; -import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.event.TreeWillExpandListener; import javax.swing.tree.TreePath; @@ -239,19 +238,19 @@ public abstract class NavHelper<M, U, B extends NavBridge<M, N>, N extends NavNo * If so, the listener will load selected node childs if required * (says when the {@link NavNode#isLoaded()} is sets to {@code false}). */ - protected TreeWillExpandListener expandListener; + protected final TreeWillExpandListener expandListener; /** * pour ouvrir les fils d'un noeud que l'on vient de sélectionner pour * éviter d'avoir à faire des doubles clics. */ - protected TreeSelectionListener selectionListener; + protected final TreeSelectionListener selectionListener; /** * pour recharger le rendu des noeuds (et charger les fils si nécessaires) * lors d'une modification dans le modèle de l'arbre. */ - protected TreeModelListener treeModelListener; + protected final TreeModelListener treeModelListener; /** Cache of child loadors. */ protected static Set<? super NavNodeChildLoador<?, ?, ?, ?, ?>> childLoadors; @@ -301,65 +300,61 @@ public abstract class NavHelper<M, U, B extends NavBridge<M, N>, N extends NavNo public NavHelper(B bridge) { this.bridge = bridge; - selectionListener = new TreeSelectionListener() { + selectionListener = e -> { - @Override - public void valueChanged(TreeSelectionEvent e) { - - if (!checkModel()) { - return; - } + if (!checkModel()) { + return; + } - // Hack, because event.getSource for TreeTable doesnt return selectionModel - TreeSelectionModel source = getSelectionModel(); + // Hack, because event.getSource for TreeTable doesnt return selectionModel + TreeSelectionModel source = getSelectionModel(); - if (source.isSelectionEmpty()) { + if (source.isSelectionEmpty()) { - // empty selection - if (log.isDebugEnabled()) { - log.debug("Selection is empty."); - } - return; + // empty selection + if (log.isDebugEnabled()) { + log.debug("Selection is empty."); } + return; + } - boolean debugEnabled = log.isDebugEnabled(); - boolean traceEnabled = log.isTraceEnabled(); - for (TreePath path : e.getPaths()) { + boolean debugEnabled = log.isDebugEnabled(); + boolean traceEnabled = log.isTraceEnabled(); + for (TreePath path : e.getPaths()) { - N node = getNode(path); - if (node == null) { + N node = getNode(path); + if (node == null) { - // pas de noeud selectionne - if (debugEnabled) { - log.debug("Skip for null node."); - } - continue; + // pas de noeud selectionne + if (debugEnabled) { + log.debug("Skip for null node."); } + continue; + } - boolean isAdded = e.isAddedPath(path); + boolean isAdded = e.isAddedPath(path); - TreePath pathToExpand = new TreePath(NavHelper.this.bridge.getPathToRoot(node)); - boolean pathExpanded = isExpanded(pathToExpand); + TreePath pathToExpand = new TreePath(NavHelper.this.bridge.getPathToRoot(node)); + boolean pathExpanded = isExpanded(pathToExpand); - if (traceEnabled || isAdded && debugEnabled) { - log.debug("==== Node selection ===================================="); - log.debug("node ? " + node); - log.debug("is added ? " + isAdded); - log.debug("is path expanded ? " + pathExpanded); - log.debug("is node static ? " + node.isStaticNode()); - log.debug("is node loaded ? " + node.isLoaded()); - log.debug("is node leaf ? " + node.isLeaf()); - log.debug("node nb childs ? " + node.getChildCount()); - } + if (traceEnabled || isAdded && debugEnabled) { + log.debug("==== Node selection ===================================="); + log.debug("node ? " + node); + log.debug("is added ? " + isAdded); + log.debug("is path expanded ? " + pathExpanded); + log.debug("is node static ? " + node.isStaticNode()); + log.debug("is node loaded ? " + node.isLoaded()); + log.debug("is node leaf ? " + node.isLeaf()); + log.debug("node nb childs ? " + node.getChildCount()); + } - if (isAdded && !pathExpanded) { + if (isAdded && !pathExpanded) { - // ask to expand path - if (log.isDebugEnabled()) { - log.debug("expand node [" + pathToExpand + "]"); - } - expandPath(pathToExpand); + // ask to expand path + if (log.isDebugEnabled()) { + log.debug("expand node [" + pathToExpand + "]"); } + expandPath(pathToExpand); } } }; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavNodeChildLoador.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavNodeChildLoador.java index 09c56f1..c8101e7 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavNodeChildLoador.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavNodeChildLoador.java @@ -76,7 +76,7 @@ public abstract class NavNodeChildLoador<T, O, M, B extends NavBridge<M, N>, N e */ public abstract List<T> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws Exception; + NavDataProvider dataProvider); /** * Hook to create a child node given his {@code data}. diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java index 8d1276e..728b129 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java @@ -60,7 +60,7 @@ public class NavTreeTableModel implements TreeTableModel { } /** the delegate model */ - protected MyDefaultTreeTableModel delegate; + protected final MyDefaultTreeTableModel delegate; public NavTreeTableModel(MyDefaultTreeTableModel delegate) { this.delegate = delegate; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/BooleanCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/BooleanCellRenderer.java index f1b992b..66a67e1 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/BooleanCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/BooleanCellRenderer.java @@ -47,12 +47,7 @@ public class BooleanCellRenderer extends JPanel implements TableCellRenderer { private final Predicate predicate; - private static final Predicate<Object> DEFAULT_PREDICATE = new Predicate<Object>() { - @Override - public boolean apply(Object input) { - return (input != null && (Boolean) input); - } - }; + private static final Predicate<Object> DEFAULT_PREDICATE = input -> (input != null && (Boolean) input); public BooleanCellRenderer(TableCellRenderer delegate, Predicate<?> predicate) { this(delegate, new JCheckBox(), predicate); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/ColorCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/ColorCellRenderer.java index 563b359..8b27b85 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/ColorCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/ColorCellRenderer.java @@ -35,7 +35,7 @@ import java.awt.Component; */ public class ColorCellRenderer implements TableCellRenderer { - protected JButton button = new JButton(); + protected final JButton button = new JButton(); @Override public Component getTableCellRendererComponent(JTable table, diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java index 48f45b2..9d74172 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java @@ -38,10 +38,10 @@ import java.awt.Component; public class DecoratorListCellRenderer implements ListCellRenderer { /** Delegate cell renderer */ - protected ListCellRenderer delegate; + protected final ListCellRenderer delegate; /** Decorator to produce text to render */ - protected Decorator<?> decorator; + protected final Decorator<?> decorator; public DecoratorListCellRenderer(Decorator<?> decorator) { this(new DefaultListCellRenderer(), decorator); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java index b98803d..b08ef50 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java @@ -45,10 +45,10 @@ import java.awt.Component; public class DecoratorProviderListCellRenderer implements ListCellRenderer { /** Delegate cell renderer */ - protected ListCellRenderer delegate; + protected final ListCellRenderer delegate; /** provider of decorators */ - protected DecoratorProvider provider; + protected final DecoratorProvider provider; public DecoratorProviderListCellRenderer(DecoratorProvider provider) { this(new DefaultListCellRenderer(), provider); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java index 66e08d7..2998658 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java @@ -45,10 +45,10 @@ import java.awt.Component; public class DecoratorProviderTableCellRenderer implements TableCellRenderer { /** Delegate cell renderer */ - protected TableCellRenderer delegate; + protected final TableCellRenderer delegate; /** provider of decorators */ - protected DecoratorProvider provider; + protected final DecoratorProvider provider; public DecoratorProviderTableCellRenderer(DecoratorProvider provider) { this(new DefaultTableCellRenderer(), provider); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java index 2c4df17..744ef9f 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java @@ -39,10 +39,10 @@ import javax.swing.JComponent; public class DecoratorTableCellRenderer implements TableCellRenderer { /** Delegate cell renderer */ - protected TableCellRenderer delegate; + protected final TableCellRenderer delegate; /** Decorator to produce text to render */ - protected Decorator<?> decorator; + protected final Decorator<?> decorator; protected boolean showToolTipText = false; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java index 0fc208c..b5ef0e6 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java @@ -41,7 +41,7 @@ public class EmptyNumberTableCellRenderer implements TableCellRenderer { protected final Double ZEROD = 0D; - private TableCellRenderer delegate; + private final TableCellRenderer delegate; public EmptyNumberTableCellRenderer() { this(new DefaultTableCellRenderer()); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java index c7ca030..4e47cb8 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java @@ -35,9 +35,9 @@ import java.util.EnumSet; */ public class EnumTableCellRenderer<E extends Enum<E>> implements TableCellRenderer { - private TableCellRenderer delegate; + private final TableCellRenderer delegate; - private EnumSet<E> enumValues; + private final EnumSet<E> enumValues; public EnumTableCellRenderer(TableCellRenderer delegate, Class<E> enumClass) { this.delegate = delegate; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java index 5ca59ca..570d1ea 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java @@ -44,7 +44,7 @@ public class I18nTableCellRenderer implements TableCellRenderer { protected final String[] tips; /** the delegate cell renderer */ - protected TableCellRenderer delegate; + protected final TableCellRenderer delegate; public I18nTableCellRenderer(TableCellRenderer delegate, String... keysAndTips) { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java index af17fa9..9d7233f 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java @@ -42,10 +42,10 @@ import java.util.List; public class MultiDecoratorListCellRenderer implements ListCellRenderer { /** Delegate cell renderer */ - protected ListCellRenderer delegate; + protected final ListCellRenderer delegate; /** accepted types */ - protected List<Class<?>> types; + protected final List<Class<?>> types; /** decorators for accepted types */ protected Decorator<?>[] decorators; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java index a975820..8d3711c 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java @@ -42,10 +42,10 @@ import java.util.List; public class MultiDecoratorTableCelleRenderer implements TableCellRenderer { /** Delegate cell renderer */ - protected TableCellRenderer delegate; + protected final TableCellRenderer delegate; /** accepted types */ - protected List<Class<?>> types; + protected final List<Class<?>> types; /** decorators for accepted types */ protected Decorator<?>[] decorators; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/SwingSession.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/SwingSession.java index 4e830c8..2464c9a 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/SwingSession.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/SwingSession.java @@ -25,7 +25,6 @@ package org.nuiton.jaxx.runtime.swing.session; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.Predicate; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -94,15 +93,15 @@ public class SwingSession { protected File file; - protected boolean autoSave; + protected final boolean autoSave; - protected Set<Component> registeredComponent = Sets.newIdentityHashSet(); + protected final Set<Component> registeredComponent = Sets.newIdentityHashSet(); /** * State object registered to get and set State. * key: class of component managed by the state; value: the state */ - protected Map<Class, State> stateManager = Maps.newHashMap(); + protected final Map<Class, State> stateManager = Maps.newHashMap(); /** * state of all component added with add method. @@ -346,14 +345,11 @@ public class SwingSession { } final String cName = getComponentName(c); Object existingComponent = CollectionUtils.find(registeredComponent, - new Predicate<Object>() { - @Override - public boolean evaluate(Object o) { - Component comp = (Component) o; - String compName = getComponentName(comp); - return c.getClass().equals(comp.getClass()) - && cName.equals(compName); - } + o -> { + Component comp = (Component) o; + String compName = getComponentName(comp); + return c.getClass().equals(comp.getClass()) + && cName.equals(compName); }); if (existingComponent != null) { @@ -451,8 +447,8 @@ public class SwingSession { } } - public static interface Action { - public void doAction(SwingSession session, String path, Component c); + public interface Action { + void doAction(SwingSession session, String path, Component c); } public static class SaveStateAction implements Action { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUILancher.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUILancher.java index 5e62905..be7fe6d 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUILancher.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUILancher.java @@ -162,27 +162,19 @@ public abstract class WizardUILancher<E extends WizardStep, M extends WizardMode uiContext.add(newModelEntry(modelClass), model); } // apply action - uiContext.add(APPLY_DEF, new Runnable() { - - @Override - public void run() { - try { - doAction(ui); - } finally { - doClose(ui, false); - } + uiContext.add(APPLY_DEF, () -> { + try { + doAction(ui); + } finally { + doClose(ui, false); } }); // cancel action - uiContext.add(CANCEL_DEF, new Runnable() { - - @Override - public void run() { - try { - doCancel(ui); - } finally { - doClose(ui, true); - } + uiContext.add(CANCEL_DEF, () -> { + try { + doCancel(ui); + } finally { + doClose(ui, true); } }); @@ -210,28 +202,20 @@ public abstract class WizardUILancher<E extends WizardStep, M extends WizardMode uiContext.add(newModelEntry(modelClass), model); } // apply action - uiContext.add(APPLY_DEF, new Runnable() { - - @Override - public void run() { - try { - doAction(ui); - } finally { - doClose(ui, false); - } + uiContext.add(APPLY_DEF, () -> { + try { + doAction(ui); + } finally { + doClose(ui, false); } }); // cancel action - uiContext.add(CANCEL_DEF, new Runnable() { - - @Override - public void run() { - try { - doCancel(ui); - } finally { - doClose(ui, true); - } + uiContext.add(CANCEL_DEF, () -> { + try { + doCancel(ui); + } finally { + doClose(ui, true); } }); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUtil.java index a158fe6..2f86c41 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUtil.java @@ -26,8 +26,6 @@ import org.apache.commons.logging.LogFactory; import javax.swing.JTabbedPane; import java.awt.Component; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.lang.reflect.Array; import java.util.List; @@ -42,7 +40,7 @@ import static org.nuiton.i18n.I18n.t; public class WizardUtil { /** Logger */ - static private Log log = LogFactory.getLog(WizardUI.class); + static private final Log log = LogFactory.getLog(WizardUI.class); protected WizardUtil() { } @@ -67,73 +65,56 @@ public class WizardUtil { public static void addDebugLogListener(final Log log, WizardModel<?> model) { if (log.isDebugEnabled()) { - model.addPropertyChangeListener(new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - log.debug(evt.getPropertyName() + " <" + evt.getOldValue() + " - " + evt.getNewValue() + ">"); - } - }); + model.addPropertyChangeListener(evt -> log.debug(evt.getPropertyName() + " <" + evt.getOldValue() + " - " + evt.getNewValue() + ">")); } } public static void addTraceLogListener(final Log log, WizardModel<?> model) { if (log.isTraceEnabled()) { - model.addPropertyChangeListener(new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - log.trace(evt.getPropertyName() + " <" + evt.getOldValue() + " - " + evt.getNewValue() + ">"); - } - }); + model.addPropertyChangeListener(evt -> log.trace(evt.getPropertyName() + " <" + evt.getOldValue() + " - " + evt.getNewValue() + ">")); } } public static <E extends WizardStep, M extends WizardModel<E>> void installWizardUIListeners(final WizardUI<E, M> ui) { - ui.getModel().addPropertyChangeListener(new PropertyChangeListener() { - - @Override - @SuppressWarnings("unchecked") - public void propertyChange(PropertyChangeEvent evt) { - String propertyName = evt.getPropertyName(); + ui.getModel().addPropertyChangeListener(evt -> { + String propertyName = evt.getPropertyName(); // if (WizardExtModel.WAS_STARTED_PROPERTY_NAME.equals(propertyName)) { // ui.onWasStarted(); // return; // } - if (WizardModel.STEPS_PROPERTY_NAME.equals(propertyName)) { - List<E> steps = (List<E>) evt.getNewValue(); - ui.onStepsChanged( - steps.toArray((E[]) Array.newInstance( - ui.getModel().stepClass, steps.size())) - ); - return; - } - if (WizardModel.STEP_PROPERTY_NAME.equals(propertyName)) { - ui.onStepChanged((E) evt.getOldValue(), (E) evt.getNewValue()); + if (WizardModel.STEPS_PROPERTY_NAME.equals(propertyName)) { + List<E> steps = (List<E>) evt.getNewValue(); + ui.onStepsChanged( + steps.toArray((E[]) Array.newInstance( + ui.getModel().stepClass, steps.size())) + ); + return; + } + if (WizardModel.STEP_PROPERTY_NAME.equals(propertyName)) { + ui.onStepChanged((E) evt.getOldValue(), (E) evt.getNewValue()); // return; + } + /*if (WizardModel.VALID_STEP_PROPERTY_NAME.equals(propertyName)) { + Boolean value = (Boolean) evt.getNewValue(); + if (value == null || !value) { + ui.onModelStateChanged(WizardState.NEED_FIX); + } else { + ui.onModelStateChanged(WizardState.PENDING); } - /*if (WizardModel.VALID_STEP_PROPERTY_NAME.equals(propertyName)) { - Boolean value = (Boolean) evt.getNewValue(); - if (value == null || !value) { - ui.onModelStateChanged(WizardState.NEED_FIX); - } else { - ui.onModelStateChanged(WizardState.PENDING); - } - return; - } - if (WizardExtModel.MODEL_STATE_PROPERTY_NAME.equals(propertyName)) { - //TODO should be unicast : only for good stepUI ? - ui.onModelStateChanged((WizardState) evt.getNewValue()); - return; - } - if (WizardExtModel.STEP_STATE_PROPERTY_NAME.equals(propertyName)) { - IndexedPropertyChangeEvent e = (IndexedPropertyChangeEvent) evt; - int stepIndex = e.getIndex(); - E step = ui.getModel().getSteps().get(stepIndex); - ui.onOperationStateChanged(step, (WizardState) evt.getNewValue()); - return; - }*/ + return; + } + if (WizardExtModel.MODEL_STATE_PROPERTY_NAME.equals(propertyName)) { + //TODO should be unicast : only for good stepUI ? + ui.onModelStateChanged((WizardState) evt.getNewValue()); + return; } + if (WizardExtModel.STEP_STATE_PROPERTY_NAME.equals(propertyName)) { + IndexedPropertyChangeEvent e = (IndexedPropertyChangeEvent) evt; + int stepIndex = e.getIndex(); + E step = ui.getModel().getSteps().get(stepIndex); + ui.onOperationStateChanged(step, (WizardState) evt.getNewValue()); + return; + }*/ }); } @@ -152,39 +133,35 @@ public class WizardUtil { */ public static <E extends WizardStep, M extends WizardModel<E>> void addTabsDisplayUntilStepListener(final WizardUI<E, M> ui) { // on écoute les changements d'étapes - ui.getModel().addPropertyChangeListener(WizardModel.STEP_PROPERTY_NAME, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - M model = (M) evt.getSource(); - E oldStep = (E) evt.getOldValue(); - E newStep = (E) evt.getNewValue(); - log.debug("step has changed <old:" + oldStep + ", new:" + newStep + ">"); - int oldStepIndex = oldStep == null ? -1 : model.getStepIndex(oldStep); - int newStepIndex = model.getStepIndex(newStep); - JTabbedPane tabs = ui.getTabs(); - if (oldStepIndex + 1 == newStepIndex) { - // creation d'un nouvel onglet - WizardStepUI<E, M> c = ui.getStepUI(newStep); - String title = t(newStep.getLabel()); - String tip = t(newStep.getDescription()); - tabs.addTab(title, null, (Component) c, tip); - // selection du nouvel onglet - int index = tabs.indexOfComponent((Component) c); - if (index > -1) { - tabs.setSelectedIndex(index); - } - } else if (oldStepIndex > newStepIndex) { - // il s'agit d'un retour en arrière - // on supprime tous les onglets obsoletes - int index = newStepIndex + 1; - while (tabs.getTabCount() > index) { - log.trace("remove tab : " + index); - tabs.remove(index); - } - } else { - throw new IllegalStateException("can not go from " + oldStep + " to " + newStep); + ui.getModel().addPropertyChangeListener(WizardModel.STEP_PROPERTY_NAME, evt -> { + M model = (M) evt.getSource(); + E oldStep = (E) evt.getOldValue(); + E newStep = (E) evt.getNewValue(); + log.debug("step has changed <old:" + oldStep + ", new:" + newStep + ">"); + int oldStepIndex = oldStep == null ? -1 : model.getStepIndex(oldStep); + int newStepIndex = model.getStepIndex(newStep); + JTabbedPane tabs = ui.getTabs(); + if (oldStepIndex + 1 == newStepIndex) { + // creation d'un nouvel onglet + WizardStepUI<E, M> c = ui.getStepUI(newStep); + String title = t(newStep.getLabel()); + String tip = t(newStep.getDescription()); + tabs.addTab(title, null, (Component) c, tip); + // selection du nouvel onglet + int index = tabs.indexOfComponent((Component) c); + if (index > -1) { + tabs.setSelectedIndex(index); + } + } else if (oldStepIndex > newStepIndex) { + // il s'agit d'un retour en arrière + // on supprime tous les onglets obsoletes + int index = newStepIndex + 1; + while (tabs.getTabCount() > index) { + log.trace("remove tab : " + index); + tabs.remove(index); } + } else { + throw new IllegalStateException("can not go from " + oldStep + " to " + newStep); } }); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtModel.java index ab79c04..8b7a22f 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtModel.java @@ -55,13 +55,13 @@ public abstract class WizardExtModel<E extends WizardExtStep> extends WizardMode public static final String WAS_STARTED_PROPERTY_NAME = "wasStarted"; /** La liste des opérations à effectuer */ - protected Set<E> operations; + protected final Set<E> operations; /** le dictionnaire des modèles d'opération */ protected final Map<E, WizardExtStepModel<E>> models; /** Pour conserver les états des opérations */ - protected Map<E, WizardState> stepStates; + protected final Map<E, WizardState> stepStates; /** L'état générale du modèle */ protected WizardState modelState; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java index 2a13d49..ace552b 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.beans.IndexedPropertyChangeEvent; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Array; import java.util.List; @@ -42,7 +41,7 @@ import java.util.List; public class WizardExtUtil extends WizardUtil { /** Logger */ - static private Log log = LogFactory.getLog(WizardUI.class); + static private final Log log = LogFactory.getLog(WizardUI.class); protected WizardExtUtil() { } @@ -68,49 +67,44 @@ public class WizardExtUtil extends WizardUtil { public static <E extends WizardExtStep, M extends WizardExtModel<E>> void installWizardUIListeners(final WizardExtUI<E, M> ui) { - PropertyChangeListener dispatcher = new PropertyChangeListener() { - - @Override - @SuppressWarnings("unchecked") - public void propertyChange(PropertyChangeEvent evt) { - String propertyName = evt.getPropertyName(); - if (WizardExtModel.WAS_STARTED_PROPERTY_NAME.equals(propertyName)) { - ui.onWasStarted(); - return; - } - WizardExtModel<E> model = (WizardExtModel<E>) evt.getSource(); - if (WizardModel.STEPS_PROPERTY_NAME.equals(propertyName)) { - List<E> steps = (List<E>) evt.getNewValue(); - ui.onStepsChanged( - steps.toArray((E[]) Array.newInstance( - model.getStepClass(), steps.size())) - ); - return; - } - if (WizardModel.STEP_PROPERTY_NAME.equals(propertyName)) { - ui.onStepChanged((E) evt.getOldValue(), (E) evt.getNewValue()); - return; - } - if (WizardModel.VALID_STEP_PROPERTY_NAME.equals(propertyName)) { - Boolean value = (Boolean) evt.getNewValue(); - if (value == null || !value) { - ui.onModelStateChanged(WizardState.NEED_FIX); - } else { - ui.onModelStateChanged(WizardState.PENDING); - } - return; - } - if (WizardExtModel.MODEL_STATE_PROPERTY_NAME.equals(propertyName)) { - //TODO should be unicast : only for good stepUI ? - ui.onModelStateChanged((WizardState) evt.getNewValue()); - return; - } - if (WizardExtModel.STEP_STATE_PROPERTY_NAME.equals(propertyName)) { - IndexedPropertyChangeEvent e = (IndexedPropertyChangeEvent) evt; - int stepIndex = e.getIndex(); - E step = model.getSteps().get(stepIndex); - ui.onOperationStateChanged(step, (WizardState) evt.getNewValue()); + PropertyChangeListener dispatcher = evt -> { + String propertyName = evt.getPropertyName(); + if (WizardExtModel.WAS_STARTED_PROPERTY_NAME.equals(propertyName)) { + ui.onWasStarted(); + return; + } + WizardExtModel<E> model = (WizardExtModel<E>) evt.getSource(); + if (WizardModel.STEPS_PROPERTY_NAME.equals(propertyName)) { + List<E> steps = (List<E>) evt.getNewValue(); + ui.onStepsChanged( + steps.toArray((E[]) Array.newInstance( + model.getStepClass(), steps.size())) + ); + return; + } + if (WizardModel.STEP_PROPERTY_NAME.equals(propertyName)) { + ui.onStepChanged((E) evt.getOldValue(), (E) evt.getNewValue()); + return; + } + if (WizardModel.VALID_STEP_PROPERTY_NAME.equals(propertyName)) { + Boolean value = (Boolean) evt.getNewValue(); + if (value == null || !value) { + ui.onModelStateChanged(WizardState.NEED_FIX); + } else { + ui.onModelStateChanged(WizardState.PENDING); } + return; + } + if (WizardExtModel.MODEL_STATE_PROPERTY_NAME.equals(propertyName)) { + //TODO should be unicast : only for good stepUI ? + ui.onModelStateChanged((WizardState) evt.getNewValue()); + return; + } + if (WizardExtModel.STEP_STATE_PROPERTY_NAME.equals(propertyName)) { + IndexedPropertyChangeEvent e = (IndexedPropertyChangeEvent) evt; + int stepIndex = e.getIndex(); + E step = model.getSteps().get(stepIndex); + ui.onOperationStateChanged(step, (WizardState) evt.getNewValue()); } }; M model = ui.getModel(); diff --git a/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContextTest.java b/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContextTest.java index 76736eb..f07d612 100644 --- a/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContextTest.java +++ b/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContextTest.java @@ -33,7 +33,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Arrays; import java.util.List; @@ -158,14 +157,11 @@ public class DefaultApplicationContextTest { @Test public void testEntryListener() { - PropertyChangeListener listener = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isInfoEnabled()) { - log.info("changed detected on " + evt.getSource()); - } - yoCount++; + PropertyChangeListener listener = evt -> { + if (log.isInfoEnabled()) { + log.info("changed detected on " + evt.getSource()); } + yoCount++; }; context.addPropertyChangeListener(STRING_ENTRY, "myKey", listener); diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java index e9b4469..d137cd5 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java @@ -49,7 +49,7 @@ public class SimpleBeanValidatorMessageTableModel extends AbstractTableModel private static final long serialVersionUID = 1L; /** Logger */ - private static Log log = + private static final Log log = LogFactory.getLog(SimpleBeanValidatorMessageTableModel.class); public static final String[] columnNames = @@ -59,10 +59,10 @@ public class SimpleBeanValidatorMessageTableModel extends AbstractTableModel {NuitonValidatorScope.class, String.class, String.class}; /** list of registred validators */ - protected transient List<SimpleBeanValidator<?>> validators; + protected final transient List<SimpleBeanValidator<?>> validators; /** list of messages actual displayed */ - protected List<SimpleBeanValidatorMessage> data; + protected final List<SimpleBeanValidatorMessage> data; public SimpleBeanValidatorMessageTableModel() { validators = new ArrayList<>(); diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessage.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessage.java index 23280b0..7b9b09b 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessage.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessage.java @@ -38,7 +38,7 @@ public class SwingListValidatorMessage extends BeanListValidatorMessage<SwingLis private static final long serialVersionUID = 1L; /** the optional field's editor */ - protected JComponent editor; + protected final JComponent editor; public SwingListValidatorMessage(BeanListValidator<?> validator, Object bean, diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java index fce1f69..6c1e05a 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java @@ -53,7 +53,7 @@ public class SwingListValidatorMessageTableModel extends AbstractTableModel private static final long serialVersionUID = 1L; /** Logger */ - private static Log log = + private static final Log log = LogFactory.getLog(SwingListValidatorMessageTableModel.class); public static final String[] columnNames = @@ -64,10 +64,10 @@ public class SwingListValidatorMessageTableModel extends AbstractTableModel {NuitonValidatorScope.class, Object.class, String.class, String.class}; /** list of registred validators */ - protected transient List<BeanListValidator<?>> validators; + protected final transient List<BeanListValidator<?>> validators; /** list of messages actual displayed */ - protected List<SwingListValidatorMessage> data; + protected final List<SwingListValidatorMessage> data; public SwingListValidatorMessageTableModel() { data = Lists.newArrayList(); diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java index 7fc6fe9..a2ebc89 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java @@ -42,7 +42,7 @@ import java.beans.PropertyChangeSupport; public class SwingListValidatorMessageTableMouseListener extends MouseAdapter { /** Logger */ - private static Log log = + private static final Log log = LogFactory.getLog(SwingListValidatorMessageTableMouseListener.class); public static final String HIGHLIGHT_ERROR_PROPERTY = "highlightError"; @@ -52,7 +52,7 @@ public class SwingListValidatorMessageTableMouseListener extends MouseAdapter { * * @since 2.5.3 */ - protected PropertyChangeSupport pcs; + protected final PropertyChangeSupport pcs; /** * The editor of listened bean. diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java index 8b13b84..e201a6d 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java @@ -44,13 +44,11 @@ import javax.swing.JToggleButton; import javax.swing.JToolBar; import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; -import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.TableCellRenderer; import java.awt.Component; import java.awt.Point; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.HierarchyBoundsAdapter; @@ -75,11 +73,11 @@ public class SwingListValidatorMessageWidget extends JToggleButton { public static final String CLOSE_DIALOG_ACTION = "closeDialog"; - protected SwingListValidatorMessageTableModel messageTableModel = new SwingListValidatorMessageTableModel(); + protected final SwingListValidatorMessageTableModel messageTableModel = new SwingListValidatorMessageTableModel(); - protected JDialog popup = new JDialog(); + protected final JDialog popup = new JDialog(); - protected JTable messageTable = new JTable(); + protected final JTable messageTable = new JTable(); protected Point popupPosition = null; @@ -87,52 +85,49 @@ public class SwingListValidatorMessageWidget extends JToggleButton { super(SwingUtil.createActionIcon("alert-none")); setToolTipText(t("validator.messageWidget.alert.none")); - messageTableModel.addTableModelListener(new TableModelListener() { + messageTableModel.addTableModelListener(e -> { + int alerts = messageTableModel.getRowCount(); + String label; + switch (alerts) { + case 0: + label = n("validator.messageWidget.alert.none"); + break; + case 1: + label = n("validator.messageWidget.alert.one"); + break; + default: + label = n("validator.messageWidget.alert.several"); + } - public void tableChanged(TableModelEvent e) { - int alerts = messageTableModel.getRowCount(); - String label; - switch (alerts) { - case 0: - label = n("validator.messageWidget.alert.none"); + NuitonValidatorScope maxScope; + String icon; + if (alerts == 0) { + icon = "alert-none"; + + } else { + maxScope = NuitonValidatorScope.INFO; + for (int i = 0; i < alerts; i++) { + NuitonValidatorScope scope = messageTableModel.getRow(i).getScope(); + int diff = scope.compareTo(maxScope); + if (diff < 0) { + maxScope = scope; + } + } + switch (maxScope) { + case INFO: + icon = "alert-info"; break; - case 1: - label = n("validator.messageWidget.alert.one"); + case WARNING: + icon = "alert-warning"; break; default: - label = n("validator.messageWidget.alert.several"); - } + icon = "alert-error"; - NuitonValidatorScope maxScope; - String icon; - if (alerts == 0) { - icon = "alert-none"; - - } else { - maxScope = NuitonValidatorScope.INFO; - for (int i = 0; i < alerts; i++) { - NuitonValidatorScope scope = messageTableModel.getRow(i).getScope(); - int diff = scope.compareTo(maxScope); - if (diff < 0) { - maxScope = scope; - } - } - switch (maxScope) { - case INFO: - icon = "alert-info"; - break; - case WARNING: - icon = "alert-warning"; - break; - default: - icon = "alert-error"; - - } } - - setToolTipText(t(label, alerts)); - setIcon(SwingUtil.createActionIcon(icon)); } + + setToolTipText(t(label, alerts)); + setIcon(SwingUtil.createActionIcon(icon)); }); messageTable.setModel(messageTableModel); @@ -183,15 +178,11 @@ public class SwingListValidatorMessageWidget extends JToggleButton { }); - addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - if (isSelected()) { - popup.setVisible(true); - } else { - popup.dispose(); - } + addActionListener(e -> { + if (isSelected()) { + popup.setVisible(true); + } else { + popup.dispose(); } }); diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorTableEditorModelListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorTableEditorModelListener.java index 3bcd236..d62f95b 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorTableEditorModelListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorTableEditorModelListener.java @@ -46,7 +46,7 @@ public class SwingListValidatorTableEditorModelListener<O> implements TableModel private final SwingListValidatorDataLocator<O> dataLocator; - private BeanListValidator<O> validator; + private final BeanListValidator<O> validator; public SwingListValidatorTableEditorModelListener( BeanListValidator<O> validator, diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessage.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessage.java index a1bf0bb..7cf51f7 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessage.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessage.java @@ -38,7 +38,7 @@ public class SwingValidatorMessage extends SimpleBeanValidatorMessage<SwingValid private static final long serialVersionUID = 1L; /** the optional field's editor */ - protected JComponent editor; + protected final JComponent editor; public SwingValidatorMessage(SwingValidator<?> validator, String fieldName, diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListModel.java index 3151ead..729a802 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListModel.java @@ -46,13 +46,13 @@ public class SwingValidatorMessageListModel private static final long serialVersionUID = 1L; /** Logger */ - private static Log log = LogFactory.getLog(SwingValidatorMessageListModel.class); + private static final Log log = LogFactory.getLog(SwingValidatorMessageListModel.class); /** list of registred validators */ - protected transient List<SwingValidator<?>> validators; + protected final transient List<SwingValidator<?>> validators; /** list of messages actual displayed */ - protected List<SwingValidatorMessage> data; + protected final List<SwingValidatorMessage> data; public SwingValidatorMessageListModel() { validators = new ArrayList<>(); diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListMouseListener.java index 4548da5..0e307c3 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListMouseListener.java @@ -41,7 +41,7 @@ import java.awt.event.MouseEvent; public class SwingValidatorMessageListMouseListener extends MouseAdapter { /** Logger */ - static private Log log = + static private final Log log = LogFactory.getLog(SwingValidatorMessageListMouseListener.class); @Override diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListRenderer.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListRenderer.java index 2e3f6e5..4502407 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListRenderer.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListRenderer.java @@ -45,7 +45,7 @@ public class SwingValidatorMessageListRenderer extends DefaultListCellRenderer { protected String format = "%1$-20s - %2$s"; - protected String formatTip = "%1$-20s - %2$-20s : %3$s"; + protected final String formatTip = "%1$-20s - %2$-20s : %3$s"; public SwingValidatorMessageListRenderer() { } diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java index 43ec4d8..7ce498e 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java @@ -50,7 +50,7 @@ public class SwingValidatorMessageTableModel private static final long serialVersionUID = 1L; /** Logger */ - private static Log log = + private static final Log log = LogFactory.getLog(SwingValidatorMessageTableModel.class); public static final String[] columnNames = @@ -60,10 +60,10 @@ public class SwingValidatorMessageTableModel {NuitonValidatorScope.class, String.class, String.class}; /** list of registred validators */ - protected transient List<SwingValidator<?>> validators; + protected final transient List<SwingValidator<?>> validators; /** list of messages actual displayed */ - protected List<SwingValidatorMessage> data; + protected final List<SwingValidatorMessage> data; public SwingValidatorMessageTableModel() { validators = new ArrayList<>(); diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableMouseListener.java index 4ad921c..ae5ec78 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableMouseListener.java @@ -44,13 +44,13 @@ import java.beans.PropertyChangeSupport; public class SwingValidatorMessageTableMouseListener extends MouseAdapter { /** Logger */ - private static Log log = + private static final Log log = LogFactory.getLog(SwingValidatorMessageTableMouseListener.class); public static final String HIGHLIGHT_ERROR_PROPERTY = "highlightError"; /** delgate property change support */ - protected PropertyChangeSupport pcs; + protected final PropertyChangeSupport pcs; public SwingValidatorMessageTableMouseListener() { pcs = new PropertyChangeSupport(this); diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java index 3344961..13eadcc 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java @@ -44,12 +44,10 @@ import javax.swing.JToggleButton; import javax.swing.JToolBar; import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; -import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import java.awt.Component; import java.awt.Point; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.HierarchyBoundsAdapter; @@ -78,11 +76,11 @@ public class SwingValidatorMessageWidget extends JToggleButton { public static final String CLOSE_DIALOG_ACTION = "closeDialog"; - protected SwingValidatorMessageTableModel errorTableModel = new SwingValidatorMessageTableModel(); + protected final SwingValidatorMessageTableModel errorTableModel = new SwingValidatorMessageTableModel(); - protected JDialog popup = new JDialog(); + protected final JDialog popup = new JDialog(); - protected JTable errorTable = new JTable(); + protected final JTable errorTable = new JTable(); protected Point popupPosition = null; @@ -90,52 +88,49 @@ public class SwingValidatorMessageWidget extends JToggleButton { super(SwingUtil.createActionIcon("alert-none")); setToolTipText(t("validator.messageWidget.alert.none")); - errorTableModel.addTableModelListener(new TableModelListener() { + errorTableModel.addTableModelListener(e -> { + int alerts = errorTableModel.getRowCount(); + String label; + switch (alerts) { + case 0: + label = n("validator.messageWidget.alert.none"); + break; + case 1: + label = n("validator.messageWidget.alert.one"); + break; + default: + label = n("validator.messageWidget.alert.several"); + } - public void tableChanged(TableModelEvent e) { - int alerts = errorTableModel.getRowCount(); - String label; - switch (alerts) { - case 0: - label = n("validator.messageWidget.alert.none"); + NuitonValidatorScope maxScope; + String icon; + if (alerts == 0) { + icon = "alert-none"; + + } else { + maxScope = NuitonValidatorScope.INFO; + for (int i = 0; i < alerts; i++) { + NuitonValidatorScope scope = errorTableModel.getRow(i).getScope(); + int diff = scope.compareTo(maxScope); + if (diff < 0) { + maxScope = scope; + } + } + switch (maxScope) { + case INFO: + icon = "alert-info"; break; - case 1: - label = n("validator.messageWidget.alert.one"); + case WARNING: + icon = "alert-warning"; break; default: - label = n("validator.messageWidget.alert.several"); - } + icon = "alert-error"; - NuitonValidatorScope maxScope; - String icon; - if (alerts == 0) { - icon = "alert-none"; - - } else { - maxScope = NuitonValidatorScope.INFO; - for (int i = 0; i < alerts; i++) { - NuitonValidatorScope scope = errorTableModel.getRow(i).getScope(); - int diff = scope.compareTo(maxScope); - if (diff < 0) { - maxScope = scope; - } - } - switch (maxScope) { - case INFO: - icon = "alert-info"; - break; - case WARNING: - icon = "alert-warning"; - break; - default: - icon = "alert-error"; - - } } - - setToolTipText(t(label, alerts)); - setIcon(SwingUtil.createActionIcon(icon)); } + + setToolTipText(t(label, alerts)); + setIcon(SwingUtil.createActionIcon(icon)); }); errorTable.setModel(errorTableModel); @@ -186,15 +181,11 @@ public class SwingValidatorMessageWidget extends JToggleButton { }); - addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - if (isSelected()) { - popup.setVisible(true); - } else { - popup.dispose(); - } + addActionListener(e -> { + if (isSelected()) { + popup.setVisible(true); + } else { + popup.dispose(); } }); diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java index 5ffce70..0a3c354 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java @@ -47,7 +47,6 @@ import javax.swing.RowSorter; import javax.swing.SortOrder; import java.awt.Color; import java.awt.event.MouseListener; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -608,16 +607,13 @@ public class SwingValidatorUtil extends SimpleBeanValidators { SwingValidator<?> validator, final JAXXValidator ui) { - PropertyChangeListener listener = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - SwingValidator<?> validator = (SwingValidator<?>) evt.getSource(); - if (log.isInfoEnabled()) { - log.info("Context name changed to [" + evt.getNewValue() + - "] for validator " + validator.getType()); - } - ui.registerValidatorFields(); + PropertyChangeListener listener = evt -> { + SwingValidator<?> validator1 = (SwingValidator<?>) evt.getSource(); + if (log.isInfoEnabled()) { + log.info("Context name changed to [" + evt.getNewValue() + + "] for validator " + validator1.getType()); } + ui.registerValidatorFields(); }; validator.addPropertyChangeListener( SwingValidator.CONTEXT_PROPERTY, diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/IconValidationUI.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/IconValidationUI.java index 16cc4ca..05de24b 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/IconValidationUI.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/IconValidationUI.java @@ -48,7 +48,7 @@ public class IconValidationUI extends AbstractBeanValidatorUI { // The icon to be shown at the layer's corner - protected EnumMap<NuitonValidatorScope, BufferedImage> icons; + protected final EnumMap<NuitonValidatorScope, BufferedImage> icons; public IconValidationUI(String field) { this(Sets.newHashSet(field)); diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/ImageValidationUI.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/ImageValidationUI.java index 8c18516..bb4e377 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/ImageValidationUI.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/ImageValidationUI.java @@ -46,7 +46,7 @@ public class ImageValidationUI extends AbstractBeanValidatorUI { private static final long serialVersionUID = 1L; - protected EnumMap<NuitonValidatorScope, BufferedImage> icons; + protected final EnumMap<NuitonValidatorScope, BufferedImage> icons; public ImageValidationUI(String fields) { this(Sets.newHashSet(fields)); diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessage.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessage.java index 8bee8a4..b0f92c7 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessage.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessage.java @@ -61,7 +61,7 @@ public class UnifiedValidatorMessage implements Comparable<UnifiedValidatorMessa protected final NuitonValidatorScope scope; /** the optional field's editor */ - protected JComponent editor; + protected final JComponent editor; protected final boolean simpleValidator; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java index bbd19ad..725a48d 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java @@ -32,9 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.AbstractValidator; import org.nuiton.validator.bean.list.BeanListValidator; -import org.nuiton.validator.bean.list.BeanListValidatorEvent; import org.nuiton.validator.bean.list.BeanListValidatorListener; -import org.nuiton.validator.bean.simple.SimpleBeanValidatorEvent; import org.nuiton.validator.bean.simple.SimpleBeanValidatorListener; import javax.swing.JComponent; @@ -55,7 +53,7 @@ public class UnifiedValidatorMessageTableModel extends AbstractTableModel { private static final long serialVersionUID = 1L; /** Logger */ - private static Log log = + private static final Log log = LogFactory.getLog(UnifiedValidatorMessageTableModel.class); public static final String[] columnNames = @@ -68,10 +66,10 @@ public class UnifiedValidatorMessageTableModel extends AbstractTableModel { {NuitonValidatorScope.class, Object.class, String.class, String.class}; /** list of registred validators */ - protected List<AbstractValidator<?>> validators; + protected final List<AbstractValidator<?>> validators; /** list of messages actual displayed */ - protected List<UnifiedValidatorMessage> data; + protected final List<UnifiedValidatorMessage> data; protected transient BeanListValidatorListener listValidatorListener; @@ -397,36 +395,33 @@ public class UnifiedValidatorMessageTableModel extends AbstractTableModel { protected BeanListValidatorListener getListValidatorListener() { if (listValidatorListener == null) { - listValidatorListener = new BeanListValidatorListener() { - @Override - public void onFieldChanged(BeanListValidatorEvent event) { - String[] toDelete = event.getMessagesToDelete(); - String[] toAdd = event.getMessagesToAdd(); - String field = event.getField(); - Object bean = event.getBean(); - NuitonValidatorScope scope = event.getScope(); - boolean mustAdd = toAdd != null && toAdd.length > 0; - boolean mustDel = toDelete != null && toDelete.length > 0; - - if (log.isTraceEnabled()) { - log.trace("----------------------------------------------------------"); - log.trace(field + " - (" + getRowCount() + ") toAdd " + mustAdd); - log.trace(field + " - (" + getRowCount() + ") toDelete " + mustDel); - } - - BeanListValidator<?> validator = event.getSource(); - - if (mustDel) { - - // removes datas and notify if no messages to add - removeMessages(validator, bean, field, scope, !mustAdd, toDelete); - } - - if (mustAdd) { - - // add new messages, sort datas and notify - addMessages(validator, bean, field, scope, true, toAdd); - } + listValidatorListener = event -> { + String[] toDelete = event.getMessagesToDelete(); + String[] toAdd = event.getMessagesToAdd(); + String field = event.getField(); + Object bean = event.getBean(); + NuitonValidatorScope scope = event.getScope(); + boolean mustAdd = toAdd != null && toAdd.length > 0; + boolean mustDel = toDelete != null && toDelete.length > 0; + + if (log.isTraceEnabled()) { + log.trace("----------------------------------------------------------"); + log.trace(field + " - (" + getRowCount() + ") toAdd " + mustAdd); + log.trace(field + " - (" + getRowCount() + ") toDelete " + mustDel); + } + + BeanListValidator<?> validator = event.getSource(); + + if (mustDel) { + + // removes datas and notify if no messages to add + removeMessages(validator, bean, field, scope, !mustAdd, toDelete); + } + + if (mustAdd) { + + // add new messages, sort datas and notify + addMessages(validator, bean, field, scope, true, toAdd); } }; } @@ -435,35 +430,32 @@ public class UnifiedValidatorMessageTableModel extends AbstractTableModel { protected SimpleBeanValidatorListener getSimpleValidatorListener() { if (simpleValidatorListener == null) { - simpleValidatorListener = new SimpleBeanValidatorListener() { - @Override - public void onFieldChanged(SimpleBeanValidatorEvent event) { - String[] toDelete = event.getMessagesToDelete(); - String[] toAdd = event.getMessagesToAdd(); - String field = event.getField(); - NuitonValidatorScope scope = event.getScope(); - boolean mustAdd = toAdd != null && toAdd.length > 0; - boolean mustDel = toDelete != null && toDelete.length > 0; - - if (log.isTraceEnabled()) { - log.trace("----------------------------------------------------------"); - log.trace(field + " - (" + getRowCount() + ") toAdd " + mustAdd); - log.trace(field + " - (" + getRowCount() + ") toDelete " + mustDel); - } - - SwingValidator<?> validator = (SwingValidator<?>) event.getSource(); - - if (mustDel) { - - // removes datas and notify if no messages to add - removeMessages(validator, field, scope, !mustAdd, toDelete); - } - - if (mustAdd) { - - // add new messages, sort datas and notify - addMessages(validator, field, scope, true, toAdd); - } + simpleValidatorListener = event -> { + String[] toDelete = event.getMessagesToDelete(); + String[] toAdd = event.getMessagesToAdd(); + String field = event.getField(); + NuitonValidatorScope scope = event.getScope(); + boolean mustAdd = toAdd != null && toAdd.length > 0; + boolean mustDel = toDelete != null && toDelete.length > 0; + + if (log.isTraceEnabled()) { + log.trace("----------------------------------------------------------"); + log.trace(field + " - (" + getRowCount() + ") toAdd " + mustAdd); + log.trace(field + " - (" + getRowCount() + ") toDelete " + mustDel); + } + + SwingValidator<?> validator = (SwingValidator<?>) event.getSource(); + + if (mustDel) { + + // removes datas and notify if no messages to add + removeMessages(validator, field, scope, !mustAdd, toDelete); + } + + if (mustAdd) { + + // add new messages, sort datas and notify + addMessages(validator, field, scope, true, toAdd); } }; } diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java index 84a304f..09042ee 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java @@ -44,7 +44,7 @@ import java.beans.PropertyChangeSupport; public class UnifiedValidatorMessageTableMouseListener extends MouseAdapter { /** Logger */ - private static Log log = + private static final Log log = LogFactory.getLog(UnifiedValidatorMessageTableMouseListener.class); public static final String HIGHLIGHT_ERROR_PROPERTY = "highlightError"; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java index 5ab7db4..ed0b5d5 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java @@ -48,13 +48,11 @@ import javax.swing.JToggleButton; import javax.swing.JToolBar; import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; -import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.TableCellRenderer; import java.awt.Component; import java.awt.Point; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.HierarchyBoundsAdapter; @@ -79,11 +77,11 @@ public class UnifiedValidatorMessageWidget extends JToggleButton { public static final String CLOSE_DIALOG_ACTION = "closeDialog"; - protected UnifiedValidatorMessageTableModel messageTableModel = new UnifiedValidatorMessageTableModel(); + protected final UnifiedValidatorMessageTableModel messageTableModel = new UnifiedValidatorMessageTableModel(); - protected JDialog popup = new JDialog(); + protected final JDialog popup = new JDialog(); - protected JTable messageTable = new JTable(); + protected final JTable messageTable = new JTable(); protected Point popupPosition = null; @@ -91,52 +89,49 @@ public class UnifiedValidatorMessageWidget extends JToggleButton { super(SwingUtil.createActionIcon("alert-none")); setToolTipText(t("validator.messageWidget.alert.none")); - messageTableModel.addTableModelListener(new TableModelListener() { + messageTableModel.addTableModelListener(e -> { + int alerts = messageTableModel.getRowCount(); + String label; + switch (alerts) { + case 0: + label = n("validator.messageWidget.alert.none"); + break; + case 1: + label = n("validator.messageWidget.alert.one"); + break; + default: + label = n("validator.messageWidget.alert.several"); + } - public void tableChanged(TableModelEvent e) { - int alerts = messageTableModel.getRowCount(); - String label; - switch (alerts) { - case 0: - label = n("validator.messageWidget.alert.none"); + NuitonValidatorScope maxScope; + String icon; + if (alerts == 0) { + icon = "alert-none"; + + } else { + maxScope = NuitonValidatorScope.INFO; + for (int i = 0; i < alerts; i++) { + NuitonValidatorScope scope = messageTableModel.getRow(i).getScope(); + int diff = scope.compareTo(maxScope); + if (diff < 0) { + maxScope = scope; + } + } + switch (maxScope) { + case INFO: + icon = "alert-info"; break; - case 1: - label = n("validator.messageWidget.alert.one"); + case WARNING: + icon = "alert-warning"; break; default: - label = n("validator.messageWidget.alert.several"); - } + icon = "alert-error"; - NuitonValidatorScope maxScope; - String icon; - if (alerts == 0) { - icon = "alert-none"; - - } else { - maxScope = NuitonValidatorScope.INFO; - for (int i = 0; i < alerts; i++) { - NuitonValidatorScope scope = messageTableModel.getRow(i).getScope(); - int diff = scope.compareTo(maxScope); - if (diff < 0) { - maxScope = scope; - } - } - switch (maxScope) { - case INFO: - icon = "alert-info"; - break; - case WARNING: - icon = "alert-warning"; - break; - default: - icon = "alert-error"; - - } } - - setToolTipText(t(label, alerts)); - setIcon(SwingUtil.createActionIcon(icon)); } + + setToolTipText(t(label, alerts)); + setIcon(SwingUtil.createActionIcon(icon)); }); messageTable.setModel(messageTableModel); @@ -187,15 +182,11 @@ public class UnifiedValidatorMessageWidget extends JToggleButton { }); - addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - if (isSelected()) { - popup.setVisible(true); - } else { - popup.dispose(); - } + addActionListener(e -> { + if (isSelected()) { + popup.setVisible(true); + } else { + popup.dispose(); } }); diff --git a/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java index fc4db51..796c47b 100644 --- a/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java +++ b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java @@ -39,8 +39,6 @@ import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; import java.awt.Frame; import java.awt.event.ActionEvent; import java.io.IOException; @@ -175,21 +173,10 @@ public class AboutUIBuilder { jEditorPane.setText(tabContent); jEditorPane.setEditable(false); jEditorPane.setFont(jEditorPane.getFont().deriveFont((float) 11)); - jEditorPane.addHyperlinkListener(new HyperlinkListener() { - @Override - public void hyperlinkUpdate(HyperlinkEvent e) { - SwingUtil.openLink(e); - } - }); + jEditorPane.addHyperlinkListener(SwingUtil::openLink); scrollPane.getViewport().add(jEditorPane); - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - jEditorPane.setCaretPosition(0); - } - }); + SwingUtilities.invokeLater(() -> jEditorPane.setCaretPosition(0)); return this; } diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorModel.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorModel.java index 0172d3b..ba5b30e 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorModel.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorModel.java @@ -96,7 +96,7 @@ public class DateTimeEditorModel extends AbstractSerializableBean implements Mod /** * State to be able to custom the model. will be pass to {@code false} by the {@link DateTimeEditorHandler#init(DateTimeEditor)}. */ - protected boolean fillState = true; + protected final boolean fillState = true; /** * To stop propagate events when we are doing some modifications on the model. @@ -391,11 +391,6 @@ public class DateTimeEditorModel extends AbstractSerializableBean implements Mod } protected Predicate<DateTimeEditorModel> canUpdateBeanValuePredicate() { - return new Predicate<DateTimeEditorModel>() { - @Override - public boolean apply(DateTimeEditorModel input) { - return !isValueIsAdjusting(); - } - }; + return input -> !isValueIsAdjusting(); } } diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorModel.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorModel.java index 11cef54..594d8e2 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorModel.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorModel.java @@ -66,7 +66,7 @@ public class TimeEditorModel extends AbstractSerializableBean implements ModelTo /** * State to be able to custom the model. will be pass to {@code false} by the {@link DateTimeEditorHandler#init(DateTimeEditor)}. */ - protected boolean fillState = true; + protected final boolean fillState = true; /** * To stop propagate events when we are doing some modifications on the model. @@ -234,11 +234,6 @@ public class TimeEditorModel extends AbstractSerializableBean implements ModelTo } protected Predicate<TimeEditorModel> canUpdateBeanValuePredicate() { - return new Predicate<TimeEditorModel>() { - @Override - public boolean apply(TimeEditorModel input) { - return !isValueIsAdjusting(); - } - }; + return input -> !isValueIsAdjusting(); } } diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeSliderInitializer.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeSliderInitializer.java index 6f2c29a..ed7fe30 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeSliderInitializer.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeSliderInitializer.java @@ -28,8 +28,6 @@ import javax.swing.plaf.basic.BasicSliderUI; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; import java.util.Dictionary; import java.util.Hashtable; import java.util.Map; @@ -110,29 +108,26 @@ class TimeSliderInitializer { showToolTip(e); } }); - slider.addMouseWheelListener(new MouseWheelListener() { - @Override - public void mouseWheelMoved(MouseWheelEvent e) { - - JSlider component = (JSlider) e.getComponent(); + slider.addMouseWheelListener(e -> { - if (component.isEnabled()) { + JSlider component = (JSlider) e.getComponent(); - // compute new value - int nb = e.getWheelRotation(); - int value = component.getValue() - nb; + if (component.isEnabled()) { - // set the value - component.setValueIsAdjusting(true); - try { - component.setValue(value); - } finally { - component.setValueIsAdjusting(false); - } + // compute new value + int nb = e.getWheelRotation(); + int value = component.getValue() - nb; + // set the value + component.setValueIsAdjusting(true); + try { + component.setValue(value); + } finally { + component.setValueIsAdjusting(false); } - e.consume(); + } + e.consume(); }); } diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/AboutFrame.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/AboutFrame.java index b5ba913..c0232a0 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/AboutFrame.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/AboutFrame.java @@ -69,7 +69,7 @@ public class AboutFrame extends JFrame implements ActionListener, /** serialVersionUID */ private static final long serialVersionUID = -8693584537185015506L; /** log */ - private static Log log = LogFactory.getLog(AboutFrame.class); + private static final Log log = LogFactory.getLog(AboutFrame.class); /** Top image path (classpath) */ protected String iconPath; /** Background color */ @@ -243,11 +243,7 @@ public class AboutFrame extends JFrame implements ActionListener, if (u.getProtocol().equalsIgnoreCase("mailto") || u.getProtocol().equalsIgnoreCase("http") || u.getProtocol().equalsIgnoreCase("ftp")) { Desktop.getDesktop().browse(u.toURI()); } - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("Error while opening link", e); - } - } catch (URISyntaxException e) { + } catch (IOException | URISyntaxException e) { if (log.isErrorEnabled()) { log.error("Error while opening link", e); } diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/GridFlowLayout.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/GridFlowLayout.java index 6ae8335..bbfe028 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/GridFlowLayout.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/GridFlowLayout.java @@ -59,7 +59,7 @@ import javax.swing.JViewport; */ public class GridFlowLayout implements LayoutManager2 { // GridFlowLayout - protected java.util.Map<Component, Object> positions = new HashMap<>(); + protected final java.util.Map<Component, Object> positions = new HashMap<>(); int hgap; int vgap; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/IconFactory.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/IconFactory.java index a1ba8a7..47d1d9b 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/IconFactory.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/IconFactory.java @@ -96,7 +96,7 @@ public class IconFactory { public static final String TIME = "TIME"; public static final String UNDO = "UNDO"; - protected Map<Object, String> iconURLs; + protected final Map<Object, String> iconURLs; protected IconFactory() { iconURLs = new IdentityHashMap<>(); @@ -142,7 +142,7 @@ public class IconFactory { iconURLs.put(UNDO, "/22x22/undo.png"); } - static protected ReferenceIdentityMap<Object, Icon> cache = new ReferenceIdentityMap<>( + static protected final ReferenceIdentityMap<Object, Icon> cache = new ReferenceIdentityMap<>( AbstractReferenceMap.ReferenceStrength.HARD, AbstractReferenceMap.ReferenceStrength.SOFT); /** diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/JComboBoxAutoCompletionKit.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/JComboBoxAutoCompletionKit.java index d0c29c6..b77fd85 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/JComboBoxAutoCompletionKit.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/JComboBoxAutoCompletionKit.java @@ -80,9 +80,9 @@ public class JComboBoxAutoCompletionKit { private static class AutoCompletionManager implements JComboBox.KeySelectionManager { - private static String EMPTY_PREFIX = ""; + private static final String EMPTY_PREFIX = ""; - private static int NO_SELECTION = -1; + private static final int NO_SELECTION = -1; private JComboBox _comboBox = null; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/SplashScreen.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/SplashScreen.java index 1e94c3d..de4ed93 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/SplashScreen.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/SplashScreen.java @@ -65,7 +65,7 @@ public class SplashScreen extends JFrame { protected Image splashImage; - protected Title applicationTitle; + protected final Title applicationTitle; // protected String[] stepDescriptions; @@ -452,10 +452,10 @@ public class SplashScreen extends JFrame { public static class Title { - protected String label; - protected Font font; - protected Point position; - protected Color color; + protected final String label; + protected final Font font; + protected final Point position; + protected final Color color; public Title(String label, Font font, Point position, Color color) { this.label = label; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/WidgetUtil.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/WidgetUtil.java index 98446a1..182acff 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/WidgetUtil.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/WidgetUtil.java @@ -43,7 +43,7 @@ import java.io.ByteArrayOutputStream; public class WidgetUtil { // WidgetUtil - public static Component makeDeepCopy(Component clone) throws Exception { + public static Component makeDeepCopy(Component clone) { XMLEncoder e = null; XMLDecoder d = null; try { diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridLayout.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridLayout.java index 0c489f7..9a3a709 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridLayout.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridLayout.java @@ -55,7 +55,7 @@ import org.xml.sax.SAXException; // TODO: put a test in place... Just in case public class XMLGridLayout implements LayoutManager { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(XMLGridLayout.class); + static private final Log log = LogFactory.getLog(XMLGridLayout.class); private Map constraints; private GridBagLayout layout; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridParseConstraints.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridParseConstraints.java index a08308a..4fc4825 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridParseConstraints.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridParseConstraints.java @@ -91,7 +91,7 @@ class XMLGridParseConstraints extends DefaultHandler { return constraints; } - private CharArrayWriter contents = new CharArrayWriter(); + private final CharArrayWriter contents = new CharArrayWriter(); public void characters(char[] ch, int start, int length) throws SAXException { @@ -313,7 +313,7 @@ class XMLGridParseConstraints extends DefaultHandler { } class MyErrorHandler implements ErrorHandler { - StringBuffer errors = new StringBuffer(); + final StringBuffer errors = new StringBuffer(); public void error(SAXParseException e) throws SAXException { errors.append(e.getMessage()).append("\n"); diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipComponent.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipComponent.java index f72b918..2639b0b 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipComponent.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipComponent.java @@ -40,10 +40,10 @@ import java.awt.event.MouseWheelEvent; * if the content is instance of JToolTip. */ class DataTipComponent extends JToolTip { - private DataTipCell cell; - private CellRendererPane rendererPane; - private Rectangle withoutBorderRectangle; - private Color backgroundColor; + private final DataTipCell cell; + private final CellRendererPane rendererPane; + private final Rectangle withoutBorderRectangle; + private final Color backgroundColor; private boolean isHeavyWeight; DataTipComponent(DataTipCell cell, Rectangle withoutBorderRectangle, Color backgroundColor) { diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipListener.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipListener.java index 83ffebc..930e25e 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipListener.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipListener.java @@ -60,10 +60,7 @@ abstract class DataTipListener extends MouseInputAdapter implements ComponentLis pointerInfoClass = Class.forName("java.awt.PointerInfo"); getLocationMethod = pointerInfoClass.getMethod("getLocation", NO_PARAMETERS); } - catch(NoSuchMethodException e) { - // fine probably running on pre-1.5-JDK - } - catch(ClassNotFoundException e) { + catch(NoSuchMethodException | ClassNotFoundException e) { // fine probably running on pre-1.5-JDK } } @@ -218,10 +215,7 @@ abstract class DataTipListener extends MouseInputAdapter implements ComponentLis Object pointerInfo = getPointerInfoMethod.invoke(null, NO_ARGUMENTS); return (Point) getLocationMethod.invoke(pointerInfo, NO_ARGUMENTS); } - catch(IllegalAccessException e) { - // strange, but nothing I can do here - } - catch(InvocationTargetException e) { + catch(IllegalAccessException | InvocationTargetException e) { // strange, but nothing I can do here } diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipManager.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipManager.java index fafb739..128aa88 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipManager.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipManager.java @@ -44,9 +44,9 @@ import java.security.AccessControlException; public class DataTipManager { private static DataTipManager instance; - private ListDataTipListener listMouseListener = new ListDataTipListener(); - private TableDataTipListener tableMouseListener = new TableDataTipListener(); - private TreeDataTipListener treeMouseListener = new TreeDataTipListener(); + private final ListDataTipListener listMouseListener = new ListDataTipListener(); + private final TableDataTipListener tableMouseListener = new TableDataTipListener(); + private final TreeDataTipListener treeMouseListener = new TreeDataTipListener(); private Component parentComponent; private Window tipComponentWindow; private MouseEvent lastMouseEvent; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipPopup.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipPopup.java index ed775e4..7fd1631 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipPopup.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/DataTipPopup.java @@ -33,7 +33,7 @@ import java.awt.*; class DataTipPopup { private Popup popup; - private DataTipCell cell; + private final DataTipCell cell; DataTipPopup(JComponent parent, DataTipCell cell, Point tipPosition, Dimension tipDimension) { this.cell = cell; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/DefaultEditor.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/DefaultEditor.java index 1968194..9ff239e 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/DefaultEditor.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/DefaultEditor.java @@ -69,10 +69,10 @@ public class DefaultEditor extends JPanel implements EditorInterface, private static final long serialVersionUID = 5049495816540748017L; /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(DefaultEditor.class); + static private final Log log = LogFactory.getLog(DefaultEditor.class); - protected JEditorPane editor = new JEditorPane(); - protected JScrollPane scrollPane = new JScrollPane(editor); + protected final JEditorPane editor = new JEditorPane(); + protected final JScrollPane scrollPane = new JScrollPane(editor); protected boolean isModified = false; public DefaultEditor() { diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/Editor.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/Editor.java index 2dc72fa..e9b3b3d 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/Editor.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/Editor.java @@ -88,9 +88,9 @@ public class Editor extends JPanel implements EditorInterface { private static final long serialVersionUID = 5820456710194699050L; /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(Editor.class); + static private final Log log = LogFactory.getLog(Editor.class); - static protected EditorInterface DEFAULT_EDITOR = new DefaultEditor(); + static protected final EditorInterface DEFAULT_EDITOR = new DefaultEditor(); /** * Available syntaxes. @@ -105,7 +105,7 @@ public class Editor extends JPanel implements EditorInterface { SQL(t("nuitonwidgets.editor.syntax.sql")), R(t("nuitonwidgets.editor.syntax.r")); - protected String name; + protected final String name; EditorSyntaxConstant(String name) { this.name = name; @@ -135,7 +135,7 @@ public class Editor extends JPanel implements EditorInterface { } /** tous les Editors enregistré */ - static protected List<EditorInterface> registered; + static protected final List<EditorInterface> registered; /** * register new editor @@ -151,15 +151,7 @@ public class Editor extends JPanel implements EditorInterface { .newInstance(); registered.add(result); return result; - } catch (NoClassDefFoundError eee) { - if (log.isDebugEnabled()) { - log.debug("Can't find your editor class: " + editorClassName, - eee); - } - if (log.isInfoEnabled()) { - log.info("Can't find your editor class: " + editorClassName); - } - } catch (ClassNotFoundException eee) { + } catch (NoClassDefFoundError | ClassNotFoundException eee) { if (log.isDebugEnabled()) { log.debug("Can't find your editor class: " + editorClassName, eee); @@ -206,18 +198,18 @@ public class Editor extends JPanel implements EditorInterface { return null; } - static protected EditorInterface nullEditor = new NullEditor(); + static protected final EditorInterface nullEditor = new NullEditor(); /** editor already instanciate for this editor */ - protected Map<EditorInterface, EditorInterface> usedEditor = new HashMap<>(); + protected final Map<EditorInterface, EditorInterface> usedEditor = new HashMap<>(); /** currentEditor is currently opened editor in this editor */ protected EditorInterface currentEditor = nullEditor; /** current opened file */ protected File openedFile = null; /** All document listener registered on this editor */ - protected Set<DocumentListener> documentListeners = new HashSet<>(); + protected final Set<DocumentListener> documentListeners = new HashSet<>(); /** All caret listener registered on this editor */ - protected Set<CaretListener> caretListeners = new HashSet<>(); + protected final Set<CaretListener> caretListeners = new HashSet<>(); /** * If the edited file is modifier, before switch to other or close it, ask @@ -638,9 +630,9 @@ public class Editor extends JPanel implements EditorInterface { private static final long serialVersionUID = 4694356772539222176L; /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SaveAction.class); + static private final Log log = LogFactory.getLog(SaveAction.class); - protected Editor editor; + protected final Editor editor; /* Create this object with the appropriate identifier. */ SaveAction(Editor editor) { diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/EditorHelper.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/EditorHelper.java index b98c0c4..c04b383 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/EditorHelper.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/EditorHelper.java @@ -89,9 +89,9 @@ public class EditorHelper { private static final long serialVersionUID = 14313252664900665L; /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(UndoAction.class); + static private final Log log = LogFactory.getLog(UndoAction.class); - protected UndoManager undo; + protected final UndoManager undo; /* Create this object with the appropriate identifier. */ UndoAction(UndoManager undo) { @@ -121,9 +121,9 @@ public class EditorHelper { private static final long serialVersionUID = 5508420642118093156L; /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(RedoAction.class); + static private final Log log = LogFactory.getLog(RedoAction.class); - protected UndoManager undo; + protected final UndoManager undo; /* Create this object with the appropriate identifier. */ RedoAction(UndoManager undo) { diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/JEditEditor.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/JEditEditor.java index d279f7f..6221abc 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/JEditEditor.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/JEditEditor.java @@ -59,9 +59,9 @@ public class JEditEditor extends JPanel implements EditorInterface, DocumentList private static final long serialVersionUID = 5880160718377536089L; /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(JEditEditor.class); + private static final Log log = LogFactory.getLog(JEditEditor.class); - protected JEditTextArea editor; + protected final JEditTextArea editor; protected boolean isModified = false; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/RSyntaxEditor.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/RSyntaxEditor.java index 772361e..d8d8e1b 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/RSyntaxEditor.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/RSyntaxEditor.java @@ -60,9 +60,9 @@ public class RSyntaxEditor extends JPanel implements EditorInterface, DocumentLi private static final long serialVersionUID = 5880160718377536089L; /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(RSyntaxEditor.class); + private static final Log log = LogFactory.getLog(RSyntaxEditor.class); - protected RSyntaxTextArea editor; + protected final RSyntaxTextArea editor; protected boolean isModified = false; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/SDocEditor.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/SDocEditor.java index 32c647e..b09cdac 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/SDocEditor.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/SDocEditor.java @@ -57,9 +57,9 @@ public class SDocEditor extends DefaultEditor { private static final long serialVersionUID = -7907912891843847963L; /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SDocEditor.class); + static private final Log log = LogFactory.getLog(SDocEditor.class); - protected SyntaxSupport syntaxSupport; + protected final SyntaxSupport syntaxSupport; public SDocEditor() { syntaxSupport = SyntaxSupport.getInstance(); diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/FocusableTip.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/FocusableTip.java index 0decf95..ccf7b60 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/FocusableTip.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/FocusableTip.java @@ -63,11 +63,11 @@ public class FocusableTip { protected JComponent attachedComponent; protected TipWindow tipWindow; protected URL imageBase; - protected AttachedComponentListener attachedComponentListener; - protected HyperlinkListener hyperlinkListener; + protected final AttachedComponentListener attachedComponentListener; + protected final HyperlinkListener hyperlinkListener; protected String lastText; protected Component lastComponent; - protected boolean showCopyContextMenu; + protected final boolean showCopyContextMenu; /** Width with default value. */ protected int width = 320; @@ -79,7 +79,7 @@ public class FocusableTip { * The screen bounds in which the mouse has to stay for the currently * displayed tip to stay visible. */ - protected Rectangle tipVisibleBounds; + protected final Rectangle tipVisibleBounds; /** * Margin from mouse cursor at which to draw focusable tip. @@ -184,51 +184,49 @@ public class FocusableTip { // doesn't return its proper preferred size until after it is displayed. // See http://forums.sun.com/thread.jspa?forumID=57&threadID=574810 // for a discussion. - SwingUtilities.invokeLater(new Runnable() { - public void run() { - - // If a new FocusableTip is requested while another one is - // *focused* and visible, the focused tip (i.e. "tipWindow") - // will be disposed of. If this Runnable is run after the - // dispose(), tipWindow will be null. All of this is done on - // the EDT so no synchronization should be necessary. - if (tipWindow==null) { - return; - } - - // Add copy context menu - if (showCopyContextMenu && component == null) { - TipUtil.addCopyContextMenu(tipWindow); - } - - tipWindow.fixSize(width, height); - ComponentOrientation o = attachedComponent.getComponentOrientation(); - - Point p = e.getPoint(); - SwingUtilities.convertPointToScreen(p, attachedComponent); - int x = o.isLeftToRight() ? (p.x-10) : - (p.x - tipWindow.getWidth() + MARGIN); - int y = p.y + MARGIN; - - // Ensure tooltip is in the window bounds. - Dimension ss = tipWindow.getToolkit().getScreenSize(); - x = Math.max(x, 0); - if (x+tipWindow.getWidth()>=ss.width) { - x = ss.width - tipWindow.getWidth(); - } - if (y+tipWindow.getHeight()>=ss.height) { // Go above cursor - y = p.y - tipWindow.getHeight() - MARGIN; - } - - tipWindow.setLocation(x, y); - tipWindow.setVisible(true); - tipWindow.toFront(); - computeTipVisibleBounds(); // Do after tip is visible - attachedComponentListener.install(attachedComponent); - lastText = text; - lastComponent = component; - } - }); + SwingUtilities.invokeLater(() -> { + + // If a new FocusableTip is requested while another one is + // *focused* and visible, the focused tip (i.e. "tipWindow") + // will be disposed of. If this Runnable is run after the + // dispose(), tipWindow will be null. All of this is done on + // the EDT so no synchronization should be necessary. + if (tipWindow==null) { + return; + } + +// Add copy context menu +if (showCopyContextMenu && component == null) { +TipUtil.addCopyContextMenu(tipWindow); +} + + tipWindow.fixSize(width, height); + ComponentOrientation o = attachedComponent.getComponentOrientation(); + + Point p = e.getPoint(); + SwingUtilities.convertPointToScreen(p, attachedComponent); + int x = o.isLeftToRight() ? (p.x-10) : + (p.x - tipWindow.getWidth() + MARGIN); + int y = p.y + MARGIN; + + // Ensure tooltip is in the window bounds. + Dimension ss = tipWindow.getToolkit().getScreenSize(); + x = Math.max(x, 0); + if (x+tipWindow.getWidth()>=ss.width) { + x = ss.width - tipWindow.getWidth(); + } + if (y+tipWindow.getHeight()>=ss.height) { // Go above cursor + y = p.y - tipWindow.getHeight() - MARGIN; + } + + tipWindow.setLocation(x, y); + tipWindow.setVisible(true); + tipWindow.toFront(); + computeTipVisibleBounds(); // Do after tip is visible + attachedComponentListener.install(attachedComponent); + lastText = text; +lastComponent = component; + }); } diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipUtil.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipUtil.java index f096a4d..ac1079e 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipUtil.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipUtil.java @@ -31,8 +31,6 @@ import java.awt.SystemColor; import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -163,15 +161,11 @@ public class TipUtil { Icon copyIcon = Resource.getIcon(COPY_ICON_PATH); JMenuItem copyMenuItem = new JMenuItem(t("nuitonwidgets.common.copy"), copyIcon); - copyMenuItem.addActionListener(new ActionListener() { + copyMenuItem.addActionListener(e1 -> { + StringSelection selection = new StringSelection(selectedText); - @Override - public void actionPerformed(ActionEvent e) { - StringSelection selection = new StringSelection(selectedText); - - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); - clipboard.setContents(selection, null); - } + Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + clipboard.setContents(selection, null); }); popupMenu.add(copyMenuItem); diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipWindow.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipWindow.java index ee8ce66..5d49908 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipWindow.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipWindow.java @@ -92,13 +92,11 @@ public class TipWindow extends JWindow implements ActionListener { ((HTMLDocument)textArea.getDocument()).setBase(ft.getImageBase()); } textArea.addMouseListener(tipListener); - textArea.addHyperlinkListener(new HyperlinkListener() { - public void hyperlinkUpdate(HyperlinkEvent e) { - if (e.getEventType()==HyperlinkEvent.EventType.ACTIVATED) { - TipWindow.this.ft.possiblyDisposeOfTipWindow(); - } - } - }); + textArea.addHyperlinkListener(e -> { + if (e.getEventType()==HyperlinkEvent.EventType.ACTIVATED) { + TipWindow.this.ft.possiblyDisposeOfTipWindow(); + } + }); init(ft, textArea); } diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tree/FilterTreeModel.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tree/FilterTreeModel.java index 9436220..1588dda 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tree/FilterTreeModel.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tree/FilterTreeModel.java @@ -42,10 +42,10 @@ import java.util.Iterator; public class FilterTreeModel implements TreeModel { /** Listener for data and structure change notification. */ - protected Collection<TreeModelListener> treeModelListeners; + protected final Collection<TreeModelListener> treeModelListeners; /** Real application {@link TreeModel}. */ - protected TreeModel delegateModel; + protected final TreeModel delegateModel; /** Filter to use (can be null : no filtering). */ protected TreeFilter treeFilter; diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java index ff09bab..419c2a9 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java @@ -29,7 +29,6 @@ import org.nuiton.converter.NuitonConverter; import java.util.regex.Matcher; import static org.nuiton.i18n.I18n.t; -import static org.nuiton.i18n.LanguageEnum.mo; /** * Created on 11/25/13. diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java index 17dbeaf..0ef6633 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java @@ -119,15 +119,12 @@ public class AbsoluteDdCoordinateEditorHandler implements UIHandler<AbsoluteDdCo editor.setFocusLostBehavior(JFormattedTextField.COMMIT); // When editor changes his value, propagate it to model - editor.addPropertyChangeListener("value", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DdCoordinate newValue = (DdCoordinate) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("Value has changed: " + newValue); - } - model.setValue(newValue); + editor.addPropertyChangeListener("value", evt -> { + DdCoordinate newValue = (DdCoordinate) evt.getNewValue(); + if (log.isDebugEnabled()) { + log.debug("Value has changed: " + newValue); } + model.setValue(newValue); }); JFormattedTextFieldNavigationManager.install(editor); diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java index 0eeb66e..8ee1cec 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java @@ -127,15 +127,12 @@ public class AbsoluteDmdCoordinateEditorHandler implements UIHandler<AbsoluteDmd editor.setFocusLostBehavior(JFormattedTextField.COMMIT); // When editor changes his value, propagate it to model - editor.addPropertyChangeListener("value", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DmdCoordinate newValue = (DmdCoordinate) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("Value has changed: " + newValue); - } - model.setValue(newValue); + editor.addPropertyChangeListener("value", evt -> { + DmdCoordinate newValue = (DmdCoordinate) evt.getNewValue(); + if (log.isDebugEnabled()) { + log.debug("Value has changed: " + newValue); } + model.setValue(newValue); }); JFormattedTextFieldNavigationManager.install(editor); diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java index 89799eb..45b5f8c 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java @@ -125,15 +125,12 @@ public class AbsoluteDmsCoordinateEditorHandler implements UIHandler<AbsoluteDms editor.setFocusLostBehavior(JFormattedTextField.COMMIT); // When editor changes his value, propagate it to model - editor.addPropertyChangeListener("value", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DmsCoordinate newValue = (DmsCoordinate) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("Value has changed: " + newValue); - } - model.setValue(newValue); + editor.addPropertyChangeListener("value", evt -> { + DmsCoordinate newValue = (DmsCoordinate) evt.getNewValue(); + if (log.isDebugEnabled()) { + log.debug("Value has changed: " + newValue); } + model.setValue(newValue); }); JFormattedTextFieldNavigationManager.install(editor); diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java index 42c18cd..bff11cf 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java @@ -26,8 +26,6 @@ import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.jaxx.widgets.gis.CoordinateFormat; import org.nuiton.jaxx.widgets.gis.CoordinateHelper; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.io.Serializable; /** @@ -88,63 +86,50 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { public CoordinatesEditorModel() { - latitudeModel.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (!valueIsAdjusting) { - fireLatitude(); - } + latitudeModel.addPropertyChangeListener(evt -> { + if (!valueIsAdjusting) { + fireLatitude(); } }); - longitudeModel.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (!valueIsAdjusting) { - fireLongitude(); - } + longitudeModel.addPropertyChangeListener(evt -> { + if (!valueIsAdjusting) { + fireLongitude(); } }); - addPropertyChangeListener(PROPERTY_QUADRANT, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - fireLatitude(); - fireLongitude(); - } + addPropertyChangeListener(PROPERTY_QUADRANT, evt -> { + fireLatitude(); + fireLongitude(); }); - addPropertyChangeListener(PROPERTY_FORMAT, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + addPropertyChangeListener(PROPERTY_FORMAT, evt -> { - valueIsAdjusting = true; + valueIsAdjusting = true; - try { + try { - CoordinateFormat oldFormat = (CoordinateFormat) evt.getOldValue(); + CoordinateFormat oldFormat = (CoordinateFormat) evt.getOldValue(); - if (oldFormat != null) { + if (oldFormat != null) { - // synchronize latitude value from the previous format - Float latitude = latitudeModel.getValue(oldFormat); - latitudeModel.setValue(latitude); + // synchronize latitude value from the previous format + Float latitude = latitudeModel.getValue(oldFormat); + latitudeModel.setValue(latitude); - // synchronize longitude value from the previous format - Float longitude = longitudeModel.getValue(oldFormat); - longitudeModel.setValue(longitude); + // synchronize longitude value from the previous format + Float longitude = longitudeModel.getValue(oldFormat); + longitudeModel.setValue(longitude); - } + } - } finally { + } finally { - valueIsAdjusting = false; + valueIsAdjusting = false; - fireLatitude(); - fireLongitude(); + fireLatitude(); + fireLongitude(); - } } }); } diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java index 8a14477..6feeb74 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java @@ -147,15 +147,12 @@ public class SignedDdCoordinateEditorHandler implements UIHandler<SignedDdCoordi editor.setFocusLostBehavior(JFormattedTextField.COMMIT); // When editor changes his value, propagate it to model - editor.addPropertyChangeListener("value", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DdCoordinate newValue = (DdCoordinate) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("Value has changed: " + newValue); - } - model.setValue(newValue); + editor.addPropertyChangeListener("value", evt -> { + DdCoordinate newValue = (DdCoordinate) evt.getNewValue(); + if (log.isDebugEnabled()) { + log.debug("Value has changed: " + newValue); } + model.setValue(newValue); }); // When model sign changed, let's push it back in bean diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java index e3c3d23..86253f6 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java @@ -153,15 +153,12 @@ public class SignedDmdCoordinateEditorHandler implements UIHandler<SignedDmdCoor editor.setFocusLostBehavior(JFormattedTextField.COMMIT); // When editor changes his value, propagate it to model - editor.addPropertyChangeListener("value", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DmdCoordinate newValue = (DmdCoordinate) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("Value has changed: " + newValue); - } - model.setValue(newValue); + editor.addPropertyChangeListener("value", evt -> { + DmdCoordinate newValue = (DmdCoordinate) evt.getNewValue(); + if (log.isDebugEnabled()) { + log.debug("Value has changed: " + newValue); } + model.setValue(newValue); }); // When model sign changed, let's push it back in bean diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java index 3eed7bd..4591aac 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java @@ -153,15 +153,12 @@ public class SignedDmsCoordinateEditorHandler implements UIHandler<SignedDmsCoor editor.setFocusLostBehavior(JFormattedTextField.COMMIT); // When editor changes his value, propagate it to model - editor.addPropertyChangeListener("value", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DmsCoordinate newValue = (DmsCoordinate) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("Value has changed: " + newValue); - } - model.setValue(newValue); + editor.addPropertyChangeListener("value", evt -> { + DmsCoordinate newValue = (DmsCoordinate) evt.getNewValue(); + if (log.isDebugEnabled()) { + log.debug("Value has changed: " + newValue); } + model.setValue(newValue); }); // When model sign changed, let's push it back in bean diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java index b629122..890f2e5 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java @@ -79,12 +79,9 @@ public class AbsoluteDdCoordinateEditorTest { editor.init(true); editor.setValue(bean.getModel()); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - SwingUtil.center(null, frame); - frame.setVisible(true); - } + SwingUtilities.invokeLater(() -> { + SwingUtil.center(null, frame); + frame.setVisible(true); }); } diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java index 5e87dea..fd2ee0c 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java @@ -81,12 +81,9 @@ public class AbsoluteDmsCoordinateEditorTest { editor.init(true); editor.setValue(bean.getModel()); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - SwingUtil.center(null, frame); - frame.setVisible(true); - } + SwingUtilities.invokeLater(() -> { + SwingUtil.center(null, frame); + frame.setVisible(true); }); } diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorTest.java index 93839e8..5c0f68f 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorTest.java @@ -34,8 +34,6 @@ import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; import java.awt.BorderLayout; import java.awt.GridLayout; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.text.ParseException; /** @@ -167,20 +165,17 @@ public class SignedDmdCoordinateEditorTest { final JLabel latitudeResult = new JLabel(); final JLabel longitudeResult = new JLabel(); - bean.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - EditorBean source = (EditorBean) evt.getSource(); - String propertyName = evt.getPropertyName(); - if (log.isInfoEnabled()) { - log.info("[" + propertyName + "] value changed: " + evt.getNewValue()); - } - if (propertyName.startsWith("longitude")) { - longitudeResult.setText(source.getLongitude().toString()); - } else { - - latitudeResult.setText(source.getLatitude().toString()); - } + bean.addPropertyChangeListener(evt -> { + EditorBean source = (EditorBean) evt.getSource(); + String propertyName = evt.getPropertyName(); + if (log.isInfoEnabled()) { + log.info("[" + propertyName + "] value changed: " + evt.getNewValue()); + } + if (propertyName.startsWith("longitude")) { + longitudeResult.setText(source.getLongitude().toString()); + } else { + + latitudeResult.setText(source.getLatitude().toString()); } }); @@ -202,12 +197,9 @@ public class SignedDmdCoordinateEditorTest { frame.setContentPane(panel); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - frame.setSize(800, 200); - frame.setVisible(true); - } + SwingUtilities.invokeLater(() -> { + frame.setSize(800, 200); + frame.setVisible(true); }); } } diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorTest.java index 8d9bad7..9c5c676 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorTest.java @@ -34,8 +34,6 @@ import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; import java.awt.BorderLayout; import java.awt.GridLayout; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.text.ParseException; /** @@ -169,20 +167,17 @@ public class SignedDmsCoordinateEditorTest { final JLabel latitudeResult = new JLabel(); final JLabel longitudeResult = new JLabel(); - bean.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - EditorBean source = (EditorBean) evt.getSource(); - String propertyName = evt.getPropertyName(); - if (log.isInfoEnabled()) { - log.info("[" + propertyName + "] value changed: " + evt.getNewValue()); - } - if (propertyName.startsWith("longitude")) { - longitudeResult.setText(source.getLongitude().toString()); - } else { - - latitudeResult.setText(source.getLatitude().toString()); - } + bean.addPropertyChangeListener(evt -> { + EditorBean source = (EditorBean) evt.getSource(); + String propertyName = evt.getPropertyName(); + if (log.isInfoEnabled()) { + log.info("[" + propertyName + "] value changed: " + evt.getNewValue()); + } + if (propertyName.startsWith("longitude")) { + longitudeResult.setText(source.getLongitude().toString()); + } else { + + latitudeResult.setText(source.getLatitude().toString()); } }); @@ -204,12 +199,9 @@ public class SignedDmsCoordinateEditorTest { frame.setContentPane(panel); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - frame.setSize(800, 200); - frame.setVisible(true); - } + SwingUtilities.invokeLater(() -> { + frame.setSize(800, 200); + frame.setVisible(true); }); } } diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor.java index 1fefe0c..feee4f2 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor.java @@ -85,11 +85,9 @@ public class NumberCellEditor<E extends Number> extends AbstractCellEditor @Override public void focusGained(FocusEvent e) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } + SwingUtilities.invokeLater(() -> { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); }); } @@ -101,11 +99,9 @@ public class NumberCellEditor<E extends Number> extends AbstractCellEditor @Override public void ancestorAdded(AncestorEvent event) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } + SwingUtilities.invokeLater(() -> { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); }); } diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java index 612a50c..a8266e0 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java @@ -39,8 +39,6 @@ import javax.swing.text.BadLocationException; import java.awt.Dimension; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.lang.reflect.Method; import java.math.BigDecimal; import java.math.BigInteger; @@ -257,19 +255,15 @@ public class NumberEditorHandler implements UIHandler<NumberEditor> { ui.getPopup().setVisible(false); return; } - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - JComponent invoker = - ui.isShowPopupButton() ? - ui.getShowPopUpButton() : - ui; - Dimension dim = ui.getPopup().getPreferredSize(); - int x = (int) (invoker.getPreferredSize().getWidth() - dim.getWidth()); - ui.getPopup().show(invoker, x, invoker.getHeight()); - ui.getTextField().requestFocus(); - } + SwingUtilities.invokeLater(() -> { + JComponent invoker = + ui.isShowPopupButton() ? + ui.getShowPopUpButton() : + ui; + Dimension dim = ui.getPopup().getPreferredSize(); + int x = (int) (invoker.getPreferredSize().getWidth() - dim.getWidth()); + ui.getPopup().show(invoker, x, invoker.getHeight()); + ui.getTextField().requestFocus(); }); } @@ -331,46 +325,36 @@ public class NumberEditorHandler implements UIHandler<NumberEditor> { { // list when number pattern changed to recompute it - model.addPropertyChangeListener(NumberEditorModel.PROPERTY_NUMBER_PATTERN, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - String newPattern = (String) evt.getNewValue(); + model.addPropertyChangeListener(NumberEditorModel.PROPERTY_NUMBER_PATTERN, evt -> { + String newPattern = (String) evt.getNewValue(); - setNumberPattern(newPattern); + setNumberPattern(newPattern); - if (log.isInfoEnabled()) { - log.info("set new numberPattern" + newPattern); - } - if (StringUtils.isEmpty(newPattern)) { - numberPattern = null; - } else { - numberPattern = Pattern.compile(newPattern); - } + if (log.isInfoEnabled()) { + log.info("set new numberPattern" + newPattern); + } + if (StringUtils.isEmpty(newPattern)) { + numberPattern = null; + } else { + numberPattern = Pattern.compile(newPattern); } }); // listen when numberValue changed (should be from outside) to convert to textValue - model.addPropertyChangeListener(NumberEditorModel.PROPERTY_NUMBER_VALUE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + model.addPropertyChangeListener(NumberEditorModel.PROPERTY_NUMBER_VALUE, evt -> { - Number newValue = (Number) evt.getNewValue(); - setTextValueFromNumberValue(newValue); + Number newValue = (Number) evt.getNewValue(); + setTextValueFromNumberValue(newValue); - } }); // listen when textValue changed to convert to number value - model.addPropertyChangeListener(NumberEditorModel.PROPERTY_TEXT_VALUE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + model.addPropertyChangeListener(NumberEditorModel.PROPERTY_TEXT_VALUE, evt -> { - String newValue = (String) evt.getNewValue(); - setNumberValueFromTextValue(newValue); + String newValue = (String) evt.getNewValue(); + setNumberValueFromTextValue(newValue); - } }); } @@ -402,33 +386,19 @@ public class NumberEditorHandler implements UIHandler<NumberEditor> { { // Add some listeners on ui - ui.addPropertyChangeListener(NumberEditor.PROPERTY_SHOW_POPUP_BUTTON, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (ui.getPopup().isVisible()) { - setPopupVisible(false); - } + ui.addPropertyChangeListener(NumberEditor.PROPERTY_SHOW_POPUP_BUTTON, evt -> { + if (ui.getPopup().isVisible()) { + setPopupVisible(false); } }); - ui.addPropertyChangeListener(NumberEditor.PROPERTY_AUTO_POPUP, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (ui.getPopup().isVisible()) { - setPopupVisible(false); - } + ui.addPropertyChangeListener(NumberEditor.PROPERTY_AUTO_POPUP, evt -> { + if (ui.getPopup().isVisible()) { + setPopupVisible(false); } }); - ui.addPropertyChangeListener(NumberEditor.PROPERTY_POPUP_VISIBLE, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - setPopupVisible((Boolean) evt.getNewValue()); - } - }); + ui.addPropertyChangeListener(NumberEditor.PROPERTY_POPUP_VISIBLE, evt -> setPopupVisible((Boolean) evt.getNewValue())); ui.getTextField().addMouseListener(new PopupListener()); } @@ -537,7 +507,7 @@ public class NumberEditorHandler implements UIHandler<NumberEditor> { } } - static interface NumberParserFormatter<N extends Number> { + interface NumberParserFormatter<N extends Number> { N parse(String textValue); diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java index 6250f31..a0890ad 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java @@ -189,12 +189,7 @@ public class NumberEditorModel extends AbstractSerializableBean implements Model } protected Predicate<NumberEditorModel> canUpdateBeanNumberValuePredicate() { - return new Predicate<NumberEditorModel>() { - @Override - public boolean apply(NumberEditorModel input) { - return true; - } - }; + return input -> true; } } diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java index 05242f1..84fde84 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java @@ -49,13 +49,9 @@ import javax.swing.JPopupMenu; import javax.swing.ListSelectionModel; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; import java.awt.event.FocusEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.io.Serializable; import java.lang.reflect.Method; import java.util.Arrays; @@ -358,12 +354,9 @@ public class FilterableDoubleListHandler<O extends Serializable> implements UIHa = new FilteredDecoratorListCellRenderer(this.decorator); universeList.setCellRenderer(universeListCellRenderer); // When universe list selection model changed, update the add button enabled property - universeList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { - @Override - public void valueChanged(ListSelectionEvent e) { - ListSelectionModel source = (ListSelectionModel) e.getSource(); - ui.getModel().setAddEnabled(!source.isSelectionEmpty()); - } + universeList.getSelectionModel().addListSelectionListener(e -> { + ListSelectionModel source = (ListSelectionModel) e.getSource(); + ui.getModel().setAddEnabled(!source.isSelectionEmpty()); }); final JaxxFilterableListModel<O> filterModel = ui.getModel().getUniverseModel(); @@ -407,30 +400,27 @@ public class FilterableDoubleListHandler<O extends Serializable> implements UIHa // When selected list selection model changed, update the add button enabled property - selectedList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { - @Override - public void valueChanged(ListSelectionEvent e) { - ListSelectionModel source = (ListSelectionModel) e.getSource(); - FilterableDoubleListModel<O> model = ui.getModel(); - if (!e.getValueIsAdjusting()) { - boolean removeEnabled = !source.isSelectionEmpty(); - model.setRemoveEnabled(removeEnabled); - - int minSelectionIndex = source.getMinSelectionIndex(); - int maxSelectionIndex = source.getMaxSelectionIndex(); - - boolean oneSelection = minSelectionIndex == maxSelectionIndex; - - boolean upEnabled = removeEnabled && - oneSelection && - minSelectionIndex > 0; - model.setSelectedUpEnabled(upEnabled); - - boolean downEnabled = removeEnabled && - oneSelection && - minSelectionIndex + 1 < model.getSelectedListSize(); - model.setSelectedDownEnabled(downEnabled); - } + selectedList.getSelectionModel().addListSelectionListener(e -> { + ListSelectionModel source = (ListSelectionModel) e.getSource(); + FilterableDoubleListModel<O> model1 = ui.getModel(); + if (!e.getValueIsAdjusting()) { + boolean removeEnabled = !source.isSelectionEmpty(); + model1.setRemoveEnabled(removeEnabled); + + int minSelectionIndex = source.getMinSelectionIndex(); + int maxSelectionIndex = source.getMaxSelectionIndex(); + + boolean oneSelection = minSelectionIndex == maxSelectionIndex; + + boolean upEnabled = removeEnabled && + oneSelection && + minSelectionIndex > 0; + model1.setSelectedUpEnabled(upEnabled); + + boolean downEnabled = removeEnabled && + oneSelection && + minSelectionIndex + 1 < model1.getSelectedListSize(); + model1.setSelectedDownEnabled(downEnabled); } }); } @@ -462,32 +452,21 @@ public class FilterableDoubleListHandler<O extends Serializable> implements UIHa // Listen ui changes - ui.addPropertyChangeListener(FilterableDoubleList.PROPERTY_INDEX, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + ui.addPropertyChangeListener(FilterableDoubleList.PROPERTY_INDEX, evt -> { - // decorator index has changed, force reload of data in ui - setIndex((Integer) evt.getOldValue(), - (Integer) evt.getNewValue()); + // decorator index has changed, force reload of data in ui + setIndex((Integer) evt.getOldValue(), + (Integer) evt.getNewValue()); - } }); - ui.addPropertyChangeListener(FilterableDoubleList.PROPERTY_REVERSE_SORT, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - // sort order has changed, force reload of data in ui - setSortOrder((Boolean) evt.getOldValue(), - (Boolean) evt.getNewValue()); - } + ui.addPropertyChangeListener(FilterableDoubleList.PROPERTY_REVERSE_SORT, evt -> { + // sort order has changed, force reload of data in ui + setSortOrder((Boolean) evt.getOldValue(), + (Boolean) evt.getNewValue()); }); - ui.addPropertyChangeListener(FilterableDoubleList.PROPERTY_HIGHLIGHT_FILTER_TEXT, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - setHighlightFilterText((Boolean) evt.getNewValue()); - } - }); + ui.addPropertyChangeListener(FilterableDoubleList.PROPERTY_HIGHLIGHT_FILTER_TEXT, evt -> setHighlightFilterText((Boolean) evt.getNewValue())); } // force to reload the showSelectPopup binding diff --git a/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java b/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java index 184aafd..189a9fb 100644 --- a/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java +++ b/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java @@ -21,8 +21,6 @@ */ package org.jdesktop.swingx.plaf.basic; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.beans.PropertyVetoException; import java.util.Date; @@ -36,21 +34,17 @@ public class ExtendedBasicDatePickerUI extends BasicDatePickerUI { public static final String PROPERTY_SHOW_POPUP_BUTTON = "showPopupButton"; protected JButton popupButton; - protected PropertyChangeSupport p; + protected final PropertyChangeSupport p; protected boolean showPopupButton; public ExtendedBasicDatePickerUI() { p = new PropertyChangeSupport(this); - p.addPropertyChangeListener(PROPERTY_SHOW_POPUP_BUTTON, new PropertyChangeListener() { + p.addPropertyChangeListener(PROPERTY_SHOW_POPUP_BUTTON, evt -> { - @Override - public void propertyChange(PropertyChangeEvent evt) { - - // dont do this on init - if (datePicker != null) { - installComponents(); - installListeners(); - } + // dont do this on init + if (datePicker != null) { + installComponents(); + installListeners(); } }); } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanelHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanelHandler.java index cdcbfa5..a43508e 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanelHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanelHandler.java @@ -108,25 +108,13 @@ public class AboutPanelHandler { if (ui.getLicenseText() == null) { ui.tabs.remove(ui.licenseContent); } else { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - ui.licenseTextArea.setCaretPosition(0); - } - }); + SwingUtilities.invokeLater(() -> ui.licenseTextArea.setCaretPosition(0)); } if (ui.getThirdpartyText() == null) { ui.tabs.remove(ui.thirdpartyContent); } else { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - ui.thirdpartyTextArea.setCaretPosition(0); - } - }); + SwingUtilities.invokeLater(() -> ui.thirdpartyTextArea.setCaretPosition(0)); } } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/CompoundIcon.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/CompoundIcon.java index 94fa52c..7020167 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/CompoundIcon.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/CompoundIcon.java @@ -48,7 +48,7 @@ import javax.swing.*; */ public class CompoundIcon implements Icon { public enum Layout { - HORIZONTAL, VERTICAL, STACKED; + HORIZONTAL, VERTICAL, STACKED } public final static float TOP = 0.0f; @@ -59,9 +59,9 @@ public class CompoundIcon implements Icon { private Icon[] icons; - private Layout layout; + private final Layout layout; - private int gap; + private final int gap; private float alignmentX = CENTER; private float alignmentY = CENTER; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java index e65a7e4..4544117 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java @@ -26,8 +26,6 @@ import org.apache.commons.logging.LogFactory; import javax.swing.Icon; import javax.swing.JComponent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; /** * Handler of ui {@link HidorButton}. @@ -48,17 +46,13 @@ public class HidorButtonHandler { void $afterCompleteSetup() { - ui.addPropertyChangeListener("targetVisible", new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("target visible changed <" + evt.getOldValue() + ":" + evt.getNewValue() + ">"); - } - boolean newValue = (Boolean) evt.getNewValue(); - if (ui.target != null) { - ui.target.setVisible(newValue); - } + ui.addPropertyChangeListener("targetVisible", evt -> { + if (log.isDebugEnabled()) { + log.debug("target visible changed <" + evt.getOldValue() + ":" + evt.getNewValue() + ">"); + } + boolean newValue = (Boolean) evt.getNewValue(); + if (ui.target != null) { + ui.target.setVisible(newValue); } }); } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java index 1cdd7b6..6f16dd7 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java @@ -60,8 +60,8 @@ public class JSearchTextField extends JTextField { return new ImageIcon(icon.getImage().getScaledInstance( size, size, Image.SCALE_SMOOTH )).getImage(); } - private static int PAD = 4; - private static int PAD2 = PAD*2; + private static final int PAD = 4; + private static final int PAD2 = PAD*2; @Override public void paint(Graphics g) { diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java index d1a1a11..8aef2db 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.runtime.swing; import com.google.common.collect.Lists; -import java.beans.PropertyChangeEvent; + import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.Collection; @@ -45,26 +45,16 @@ public class ListSelectorModel<B> { protected boolean addEnabled; protected boolean removeEnabled; - protected GenericListModel<B> fromModel; - protected GenericListModel<B> toModel; + protected final GenericListModel<B> fromModel; + protected final GenericListModel<B> toModel; protected ListSelectorModel() { fromModel = new GenericListModel<>(); - fromModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - setAddEnabled(fromModel.hasSelectedIndex()); - } - }); + fromModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, evt -> setAddEnabled(fromModel.hasSelectedIndex())); toModel = new GenericListModel<>(); - toModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - setRemoveEnabled(toModel.hasSelectedIndex()); - } - }); + toModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, evt -> setRemoveEnabled(toModel.hasSelectedIndex())); } public boolean isAddEnabled() { diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/MemoryStatusWidgetHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/MemoryStatusWidgetHandler.java index aab2783..83b921a 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/MemoryStatusWidgetHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/MemoryStatusWidgetHandler.java @@ -41,9 +41,9 @@ public class MemoryStatusWidgetHandler { private final static String memoryTestStr = "99999/99999Mb"; - private FontRenderContext frc = new FontRenderContext(null, false, false); + private final FontRenderContext frc = new FontRenderContext(null, false, false); - private LineMetrics lm = new JLabel().getFont().getLineMetrics(memoryTestStr, frc); + private final LineMetrics lm = new JLabel().getFont().getLineMetrics(memoryTestStr, frc); protected final MemoryStatusWidget ui; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditorHandler.java index be3652b..1b48850 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditorHandler.java @@ -37,7 +37,7 @@ public class FileEditorHandler { public static File lastSelectedPath; - protected FileEditor view; + protected final FileEditor view; /** * To set the dialog (see https://forge.nuiton.org/issues/2578). @@ -163,8 +163,8 @@ public class FileEditorHandler { } public static class ExtentionFileFiler extends FileFilter { - protected String ext; - protected String desciption; + protected final String ext; + protected final String desciption; public ExtentionFileFiler(String ext, String desciption) { this.ext = ext; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditorHandler.java index 0ac142a..2f3421c 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditorHandler.java @@ -228,7 +228,7 @@ public class I18nEditorHandler implements PropertyChangeListener, ActionListener return tip; } - protected Runnable showPopupRunnable = new Runnable() { + protected final Runnable showPopupRunnable = new Runnable() { @Override public void run() { ui.getPopup().pack(); diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeEditor.java index 9ed18bb..874c1b5 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeEditor.java @@ -70,11 +70,6 @@ public class KeyStrokeEditor extends JTextField { this.keyStroke = keyStroke; firePropertyChange("keyStroke", oldValue, keyStroke); fireActionPerformed(); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - setText(getKeyStroke().toString()); - } - }); + SwingUtilities.invokeLater(() -> setText(getKeyStroke().toString())); } } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/NumberEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/NumberEditorHandler.java index 3c77a02..d362130 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/NumberEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/NumberEditorHandler.java @@ -36,8 +36,6 @@ import javax.swing.text.BadLocationException; import java.awt.Dimension; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -64,7 +62,7 @@ public class NumberEditorHandler { public static final String VALIDATE_PROPERTY = "validate"; /** editor ui */ - protected NumberEditor editor; + protected final NumberEditor editor; /** the mutator method on the property of boxed bean in the editor */ protected Method mutator; @@ -90,65 +88,43 @@ public class NumberEditorHandler { // throw new NullPointerException("can not have a null bean in ui " + editor); // } - editor.addPropertyChangeListener(NumberEditor.PROPERTY_NUMBER_PATTERN, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - String newPattern = (String) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("set new numberPattern" + newPattern); - } - if (StringUtils.isEmpty(newPattern)) { - numberPattern = null; - } else { - numberPattern = Pattern.compile(newPattern); - } + editor.addPropertyChangeListener(NumberEditor.PROPERTY_NUMBER_PATTERN, evt -> { + String newPattern = (String) evt.getNewValue(); + if (log.isInfoEnabled()) { + log.info("set new numberPattern" + newPattern); } - }); - - editor.addPropertyChangeListener(NumberEditor.PROPERTY_SHOW_POPUP_BUTTON, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("set showPopupButton" + evt.getNewValue() + " for " + editor.getProperty()); - } - if (editor.getPopup().isVisible()) { - setPopupVisible(false); - } + if (StringUtils.isEmpty(newPattern)) { + numberPattern = null; + } else { + numberPattern = Pattern.compile(newPattern); } }); - editor.addPropertyChangeListener(NumberEditor.PROPERTY_AUTO_POPUP, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("set auto popup " + evt.getNewValue() + " for " + editor.getProperty()); - } - if (editor.getPopup().isVisible()) { - setPopupVisible(false); - } + editor.addPropertyChangeListener(NumberEditor.PROPERTY_SHOW_POPUP_BUTTON, evt -> { + if (log.isDebugEnabled()) { + log.debug("set showPopupButton" + evt.getNewValue() + " for " + editor.getProperty()); + } + if (editor.getPopup().isVisible()) { + setPopupVisible(false); } }); - editor.addPropertyChangeListener(PROPERTY_MODEL, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("set new model " + evt.getNewValue() + " for " + editor.getProperty()); - } - setModel((Number) evt.getOldValue(), (Number) evt.getNewValue()); + editor.addPropertyChangeListener(NumberEditor.PROPERTY_AUTO_POPUP, evt -> { + if (log.isDebugEnabled()) { + log.debug("set auto popup " + evt.getNewValue() + " for " + editor.getProperty()); + } + if (editor.getPopup().isVisible()) { + setPopupVisible(false); } }); - editor.addPropertyChangeListener(PROPERTY_POPUP_VISIBLE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - setPopupVisible((Boolean) evt.getNewValue()); + editor.addPropertyChangeListener(PROPERTY_MODEL, evt -> { + if (log.isDebugEnabled()) { + log.debug("set new model " + evt.getNewValue() + " for " + editor.getProperty()); } + setModel((Number) evt.getOldValue(), (Number) evt.getNewValue()); }); + editor.addPropertyChangeListener(PROPERTY_POPUP_VISIBLE, evt -> setPopupVisible((Boolean) evt.getNewValue())); editor.getTextField().addMouseListener(new PopupListener()); // Initialise le number pattern @@ -184,11 +160,7 @@ public class NumberEditorHandler { if (editor.getButton().getIcon() == null) { editor.getButton().setIcon(SwingUtil.createActionIcon("numbereditor-calculator")); }*/ - } catch (IllegalAccessException ex) { - log.error(ex); - } catch (IllegalArgumentException ex) { - log.error(ex); - } catch (InvocationTargetException ex) { + } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException ex) { log.error(ex); } } @@ -208,20 +180,16 @@ public class NumberEditorHandler { editor.getPopup().setVisible(false); return; } - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - JComponent invoker = - editor.isShowPopupButton() ? - editor.getShowPopUpButton() : - editor; - Dimension dim = editor.getPopup().getPreferredSize(); - int x = (int) (invoker.getPreferredSize().getWidth() - dim.getWidth()); - editor.getPopup().show(invoker, - x, invoker.getHeight()); - editor.getTextField().requestFocus(); - } + SwingUtilities.invokeLater(() -> { + JComponent invoker = + editor.isShowPopupButton() ? + editor.getShowPopUpButton() : + editor; + Dimension dim = editor.getPopup().getPreferredSize(); + int x = (int) (invoker.getPreferredSize().getWidth() - dim.getWidth()); + editor.getPopup().show(invoker, + x, invoker.getHeight()); + editor.getTextField().requestFocus(); }); } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java index 8602530..77dc117 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java @@ -31,7 +31,6 @@ import javax.swing.JSpinner; import javax.swing.SpinnerDateModel; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Method; import java.util.Calendar; @@ -86,53 +85,45 @@ public class SimpleTimeEditorHandler { this.calendarMinute = Calendar.getInstance(); this.calendarHour = Calendar.getInstance(); this.calendarDate = Calendar.getInstance(); - this.propertyDateChanged = new PropertyChangeListener() { + this.propertyDateChanged = evt -> { + Date date = (Date) evt.getNewValue(); - @Override - public void propertyChange(PropertyChangeEvent evt) { - Date date = (Date) evt.getNewValue(); - - if (date != null) { - calendarDate.setTime(date); - int hours = calendarDate.get(Calendar.HOUR_OF_DAY); - int minutes = calendarDate.get(Calendar.MINUTE); - if (log.isDebugEnabled()) { - log.debug("date changed : new value " + hours + ":" + minutes); - } - model.setTimeModel(hours * 60 + minutes); - - } else { - model.setTimeModel(null); + if (date != null) { + calendarDate.setTime(date); + int hours = calendarDate.get(Calendar.HOUR_OF_DAY); + int minutes = calendarDate.get(Calendar.MINUTE); + if (log.isDebugEnabled()) { + log.debug("date changed : new value " + hours + ":" + minutes); } + model.setTimeModel(hours * 60 + minutes); + } else { + model.setTimeModel(null); } - }; - this.propertyTimeChanged = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Integer time = (Integer) evt.getNewValue(); + }; + this.propertyTimeChanged = evt -> { + Integer time = (Integer) evt.getNewValue(); - int hours = time / 60; - int minutes = time % 60; + int hours = time / 60; + int minutes = time % 60; - calendarDate.set(Calendar.HOUR_OF_DAY, hours); - calendarDate.set(Calendar.MINUTE, minutes); + calendarDate.set(Calendar.HOUR_OF_DAY, hours); + calendarDate.set(Calendar.MINUTE, minutes); - // push it back into the bean + // push it back into the bean - Date newValue = calendarDate.getTime(); + Date newValue = calendarDate.getTime(); - if (log.isDebugEnabled()) { - log.debug(model.getProperty() + " on " + model.getBean().getClass() + " :: " + newValue); - } + if (log.isDebugEnabled()) { + log.debug(model.getProperty() + " on " + model.getBean().getClass() + " :: " + newValue); + } - try { - getMutator().invoke(model.getBean(), newValue); + try { + getMutator().invoke(model.getBean(), newValue); - } catch (Exception e) { - throw new RuntimeException(e); - } + } catch (Exception e) { + throw new RuntimeException(e); } }; } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditorHandler.java index 59dfd42..c6e9952 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditorHandler.java @@ -31,8 +31,6 @@ import javax.swing.plaf.basic.BasicSliderUI; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseWheelEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.lang.reflect.Method; import java.util.Calendar; import java.util.Date; @@ -56,14 +54,14 @@ public class TimeEditorHandler { public static final String TIME_MODEL_PROPERTY = "timeModel"; /** editor ui */ - protected TimeEditor editor; + protected final TimeEditor editor; /** the mutator method on the property of boxed bean in the editor */ protected Method mutator; - protected Calendar calendar; + protected final Calendar calendar; - protected Calendar calendarMinute; + protected final Calendar calendarMinute; public TimeEditorHandler(TimeEditor ui) { editor = ui; @@ -175,37 +173,29 @@ public class TimeEditorHandler { slider.addMouseWheelListener(m); // listen when date changes (should come from outside) - editor.addPropertyChangeListener(DATE_PROPERTY, new PropertyChangeListener() { + editor.addPropertyChangeListener(DATE_PROPERTY, evt -> { + Date date = (Date) evt.getNewValue(); - @Override - public void propertyChange(PropertyChangeEvent evt) { - Date date = (Date) evt.getNewValue(); - - if (date == null) { - return; - } - calendar.setTime(date); - int hours = calendar.get(Calendar.HOUR_OF_DAY); - int minutes = calendar.get(Calendar.MINUTE); - if (log.isDebugEnabled()) { - log.debug("date changed : new value " + hours + ":" + minutes); - } - getEditor().setTimeModel(hours * 60 + minutes); + if (date == null) { + return; } + calendar.setTime(date); + int hours = calendar.get(Calendar.HOUR_OF_DAY); + int minutes = calendar.get(Calendar.MINUTE); + if (log.isDebugEnabled()) { + log.debug("date changed : new value " + hours + ":" + minutes); + } + getEditor().setTimeModel(hours * 60 + minutes); }); // listen when time model changes (should come from editor) - editor.addPropertyChangeListener(TIME_MODEL_PROPERTY, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - Integer time = (Integer) evt.getNewValue(); - int hours = time / 60; - int minutes = time % 60; - calendar.set(Calendar.HOUR_OF_DAY, hours); - calendar.set(Calendar.MINUTE, minutes); - setDate(null, calendar.getTime()); - } + editor.addPropertyChangeListener(TIME_MODEL_PROPERTY, evt -> { + Integer time = (Integer) evt.getNewValue(); + int hours = time / 60; + int minutes = time % 60; + calendar.set(Calendar.HOUR_OF_DAY, hours); + calendar.set(Calendar.MINUTE, minutes); + setDate(null, calendar.getTime()); }); } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java index 037e280..ae7e829 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java @@ -63,7 +63,7 @@ public class BeanComboBoxHandler<O> implements PropertyChangeListener { public static final Log log = LogFactory.getLog(BeanComboBoxHandler.class); /** ui if the handler */ - protected BeanComboBox<O> ui; + protected final BeanComboBox<O> ui; /** the mutator method on the property of boxed bean in the ui */ protected Method mutator; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java index 719ac02..92cc01a 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java @@ -46,8 +46,6 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; import java.awt.event.FocusEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; @@ -74,7 +72,7 @@ public class BeanDoubleListHandler<O> implements PropertyChangeListener { protected Method mutator; /** ui of the handler */ - protected BeanDoubleList<O> ui; + protected final BeanDoubleList<O> ui; /** the decorator of data */ protected MultiJXPathDecorator<O> decorator; @@ -143,13 +141,7 @@ public class BeanDoubleListHandler<O> implements PropertyChangeListener { JList universeList = ui.getUniverseList(); final JList selectedList = ui.getSelectedList(); - uiModel.addCanRemoveItemsPredicate(new Predicate<List<O>>() { - - @Override - public boolean apply(List<O> o) { - return !o.isEmpty(); - } - }); + uiModel.addCanRemoveItemsPredicate(o -> !o.isEmpty()); final FilteredDecoratorListCellRenderer universeListCellRenderer = new FilteredDecoratorListCellRenderer(this.decorator); @@ -163,21 +155,15 @@ public class BeanDoubleListHandler<O> implements PropertyChangeListener { selectedList.setCellRenderer(new DecoratorListCellRenderer(decorator2)); // When universe list selection model changed, update the add button enabled property - universeList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { - @Override - public void valueChanged(ListSelectionEvent e) { - ListSelectionModel source = (ListSelectionModel) e.getSource(); - uiModel.setAddEnabled(!source.isSelectionEmpty()); - } + universeList.getSelectionModel().addListSelectionListener(e -> { + ListSelectionModel source = (ListSelectionModel) e.getSource(); + uiModel.setAddEnabled(!source.isSelectionEmpty()); }); // When selected list selection model changed, update the add button enabled property - selectedList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { - @Override - public void valueChanged(ListSelectionEvent e) { - if (!e.getValueIsAdjusting()) { - recomputeButtonStates(); - } + selectedList.getSelectionModel().addListSelectionListener(e -> { + if (!e.getValueIsAdjusting()) { + recomputeButtonStates(); } }); diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java index 81e526a..4b5e0d7 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java @@ -64,13 +64,13 @@ public class BeanDoubleListModel<O> extends AbstractSerializableBean { protected List<O> universe = new ArrayList<>(); /** Model containing the remaining available items */ - protected JaxxFilterableListModel<O> universeModel = new JaxxFilterableListModel<>(); + protected final JaxxFilterableListModel<O> universeModel = new JaxxFilterableListModel<>(); /** List of the selected items */ - protected List<O> selected = new ArrayList<>(); + protected final List<O> selected = new ArrayList<>(); /** Model containing the selected items */ - protected JaxxDefaultListModel<O> selectedModel = new JaxxDefaultListModel<>(); + protected final JaxxDefaultListModel<O> selectedModel = new JaxxDefaultListModel<>(); protected boolean addEnabled; @@ -82,7 +82,7 @@ public class BeanDoubleListModel<O> extends AbstractSerializableBean { protected boolean useMultiSelect; - protected Collection<Predicate<List<O>>> canRemoveItemsPredicates = new ArrayList<>(); + protected final Collection<Predicate<List<O>>> canRemoveItemsPredicates = new ArrayList<>(); /** * To get the selected items. diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java index 39abf17..08e934e 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java @@ -46,7 +46,6 @@ import java.awt.event.ActionListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -73,7 +72,7 @@ public class BeanFilterableComboBoxHandler<O> implements PropertyChangeListener public static final Log log = LogFactory.getLog(BeanFilterableComboBoxHandler.class); /** ui if the handler */ - protected BeanFilterableComboBox<O> ui; + protected final BeanFilterableComboBox<O> ui; /** the mutator method on the property of boxed bean in the ui */ protected Method mutator; @@ -265,23 +264,20 @@ public class BeanFilterableComboBoxHandler<O> implements PropertyChangeListener combobox.setRenderer(new DecoratorListCellRenderer(this.decorator)); ((JaxxFilterableComboBoxModel) combobox.getModel()).setDecorator(this.decorator); combobox.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); - combobox.addItemListener(new ItemListener() { - - public void itemStateChanged(ItemEvent e) { - Object item = e.getItem(); - if (e.getStateChange() == ItemEvent.SELECTED) { - if (log.isDebugEnabled()) { - log.debug("itemStateChanged selected " + item + " - " + (item != null ? item.getClass() : null)); - } - combobox.getEditor().getEditorComponent().setForeground(null); - ui.setSelectedItem(item); + combobox.addItemListener(e -> { + Object item = e.getItem(); + if (e.getStateChange() == ItemEvent.SELECTED) { + if (log.isDebugEnabled()) { + log.debug("itemStateChanged selected " + item + " - " + (item != null ? item.getClass() : null)); + } + combobox.getEditor().getEditorComponent().setForeground(null); + ui.setSelectedItem(item); - } else { - if (log.isDebugEnabled()) { - log.debug("itemStateChanged deselected " + item + " - " + (item != null ? item.getClass() : null)); - } - combobox.getEditor().getEditorComponent().setForeground(ui.getInvalidComboEditorTextColor()); + } else { + if (log.isDebugEnabled()) { + log.debug("itemStateChanged deselected " + item + " - " + (item != null ? item.getClass() : null)); } + combobox.getEditor().getEditorComponent().setForeground(ui.getInvalidComboEditorTextColor()); } }); @@ -666,7 +662,7 @@ public class BeanFilterableComboBoxHandler<O> implements PropertyChangeListener Object oldItem; - ComboBoxEditor wrapped; + final ComboBoxEditor wrapped; public JAXXFilterableComboBoxEditor(ComboBoxEditor wrapped) { this.wrapped = wrapped; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java index 513be37..873a26d 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java @@ -58,7 +58,7 @@ public class BeanListHeaderHandler<O> implements PropertyChangeListener { LogFactory.getLog(BeanListHeaderHandler.class); /** ui if the handler */ - protected BeanListHeader<O> ui; + protected final BeanListHeader<O> ui; /** the decorator of data */ protected MultiJXPathDecorator<O> decorator; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/DateCellEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/DateCellEditor.java index 168a7f0..2b04445 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/DateCellEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/DateCellEditor.java @@ -34,7 +34,7 @@ import org.nuiton.jaxx.runtime.swing.JAXXDatePicker; public class DateCellEditor extends AbstractCellEditor implements TableCellEditor { - protected JAXXDatePicker datePicker; + protected final JAXXDatePicker datePicker; public DateCellEditor() { datePicker = new JAXXDatePicker(); diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/FileCellEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/FileCellEditor.java index 89bb70a..2c71fbe 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/FileCellEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/FileCellEditor.java @@ -22,8 +22,6 @@ package org.nuiton.jaxx.runtime.swing.editor.cell; import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.io.File; import javax.swing.AbstractCellEditor; import javax.swing.JTable; @@ -48,13 +46,7 @@ public class FileCellEditor extends AbstractCellEditor public void setFileEditor(FileEditor fileEditor) { this.fileEditor = fileEditor; - fileEditor.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - fireEditingStopped(); - } - }); + fileEditor.addActionListener(e -> fireEditingStopped()); } @Override diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java index 6d13ee4..33da350 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java @@ -22,8 +22,6 @@ package org.nuiton.jaxx.runtime.swing.editor.cell; import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import javax.swing.AbstractCellEditor; import javax.swing.JTable; import javax.swing.KeyStroke; @@ -36,17 +34,11 @@ import org.nuiton.jaxx.runtime.swing.editor.KeyStrokeEditor; public class KeyStrokeCellEditor extends AbstractCellEditor implements TableCellEditor { - protected KeyStrokeEditor keyStrokeEditor; + protected final KeyStrokeEditor keyStrokeEditor; public KeyStrokeCellEditor() { keyStrokeEditor = new KeyStrokeEditor(); - keyStrokeEditor.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - fireEditingStopped(); - } - }); + keyStrokeEditor.addActionListener(e -> fireEditingStopped()); } @Override diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/NumberCellEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/NumberCellEditor.java index cacc83b..138e00a 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/NumberCellEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/NumberCellEditor.java @@ -81,11 +81,9 @@ public class NumberCellEditor<E extends Number> extends AbstractCellEditor @Override public void focusGained(FocusEvent e) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } + SwingUtilities.invokeLater(() -> { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); }); } @@ -97,11 +95,9 @@ public class NumberCellEditor<E extends Number> extends AbstractCellEditor @Override public void ancestorAdded(AncestorEvent event) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } + SwingUtilities.invokeLater(() -> { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); }); } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorHandler.java index aba20a5..f615f60 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorHandler.java @@ -150,15 +150,12 @@ public class DmdCoordinateEditorHandler implements UIHandler<DmdCoordinateEditor editor.setFocusLostBehavior(JFormattedTextField.COMMIT); // When editor changes his value, propagate it to model - editor.addPropertyChangeListener("value", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DmdCoordinate newValue = (DmdCoordinate) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("Value has changed: " + newValue); - } - model.setValue(newValue); + editor.addPropertyChangeListener("value", evt -> { + DmdCoordinate newValue = (DmdCoordinate) evt.getNewValue(); + if (log.isDebugEnabled()) { + log.debug("Value has changed: " + newValue); } + model.setValue(newValue); }); // When model sign changed, let's push it back in bean diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorHandler.java index 17bbefd..096aa5c 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorHandler.java @@ -159,15 +159,12 @@ public class DmsCoordinateEditorHandler implements UIHandler<DmsCoordinateEditor editor.setFocusLostBehavior(JFormattedTextField.COMMIT); // When editor changes his value, propagate it to model - editor.addPropertyChangeListener("value", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - DmsCoordinate newValue = (DmsCoordinate) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("Value has changed: " + newValue); - } - model.setValue(newValue); + editor.addPropertyChangeListener("value", evt -> { + DmsCoordinate newValue = (DmsCoordinate) evt.getNewValue(); + if (log.isDebugEnabled()) { + log.debug("Value has changed: " + newValue); } + model.setValue(newValue); }); // When model sign changed, let's push it back in bean diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java index 12e6e90..0c10a98 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java @@ -33,7 +33,7 @@ public interface CheckListAction<T> { void check( CheckListModel<T> model, boolean value ); - public static class CheckAll<T> implements CheckListAction<T> { + class CheckAll<T> implements CheckListAction<T> { @Override public String toString() { diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java index 060ecd7..60c698f 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java @@ -38,7 +38,7 @@ public class JAXXLog4jAppender extends WriterAppender { public static final String PROPERTY_LOGS = "logs"; public static final String PROPERTY_LEVEL = "level"; - protected List<LoggingEvent> events; + protected final List<LoggingEvent> events; protected StringBuilder logs; protected Level level; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jHandler.java index a726c0c..3929728 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jHandler.java @@ -48,7 +48,7 @@ public class JAXXLog4jHandler { private static final Log log = LogFactory.getLog(JAXXLog4jHandler.class); - protected JAXXLog4jUI ui; + protected final JAXXLog4jUI ui; protected static JAXXLog4jAppender appender; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DateCellRenderer.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DateCellRenderer.java index 61fe82d..e6a3a4d 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DateCellRenderer.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DateCellRenderer.java @@ -34,8 +34,8 @@ import org.apache.commons.lang3.StringUtils; */ public class DateCellRenderer implements TableCellRenderer { - protected TableCellRenderer delegate; - protected SimpleDateFormat dateFormat; + protected final TableCellRenderer delegate; + protected final SimpleDateFormat dateFormat; public DateCellRenderer(TableCellRenderer renderer, String datePattern) { this.delegate = renderer; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java index ee5e01f..e030122 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java @@ -40,7 +40,6 @@ import org.apache.commons.lang3.ObjectUtils; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -65,7 +64,7 @@ public abstract class AbstractTableFilter<T extends JTable> implements TableFilt private final T table; private final TableFilterState filterState = new TableFilterState(); - private Map<Integer, Integer> columnDistnctIntemNumbers = new HashMap<>(); + private final Map<Integer, Integer> columnDistnctIntemNumbers = new HashMap<>(); public AbstractTableFilter( T table ) { this.table = table; @@ -128,18 +127,8 @@ public abstract class AbstractTableFilter<T extends JTable> implements TableFilt result = new ArrayList<>(set); // if ( nullIndex >= 0 ) result.add(0, null); // add null to resulting collection if we had it - Collections.sort(result, new Comparator<Object>() { - @Override - public int compare(Object o1, Object o2) { - return ComparatorUtils.transformedComparator(ComparatorUtils.NATURAL_COMPARATOR, - new Transformer<Object, Comparable>() { - @Override - public Comparable transform(Object input) { - return AbstractTableFilter.this.toString(input); - } - }).compare(o1, o2); - } - }); + result.sort((o1, o2) -> ComparatorUtils.transformedComparator(ComparatorUtils.NATURAL_COMPARATOR, + (Transformer<Object, Comparable>) AbstractTableFilter.this::toString).compare(o1, o2)); } return result; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java index 97d809a..1ecaf9a 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java @@ -89,7 +89,7 @@ public class JTableFilter extends AbstractTableFilter<JTable> { } @Override - public boolean include( final RowFilter.Entry<? extends Object, ? extends Object> entry) { + public boolean include( final RowFilter.Entry<?, ?> entry) { // use parent filter condition if ( parentFilter != null && !parentFilter.include(entry)) return false; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilter.java index 816c923..1476507 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilter.java @@ -79,7 +79,7 @@ public interface TableFilter<T extends JTable> extends Serializable { */ boolean apply( int col, Collection<Object> items ); - public interface Row { + interface Row { int getValueCount(); Object getValue( int column ); } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java index 1ab338a..1286965 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java @@ -47,8 +47,6 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -120,17 +118,9 @@ class TableFilterColumnPopup extends MouseAdapter { filterList.getList().setVisibleRowCount(8); setupTableHeader(); - filter.getTable().addPropertyChangeListener("tableHeader", new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - setupTableHeader(); - } - } + filter.getTable().addPropertyChangeListener("tableHeader", evt -> setupTableHeader() ); - filter.getTable().addPropertyChangeListener("model", new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - colAttrs.clear(); - } - } + filter.getTable().addPropertyChangeListener("model", evt -> colAttrs.clear() ); searchField.getDocument().addDocumentListener(new DocumentListener() { @@ -369,12 +359,9 @@ class TableFilterColumnPopup extends MouseAdapter { protected void beforeShow() { if (searchable) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - searchField.setText(""); - searchField.requestFocusInWindow(); - } + SwingUtilities.invokeLater(() -> { + searchField.setText(""); + searchField.requestFocusInWindow(); }); } } @@ -474,7 +461,7 @@ class TableFilterColumnPopup extends MouseAdapter { } finally { g2.dispose(); } - }; + } private void drawDot(Graphics g, int x, int y) { g.setColor(Color.WHITE); diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java index 1dbd7f9..7c86667 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java @@ -35,7 +35,6 @@ package org.nuiton.jaxx.runtime.swing.table.filter; import org.nuiton.decorator.Decorator; import java.awt.*; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Collections; @@ -116,14 +115,7 @@ public final class TableRowFilterSupport { final JTable table = filter.getTable(); - filter.addChangeListener(new FilterChangeListener() { - - @Override - public void filterChanged(TableFilter<?> filter) { - table.getTableHeader().repaint(); - - } - }); + filter.addChangeListener(filter -> table.getTableHeader().repaint()); // make sure that search component is reset after table model changes setupHeaderRenderers(table.getModel(), true ); @@ -155,13 +147,7 @@ public final class TableRowFilterSupport { if ( !fullSetup ) return; - PropertyChangeListener listener = new PropertyChangeListener() { - - public void propertyChange(PropertyChangeEvent e) { - setupHeaderRenderers(table.getModel(), false); - } - - }; + PropertyChangeListener listener = e -> setupHeaderRenderers(table.getModel(), false); table.addPropertyChangeListener("model", listener); table.addPropertyChangeListener("columnModel", listener); diff --git a/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorTest.java b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorTest.java index 616105a..e1d380a 100644 --- a/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorTest.java +++ b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorTest.java @@ -33,8 +33,6 @@ import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; import java.awt.BorderLayout; import java.awt.GridLayout; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.text.ParseException; /** @@ -166,20 +164,17 @@ public class DmdCoordinateEditorTest { final JLabel latitudeResult = new JLabel(); final JLabel longitudeResult = new JLabel(); - bean.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - EditorBean source = (EditorBean) evt.getSource(); - String propertyName = evt.getPropertyName(); - if (log.isInfoEnabled()) { - log.info("[" + propertyName + "] value changed: " + evt.getNewValue()); - } - if (propertyName.startsWith("longitude")) { - longitudeResult.setText(source.getLongitude().toString()); - } else { - - latitudeResult.setText(source.getLatitude().toString()); - } + bean.addPropertyChangeListener(evt -> { + EditorBean source = (EditorBean) evt.getSource(); + String propertyName = evt.getPropertyName(); + if (log.isInfoEnabled()) { + log.info("[" + propertyName + "] value changed: " + evt.getNewValue()); + } + if (propertyName.startsWith("longitude")) { + longitudeResult.setText(source.getLongitude().toString()); + } else { + + latitudeResult.setText(source.getLatitude().toString()); } }); @@ -201,12 +196,9 @@ public class DmdCoordinateEditorTest { frame.setContentPane(panel); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - frame.setSize(800, 200); - frame.setVisible(true); - } + SwingUtilities.invokeLater(() -> { + frame.setSize(800, 200); + frame.setVisible(true); }); } } diff --git a/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorTest.java b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorTest.java index b8cee0d..0842ae0 100644 --- a/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorTest.java +++ b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorTest.java @@ -33,8 +33,6 @@ import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; import java.awt.BorderLayout; import java.awt.GridLayout; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.text.ParseException; /** @@ -168,20 +166,17 @@ public class DmsCoordinateEditorTest { final JLabel latitudeResult = new JLabel(); final JLabel longitudeResult = new JLabel(); - bean.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - EditorBean source = (EditorBean) evt.getSource(); - String propertyName = evt.getPropertyName(); - if (log.isInfoEnabled()) { - log.info("[" + propertyName + "] value changed: " + evt.getNewValue()); - } - if (propertyName.startsWith("longitude")) { - longitudeResult.setText(source.getLongitude().toString()); - } else { - - latitudeResult.setText(source.getLatitude().toString()); - } + bean.addPropertyChangeListener(evt -> { + EditorBean source = (EditorBean) evt.getSource(); + String propertyName = evt.getPropertyName(); + if (log.isInfoEnabled()) { + log.info("[" + propertyName + "] value changed: " + evt.getNewValue()); + } + if (propertyName.startsWith("longitude")) { + longitudeResult.setText(source.getLongitude().toString()); + } else { + + latitudeResult.setText(source.getLatitude().toString()); } }); @@ -203,12 +198,9 @@ public class DmsCoordinateEditorTest { frame.setContentPane(panel); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - frame.setSize(800, 200); - frame.setVisible(true); - } + SwingUtilities.invokeLater(() -> { + frame.setSize(800, 200); + frame.setVisible(true); }); } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm