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 be6926a53a031dfc14a64ba39e92bb0dd66260e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 13 16:02:34 2016 +0200 remove inline variables + clean code --- .../nuiton/jaxx/application/ApplicationIOUtil.java | 6 +-- .../swing/AbstractApplicationFormUIModel.java | 3 +- .../swing/AbstractApplicationUIHandler.java | 52 +++++++++------------- .../swing/action/AbstractApplicationAction.java | 6 +-- .../swing/action/ApplicationActionFactory.java | 11 ++--- .../swing/table/AbstractApplicationTableModel.java | 22 +++------ .../swing/table/AbstractSelectTableAction.java | 6 +-- .../ApplicationTableModelValidatorDataLocator.java | 3 +- .../src/main/java/jaxx/compiler/ClassMap.java | 2 +- .../main/java/jaxx/compiler/CompiledObject.java | 8 ++-- .../compiler/DefaultCompilerConfiguration.java | 6 +-- .../src/main/java/jaxx/compiler/I18nHelper.java | 3 +- .../src/main/java/jaxx/compiler/IDHelper.java | 4 +- .../src/main/java/jaxx/compiler/JAXXCompiler.java | 37 ++++++++------- .../src/main/java/jaxx/compiler/JAXXEngine.java | 12 ++--- .../src/main/java/jaxx/compiler/JAXXProfile.java | 12 ++--- .../src/main/java/jaxx/compiler/SymbolTable.java | 6 +-- .../java/jaxx/compiler/beans/BeanInfoUtil.java | 2 +- .../jaxx/compiler/beans/JAXXFeatureDescriptor.java | 2 +- .../java/jaxx/compiler/beans/JAXXIntrospector.java | 4 +- .../java/jaxx/compiler/binding/DataBinding.java | 2 +- .../jaxx/compiler/binding/DataBindingHelper.java | 6 +-- .../java/jaxx/compiler/binding/DataSource.java | 10 ++--- .../java/jaxx/compiler/binding/JavaParserUtil.java | 14 +++--- .../java/jaxx/compiler/css/StylesheetHelper.java | 36 +++++++-------- .../compiler/css/parser/JJTCSSParserState.java | 4 +- .../decorators/DefaultCompiledObjectDecorator.java | 3 +- .../HelpRootCompiledObjectDecorator.java | 15 +++---- .../jaxx/compiler/finalizers/SwingFinalizer.java | 3 +- .../compiler/finalizers/ValidatorFinalizer.java | 3 +- .../main/java/jaxx/compiler/java/JavaElement.java | 2 +- .../jaxx/compiler/java/JavaElementFactory.java | 12 ++--- .../main/java/jaxx/compiler/java/JavaField.java | 4 +- .../src/main/java/jaxx/compiler/java/JavaFile.java | 26 +++++------ .../main/java/jaxx/compiler/java/JavaMethod.java | 4 +- .../compiler/java/parser/JJTJavaParserState.java | 4 +- .../jaxx/compiler/reflect/ClassDescriptor.java | 3 +- .../compiler/reflect/ClassDescriptorHelper.java | 15 +++---- .../ClassDescriptorResolverFromJavaFile.java | 21 ++++----- .../ClassDescriptorResolverFromJaxxFile.java | 4 +- .../java/jaxx/compiler/script/ScriptManager.java | 2 +- .../jaxx/compiler/tags/DefaultObjectHandler.java | 12 ++--- .../main/java/jaxx/compiler/tags/TagManager.java | 11 +++-- .../compiler/tags/swing/CompiledItemContainer.java | 4 +- .../jaxx/compiler/tags/swing/TableHandler.java | 2 +- .../tags/validator/BeanValidatorHandler.java | 14 +++--- .../compiler/tasks/GenerateConstructorsTask.java | 10 ++--- .../java/jaxx/compiler/tasks/GenerateTask.java | 2 +- .../tools/jaxxcapture/AbstractContextNode.java | 2 +- .../compiler/tools/jaxxcapture/CapturedObject.java | 6 +-- .../compiler/tools/jaxxcapture/JAXXCapture.java | 8 ++-- .../main/java/jaxx/compiler/types/TypeManager.java | 2 +- .../jaxx/compiler/binding/JavaParserUtilTest.java | 6 +-- .../jaxx/compiler/java/parser/JavaParserTest.java | 2 +- .../ClassDescriptorResolverFromJavaFileTest.java | 2 +- .../jaxx/runtime/swing/config/ConfigUIHandler.java | 9 ++-- .../swing/config/model/CallBacksManager.java | 6 +-- .../swing/config/model/MyDelegateConfig.java | 12 ++--- .../swing/config/model/MyInheritedConfig.java | 12 ++--- .../jaxx/plugin/AbstractGenerateHelpMojo.java | 4 +- .../nuiton/jaxx/plugin/GenerateHelpFilesMojo.java | 4 +- .../nuiton/jaxx/plugin/GenerateHelpIdsMojo.java | 12 +++-- .../nuiton/jaxx/plugin/GenerateHelpSearchMojo.java | 2 +- .../java/org/nuiton/jaxx/plugin/GenerateMojo.java | 4 +- .../main/java/org/nuiton/jaxx/plugin/NodeItem.java | 2 +- .../java/org/nuiton/jaxx/plugin/XmlHelper.java | 2 +- .../main/java/jaxx/runtime/FileChooserUtil.java | 9 ++-- .../src/main/java/jaxx/runtime/JAXXUtil.java | 15 +++---- .../java/jaxx/runtime/context/DataContext.java | 3 +- .../runtime/swing/model/JaxxDefaultListModel.java | 3 +- .../java/jaxx/runtime/swing/nav/NavHelper.java | 6 +-- .../swing/renderer/LocaleListCellRenderer.java | 9 ++-- .../renderer/MultiDecoratorListCellRenderer.java | 3 +- .../jaxx/runtime/swing/session/SwingSession.java | 3 +- .../jaxx/runtime/swing/wizard/WizardModel.java | 9 ++-- .../jaxx/runtime/swing/wizard/WizardUILancher.java | 6 +-- .../SimpleBeanValidatorMessageTableRenderer.java | 9 ++-- .../validator/swing/SwingListValidator.java | 14 +++--- .../SwingListValidatorMessageTableRenderer.java | 12 ++--- .../runtime/validator/swing/SwingValidator.java | 14 +++--- .../swing/SwingValidatorMessageListRenderer.java | 9 ++-- .../swing/SwingValidatorMessageTableRenderer.java | 9 ++-- .../validator/swing/SwingValidatorUtil.java | 10 ++--- .../swing/ui/AbstractBeanValidatorUI.java | 3 +- .../UnifiedValidatorMessageTableRenderer.java | 27 ++++------- .../JFormatterTextFieldInternalGroups.java | 3 +- .../widgets/datetime/DateTimeEditorHandler.java | 9 ++-- .../jaxx/widgets/datetime/DateTimeEditorModel.java | 6 +-- .../jaxx/widgets/datetime/TimeEditorHandler.java | 9 ++-- .../jaxx/widgets/datetime/TimeEditorModel.java | 3 +- .../widgets/extra/datatips/DataTipListener.java | 6 +-- .../widgets/extra/datatips/DataTipManager.java | 3 +- .../widgets/extra/datatips/ListDataTipCell.java | 6 +-- .../widgets/extra/datatips/TableDataTipCell.java | 6 +-- .../extra/datatips/TableDataTipListener.java | 3 +- .../widgets/extra/datatips/TreeDataTipCell.java | 3 +- .../jaxx/widgets/extra/editor/DefaultEditor.java | 3 +- .../nuiton/jaxx/widgets/extra/editor/Editor.java | 9 ++-- .../jaxx/widgets/extra/editor/JEditEditor.java | 3 +- .../jaxx/widgets/extra/editor/NullEditor.java | 3 +- .../jaxx/widgets/extra/editor/RSyntaxEditor.java | 3 +- .../org/nuiton/jaxx/widgets/gis/DdCoordinate.java | 12 ++--- .../org/nuiton/jaxx/widgets/gis/DmdCoordinate.java | 12 ++--- .../org/nuiton/jaxx/widgets/gis/DmsCoordinate.java | 12 ++--- .../absolute/AbsoluteDdCoordinateEditorModel.java | 3 +- .../absolute/AbsoluteDmdCoordinateEditorModel.java | 3 +- .../gis/signed/SignedDmdCoordinateEditorModel.java | 3 +- .../widgets/select/FilterableDoubleListModel.java | 3 +- .../jaxx/runtime/swing/HidorButtonHandler.java | 6 +-- .../runtime/swing/editor/I18nEditorHandler.java | 3 +- .../swing/editor/SimpleTimeEditorHandler.java | 5 +-- .../runtime/swing/editor/TimeEditorHandler.java | 5 +-- .../swing/editor/bean/BeanComboBoxHandler.java | 3 +- .../editor/bean/BeanFilterableComboBoxHandler.java | 3 +- .../runtime/swing/editor/gis/DmdCoordinate.java | 12 ++--- .../swing/editor/gis/DmdCoordinateEditorModel.java | 3 +- .../runtime/swing/editor/gis/DmsCoordinate.java | 12 ++--- 117 files changed, 359 insertions(+), 544 deletions(-) diff --git a/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationIOUtil.java b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationIOUtil.java index 70c8475..8c3c0b0 100644 --- a/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationIOUtil.java +++ b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationIOUtil.java @@ -88,8 +88,7 @@ public class ApplicationIOUtil { public static FileObject resolveFile(String file, String errorMessage) { try { FileSystemManager manager = VFS.getManager(); - FileObject targetObject = manager.resolveFile(file); - return targetObject; + return manager.resolveFile(file); } catch (IOException e) { throw new ApplicationTechnicalException(errorMessage, e); } @@ -255,8 +254,7 @@ public class ApplicationIOUtil { public static File createTemporaryDirectory(String prefix) { try { - File result = FileUtil.createTempDirectory(prefix, null); - return result; + return FileUtil.createTempDirectory(prefix, null); } catch (IOException e) { throw new ApplicationTechnicalException("Could not create temporary directory", e); } 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 3f9762e..e6b9736 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 @@ -251,8 +251,7 @@ public abstract class AbstractApplicationFormUIModel<E, B extends AbstractApplic return new Function<B, E>() { @Override public E apply(B model) { - E entity = model.toEntity(); - return entity; + return model.toEntity(); } }; } 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 3a2c5c2..ab67428 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 @@ -344,13 +344,12 @@ public abstract class AbstractApplicationUIHandler<M, UI extends ApplicationUI<M CONFIRMATION_FORMAT, message, t("jaxx.application.common.askSaveBeforeLeaving.help")); - int result = JOptionPane.showConfirmDialog( + return JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, t("jaxx.application.common.askSaveBeforeLeaving.title"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); - return result; } public boolean askCancelEditBeforeLeaving(String message) { @@ -365,8 +364,7 @@ public abstract class AbstractApplicationUIHandler<M, UI extends ApplicationUI<M JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); - boolean result = i == JOptionPane.OK_OPTION; - return result; + return i == JOptionPane.OK_OPTION; } public void showSuccessMessage(String title, String message) { @@ -978,13 +976,12 @@ public abstract class AbstractApplicationUIHandler<M, UI extends ApplicationUI<M String askSaveMessage, Action saveAction) { - boolean result = quitScreen(modelIsValid, - modelIsModify, - askGiveUpMessage, - askSaveMessage, - saveAction, - false); - return result; + return quitScreen(modelIsValid, + modelIsModify, + askGiveUpMessage, + askSaveMessage, + saveAction, + false); } @@ -998,13 +995,12 @@ public abstract class AbstractApplicationUIHandler<M, UI extends ApplicationUI<M String askSaveMessage, Action saveAction) { - boolean result = quitScreen(modelIsValid, - modelIsModify, - askGiveUpMessage, - askSaveMessage, - saveAction, - true); - return result; + return quitScreen(modelIsValid, + modelIsModify, + askGiveUpMessage, + askSaveMessage, + saveAction, + true); } @@ -1095,8 +1091,7 @@ public abstract class AbstractApplicationUIHandler<M, UI extends ApplicationUI<M Preconditions.checkNotNull(decorator); - ListCellRenderer result = new DecoratorListCellRenderer(decorator); - return result; + return new DecoratorListCellRenderer(decorator); } //FIXME Move this in JAXX @@ -1190,19 +1185,18 @@ public abstract class AbstractApplicationUIHandler<M, UI extends ApplicationUI<M } protected TableCellRenderer newNumberCellRenderer(final TableCellRenderer defaultRenderer) { - TableCellRenderer result = new TableCellRenderer() { + return new TableCellRenderer() { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - Component result = defaultRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - if (result instanceof JLabel) { - JLabel jLabel = (JLabel) result; + Component result1 = defaultRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + if (result1 instanceof JLabel) { + JLabel jLabel = (JLabel) result1; jLabel.setHorizontalTextPosition(SwingConstants.RIGHT); } - return result; + return result1; } }; - return result; } @@ -1250,16 +1244,14 @@ public abstract class AbstractApplicationUIHandler<M, UI extends ApplicationUI<M Decorator<O> decorator = getDecorator(type, name); - TableCellRenderer result = newTableCellRender(decorator); - return result; + return newTableCellRender(decorator); } protected <O> TableCellRenderer newTableCellRender(Decorator<O> decorator) { Preconditions.checkNotNull(decorator); - DecoratorTableCellRenderer result = new DecoratorTableCellRenderer(decorator, true); - return result; + return new DecoratorTableCellRenderer(decorator, true); } protected void incrementsMessage(String message) { 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 2709041..1bbda7f 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 @@ -204,8 +204,7 @@ public abstract class AbstractApplicationAction<M extends AbstractBean, UI exten // set default directory to this one JaxxFileChooser.setCurrentDirectory(defaultFile); } - File file = saveFile(filename, extension, title, buttonLabel, filters); - return file; + return saveFile(filename, extension, title, buttonLabel, filters); } /** @@ -374,8 +373,7 @@ public abstract class AbstractApplicationAction<M extends AbstractBean, UI exten JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); - boolean result = i == JOptionPane.OK_OPTION; - return result; + return i == JOptionPane.OK_OPTION; } protected void displayInfoMessage(String title, String message) { diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionFactory.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionFactory.java index 06f8d63..bdeabcc 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionFactory.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionFactory.java @@ -57,8 +57,7 @@ public class ApplicationActionFactory { A logicAction = createLogicAction(handler, actionName); // create ui action - ApplicationUIAction<A> result = createUIAction(abstractButton, logicAction); - return result; + return createUIAction(abstractButton, logicAction); } catch (Exception e) { throw new ApplicationTechnicalException(t("jaxx.application.action.create.error", actionName), e); } @@ -69,9 +68,8 @@ public class ApplicationActionFactory { A logicAction) { // create ui action - ApplicationUIAction<A> result = new ApplicationUIAction<A>(abstractButton, - logicAction); - return result; + return new ApplicationUIAction<A>(abstractButton, + logicAction); } @@ -81,8 +79,7 @@ public class ApplicationActionFactory { try { // create action - A result = ConstructorUtils.invokeConstructor(actionName, handler); - return result; + return ConstructorUtils.invokeConstructor(actionName, handler); } catch (Exception e) { throw new ApplicationTechnicalException(t("jaxx.application.action.create.error", actionName), e); } 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 1021bcb..d31398f 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 @@ -216,15 +216,13 @@ public abstract class AbstractApplicationTableModel<R extends Serializable> exte } public final int getRowIndex(R row) { - int result = rows == null ? -1 : rows.indexOf(row); - return result; + return rows == null ? -1 : rows.indexOf(row); } public final R getEntry(int rowIndex) { SwingUtil.ensureRowIndex(this, rowIndex); List<R> data = getRows(); - R result = data == null ? null : data.get(rowIndex); - return result; + return data == null ? null : data.get(rowIndex); } public final void setNoneEditableCols(ColumnIdentifier<?>... noneEditableCols) { @@ -248,8 +246,7 @@ public abstract class AbstractApplicationTableModel<R extends Serializable> exte if (log.isDebugEnabled()) { log.debug("columnIndex: " + columnIndex + " :: " + identifier.getPropertyName()); } - Object result = identifier.getValue(entry); - return result; + return identifier.getValue(entry); } @Override @@ -265,8 +262,7 @@ public abstract class AbstractApplicationTableModel<R extends Serializable> exte @Override public final boolean isCellEditable(int rowIndex, int columnIndex) { ColumnIdentifier<R> identifier = getIdentifier(columnIndex); - boolean result = isCellEditable(rowIndex, columnIndex, identifier); - return result; + return isCellEditable(rowIndex, columnIndex, identifier); } protected void setValueAt(Object aValue, @@ -283,8 +279,7 @@ public abstract class AbstractApplicationTableModel<R extends Serializable> exte protected boolean isCellEditable(int rowIndex, int columnIndex, ColumnIdentifier<R> propertyName) { - boolean result = !noneEditableCols.contains(propertyName); - return result; + return !noneEditableCols.contains(propertyName); } public final void fireTableCellUpdated(int rowIndex, @@ -320,8 +315,7 @@ public abstract class AbstractApplicationTableModel<R extends Serializable> exte } protected ColumnIdentifier<R> getIdentifier(int columnIndex) { - ColumnIdentifier<R> identifier = identifiers.get(columnIndex); - return identifier; + return identifiers.get(columnIndex); } public int getColumnIndex(final String propertyName) { @@ -338,9 +332,7 @@ public abstract class AbstractApplicationTableModel<R extends Serializable> exte int rowIndex = getRowIndex(row); int columnIndex = getColumnIndex(propertyName); - Pair<Integer, Integer> cell = Pair.of(rowIndex, columnIndex); - - return cell; + return Pair.of(rowIndex, columnIndex); } public void moveUp(R row) { diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractSelectTableAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractSelectTableAction.java index 37d1d28..103e2bd 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractSelectTableAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractSelectTableAction.java @@ -62,13 +62,11 @@ public abstract class AbstractSelectTableAction<M extends AbstractApplicationTab } protected int getSelectedRow() { - int result = table.getSelectedRow(); - return result; + return table.getSelectedRow(); } protected int getSelectedColumn() { - int result = table.getSelectedColumn(); - return result; + return table.getSelectedColumn(); } protected int getRowCount() { diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ApplicationTableModelValidatorDataLocator.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ApplicationTableModelValidatorDataLocator.java index cbf9a9e..aea16ce 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ApplicationTableModelValidatorDataLocator.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ApplicationTableModelValidatorDataLocator.java @@ -59,8 +59,7 @@ public class ApplicationTableModelValidatorDataLocator<R extends Serializable, T String fieldName) { T model = (T) tableModel; - Pair<Integer, Integer> cell = model.getCell(bean, fieldName); - return cell; + return model.getCell(bean, fieldName); } @Override diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/ClassMap.java b/jaxx-compiler/src/main/java/jaxx/compiler/ClassMap.java index b2d3b2a..ef67dba 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/ClassMap.java +++ b/jaxx-compiler/src/main/java/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<ClassDescriptor>(); + private 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/jaxx/compiler/CompiledObject.java b/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java index 5cd6a16..a60782b 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java @@ -95,10 +95,10 @@ public class CompiledObject { private StringBuilder additionCode = new StringBuilder(); /** List of all registered event handlers. */ - private List<EventHandler> eventHandlers = new ArrayList<EventHandler>(); + private List<EventHandler> eventHandlers = new ArrayList<>(); /** All properties that have been applied to this CompiledObject. */ - private Map<String, String> properties = new HashMap<String, String>(); + private Map<String, String> properties = new HashMap<>(); /** generic types of the compiled object */ private String[] genericTypes; @@ -262,7 +262,7 @@ public class CompiledObject { throw new NullPointerException(); } this.objectClass = objectClass; - childs = new ArrayList<ChildRef>(); + childs = new ArrayList<>(); } public static boolean isValidID(String id) { @@ -591,7 +591,7 @@ public class CompiledObject { public Map<String, String> getClientProperties() { if (clientProperties == null) { - clientProperties = new HashMap<String, String>(); + clientProperties = new HashMap<>(); } return clientProperties; } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java b/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java index d05d2b2..52ca240 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java @@ -278,7 +278,7 @@ public class DefaultCompilerConfiguration implements CompilerConfiguration { @Override public Map<String, CompiledObjectDecorator> getDecorators() { if (decorators == null) { - decorators = new TreeMap<String, CompiledObjectDecorator>(); + decorators = new TreeMap<>(); ClassLoader classloader = Thread.currentThread().getContextClassLoader(); if (log.isInfoEnabled()) { @@ -302,7 +302,7 @@ public class DefaultCompilerConfiguration implements CompilerConfiguration { @Override public Map<String, JAXXCompilerFinalizer> getFinalizers() { if (finalizers == null) { - finalizers = new TreeMap<String, JAXXCompilerFinalizer>(); + finalizers = new TreeMap<>(); ClassLoader classloader = Thread.currentThread().getContextClassLoader(); @@ -326,7 +326,7 @@ public class DefaultCompilerConfiguration implements CompilerConfiguration { @Override public Map<String, Initializer> getInitializers() { if (initializers == null) { - initializers = new TreeMap<String, Initializer>(); + initializers = new TreeMap<>(); ClassLoader classloader = Thread.currentThread().getContextClassLoader(); if (log.isInfoEnabled()) { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java b/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java index 4181cc2..930923f 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java @@ -138,8 +138,7 @@ public class I18nHelper { attributeValueCode, compiler); compiler.addImport(SwingUtil.class.getName()); - String result = "{" + SwingUtil.class.getSimpleName() + + return "{" + SwingUtil.class.getSimpleName() + ".getFirstCharAt(" + stringValue + ",'Z')}"; - return result; } } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/IDHelper.java b/jaxx-compiler/src/main/java/jaxx/compiler/IDHelper.java index f8eac42..8b1b0ce 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/IDHelper.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/IDHelper.java @@ -45,12 +45,12 @@ public class IDHelper { /** * Counter by type */ - protected final Map<String, Integer> autoGenIds = new TreeMap<String, Integer>(); + protected final Map<String, Integer> autoGenIds = new TreeMap<>(); /** * Maps of uniqued id for objects used in compiler */ - protected final Map<Object, String> uniqueIds = new HashMap<Object, String>(); + protected final Map<Object, String> uniqueIds = new HashMap<>(); /** * Optimized Counter diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java index 9fe52df..d1d3f68 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java @@ -317,23 +317,23 @@ public class JAXXCompiler { this.engine = engine; this.jaxxFile = jaxxFile; - ids = new LinkedHashMap<CompiledObject, String>(); - objects = new LinkedHashMap<String, CompiledObject>(); + ids = new LinkedHashMap<>(); + objects = new LinkedHashMap<>(); bodyCode = new StringBuilder(); lateInitializer = new StringBuilder(); initializer = new StringBuilder(); - tagsBeingCompiled = new Stack<Element>(); - initializers = new ArrayList<Runnable>(); - eventHandlerMethodNames = new HashMap<EventHandler, String>(); + tagsBeingCompiled = new Stack<>(); + initializers = new ArrayList<>(); + eventHandlerMethodNames = new HashMap<>(); eventHandlers = - new HashMap<String, Map<ClassDescriptor, List<EventHandler>>>(); - inlineStyles = new ArrayList<Rule>(); + new HashMap<>(); + inlineStyles = new ArrayList<>(); scriptManager = new ScriptManager(this); symbolTable = new SymbolTable(); - openComponents = new Stack<CompiledObject>(); - importedPackages = new HashSet<String>(); - importedClasses = new HashSet<String>(); - sourceFiles = new Stack<File>(); + openComponents = new Stack<>(); + importedPackages = new HashSet<>(); + importedClasses = new HashSet<>(); + sourceFiles = new Stack<>(); if (jaxxFile == null) { src = null; baseDir = null; @@ -940,13 +940,13 @@ public class JAXXCompiler { Map<ClassDescriptor, List<EventHandler>> listeners = eventHandlers.get(objectCode); if (listeners == null) { - listeners = new HashMap<ClassDescriptor, List<EventHandler>>(); + listeners = new HashMap<>(); eventHandlers.put(objectCode, listeners); } ClassDescriptor listenerClass = handler.getListenerClass(); List<EventHandler> handlerList = listeners.get(listenerClass); if (handlerList == null) { - handlerList = new ArrayList<EventHandler>(); + handlerList = new ArrayList<>(); listeners.put(listenerClass, handlerList); } handlerList.add(handler); @@ -1078,7 +1078,7 @@ public class JAXXCompiler { } public void applyStylesheets() { - for (Object o : new ArrayList<CompiledObject>(objects.values())) { + for (Object o : new ArrayList<>(objects.values())) { CompiledObject object = (CompiledObject) o; DefaultObjectHandler tagHandler = TagManager.getTagHandler(object.getObjectClass()); @@ -1375,14 +1375,13 @@ public class JAXXCompiler { return false; } - boolean aware = ClassDescriptorHelper.isAssignableFrom(superClass, - type); - return aware; + return ClassDescriptorHelper.isAssignableFrom(superClass, + type); } public JAXXObjectDescriptor getJAXXObjectDescriptor() { runInitializers(); - CompiledObject[] components = new ArrayList<CompiledObject>( + CompiledObject[] components = new ArrayList<>( objects.values()).toArray(new CompiledObject[objects.size()]); assert initializers.isEmpty() : @@ -1755,7 +1754,7 @@ public class JAXXCompiler { // obtain list of finalizers to apply List<JAXXCompilerFinalizer> realFinalizers = - new ArrayList<JAXXCompilerFinalizer>(); + new ArrayList<>(); for (JAXXCompilerFinalizer finalizer : getConfiguration().getFinalizers().values()) { if (finalizer.accept(this)) { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java index 8638764..634137f 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java @@ -92,9 +92,9 @@ public class JAXXEngine { } this.configuration = configuration; - warnings = new ArrayList<String>(); - errors = new ArrayList<String>(); - compilingFiles = new ArrayList<JAXXCompilerFile>(); + warnings = new ArrayList<>(); + errors = new ArrayList<>(); + compilingFiles = new ArrayList<>(); if (configuration.isShowClassDescriptorLoading()) { ClassDescriptorHelper.setShowLoading(true); @@ -113,7 +113,7 @@ public class JAXXEngine { public JAXXEngineTask[] getTasks() { if (tasks == null) { - List<JAXXEngineTask> tasks = new ArrayList<JAXXEngineTask>(); + List<JAXXEngineTask> tasks = new ArrayList<>(); tasks.add(new InitTask()); tasks.add(new CompileFirstPassTask()); @@ -167,7 +167,7 @@ public class JAXXEngine { // } public JAXXCompilerFile[] getFilesToCompile() { - List<JAXXCompilerFile> files = new ArrayList<JAXXCompilerFile>(); + List<JAXXCompilerFile> files = new ArrayList<>(); for (JAXXCompilerFile file : compilingFiles) { if (file.getCompiler() == null) { files.add(file); @@ -177,7 +177,7 @@ public class JAXXEngine { } public JAXXCompilerFile[] getCompiledFiles() { - List<JAXXCompilerFile> files = new ArrayList<JAXXCompilerFile>(); + List<JAXXCompilerFile> files = new ArrayList<>(); for (JAXXCompilerFile file : compilingFiles) { if (file.getCompiler() != null) { files.add(file); diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXProfile.java b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXProfile.java index 89fce1d..2c729b6 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXProfile.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXProfile.java @@ -60,7 +60,7 @@ public class JAXXProfile { public CompilerEntry(JAXXCompiler compiler) { this.compiler = compiler; - times = new TreeMap<String, Long>(); + times = new TreeMap<>(); } } @@ -74,7 +74,7 @@ public class JAXXProfile { ProfileResult(Map<JAXXCompiler, Long> delta) { this.delta = delta; - times = new ArrayList<Long>(delta.values()); + times = new ArrayList<>(delta.values()); Collections.sort(times); min = times.get(0); max = times.get(times.size() - 1); @@ -115,8 +115,8 @@ public class JAXXProfile { List<JAXXCompiler> compilers; public JAXXProfile() { - compilers = new ArrayList<JAXXCompiler>(); - entries = new TreeMap<Integer, CompilerEntry>(); + compilers = new ArrayList<>(); + entries = new TreeMap<>(); } public void addTime(JAXXCompiler compiler, String key) { @@ -125,7 +125,7 @@ public class JAXXProfile { } public Map<JAXXCompiler, Long> getDelta(String keyOne, String keyTwo) { - Map<JAXXCompiler, Long> result = new HashMap<JAXXCompiler, Long>(); + Map<JAXXCompiler, Long> result = new HashMap<>(); for (Map.Entry<Integer, CompilerEntry> e : entries.entrySet()) { JAXXCompiler c = getCompiler(e.getKey()); CompilerEntry entry = e.getValue(); @@ -157,7 +157,7 @@ public class JAXXProfile { public ProfileResult newProfileResult(ProfileResult... toCumul) { ProfileResult result; - Map<JAXXCompiler, Long> delta = new HashMap<JAXXCompiler, Long>(); + Map<JAXXCompiler, Long> delta = new HashMap<>(); for (JAXXCompiler c : compilers) { long total = 0; for (ProfileResult cumul : toCumul) { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/SymbolTable.java b/jaxx-compiler/src/main/java/jaxx/compiler/SymbolTable.java index d3d1357..26e0fa1 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/SymbolTable.java +++ b/jaxx-compiler/src/main/java/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<String, String>(); + private Map<String, String> ids = new HashMap<>(); - private List<FieldDescriptor> scriptFields = new ArrayList<FieldDescriptor>(); + private List<FieldDescriptor> scriptFields = new ArrayList<>(); - private List<MethodDescriptor> scriptMethods = new ArrayList<MethodDescriptor>(); + private List<MethodDescriptor> scriptMethods = new ArrayList<>(); private String[] interfaces; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/beans/BeanInfoUtil.java b/jaxx-compiler/src/main/java/jaxx/compiler/beans/BeanInfoUtil.java index 9a5b6f2..c674be5 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/beans/BeanInfoUtil.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/beans/BeanInfoUtil.java @@ -38,7 +38,7 @@ public class BeanInfoUtil { if (originalBeanInfoSearchPath == null) { originalBeanInfoSearchPath = searchPath; } - List<String> listSearchPath = new ArrayList<String>(Arrays.asList(searchPath)); + List<String> listSearchPath = new ArrayList<>(Arrays.asList(searchPath)); for (String packageName : packageNames) { if (!listSearchPath.contains(packageName)) { listSearchPath.add(packageName); diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXFeatureDescriptor.java b/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXFeatureDescriptor.java index caaa954..873bf22 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXFeatureDescriptor.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXFeatureDescriptor.java @@ -62,7 +62,7 @@ public class JAXXFeatureDescriptor { public void setValue(String key, Object value) { if (values == null) { - values = new HashMap<String, Object>(); + values = new HashMap<>(); } values.put(key, value); } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXIntrospector.java b/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXIntrospector.java index cb3a01e..c7634aa 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXIntrospector.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXIntrospector.java @@ -52,9 +52,9 @@ public class JAXXIntrospector { private ClassDescriptor classDescriptor; - private Map<String, JAXXPropertyDescriptor> propertyDescriptors = new HashMap<String, JAXXPropertyDescriptor>(); + private Map<String, JAXXPropertyDescriptor> propertyDescriptors = new HashMap<>(); - private Map<String, JAXXEventSetDescriptor> eventSetDescriptors = new HashMap<String, JAXXEventSetDescriptor>(); + private Map<String, JAXXEventSetDescriptor> eventSetDescriptors = new HashMap<>(); private JAXXIntrospector(ClassDescriptor classDescriptor) { this.classDescriptor = classDescriptor; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java b/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java index 4d70335..e9d33ce 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java @@ -78,7 +78,7 @@ public class DataBinding { protected String initDataBinding; /** Extra method to add to the binding */ - protected final List<JavaMethod> methods = new ArrayList<JavaMethod>(); + protected final List<JavaMethod> methods = new ArrayList<>(); /** internal state passed to {@code true} when {@link #compile(JAXXCompiler)} method is invoked */ private boolean compiled; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBindingHelper.java b/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBindingHelper.java index 9a5b62c..bb6bb48 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBindingHelper.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBindingHelper.java @@ -58,16 +58,16 @@ public class DataBindingHelper { * Registred data binding for the compiler, then after the invocation of method {@link #finalizeBindings()} * only the real data bindings, the simple bindings will be moved to {@link #simpleBindings}. */ - protected final List<DataBinding> dataBindings = new ArrayList<DataBinding>(); + protected final List<DataBinding> dataBindings = new ArrayList<>(); /** Simpel bindings for the compiler */ - protected final List<DataBinding> simpleBindings = new ArrayList<DataBinding>(); + protected final List<DataBinding> simpleBindings = new ArrayList<>(); /** Associated compiler */ protected final JAXXCompiler compiler; /** Counter by unsafe type */ - protected final Map<String, Integer> autoUnsafeGenIds = new TreeMap<String, Integer>(); + protected final Map<String, Integer> autoUnsafeGenIds = new TreeMap<>(); public DataBindingHelper(JAXXCompiler compiler) { this.compiler = compiler; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java b/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java index 3b365ad..a43a6b8 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java @@ -115,7 +115,7 @@ public class DataSource { this.source = source; this.compiler = compiler; this.methods = methods; - trackers = new ArrayList<DataListener>(); + trackers = new ArrayList<>(); } public String getObjectCode() { @@ -165,9 +165,9 @@ public class DataSource { JavaParser p = new JavaParser(new StringReader(source)); // detect all expressions to treate - Map<SimpleNode, List<SimpleNode>> expressions = new LinkedHashMap<SimpleNode, List<SimpleNode>>(); - Map<SimpleNode, List<SimpleNode>> castsExpressions = new LinkedHashMap<SimpleNode, List<SimpleNode>>(); - List<SimpleNode> literalExpressions = new ArrayList<SimpleNode>(); + Map<SimpleNode, List<SimpleNode>> expressions = new LinkedHashMap<>(); + Map<SimpleNode, List<SimpleNode>> castsExpressions = new LinkedHashMap<>(); + List<SimpleNode> literalExpressions = new ArrayList<>(); while (!p.Line()) { SimpleNode node = p.popNode(); if (log.isTraceEnabled()) { @@ -216,7 +216,7 @@ public class DataSource { Iterator<String> itr = result.iterator(); - overrideIds = new HashSet<String>(); + overrideIds = new HashSet<>(); String realSource = getJavaCode(itr.next()); buffer.append(realSource).append(" != null"); diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/JavaParserUtil.java b/jaxx-compiler/src/main/java/jaxx/compiler/binding/JavaParserUtil.java index eb355d8..9d78e56 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/JavaParserUtil.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/binding/JavaParserUtil.java @@ -120,7 +120,7 @@ public class JavaParserUtil { * @param castsExpressions list of cast expression to keep */ public static void removeNoneStandaloneExpressions(Map<SimpleNode, List<SimpleNode>> store, Map<SimpleNode, List<SimpleNode>> castsExpressions) { - List<SimpleNode> rejectedExpressions = new ArrayList<SimpleNode>(); + List<SimpleNode> rejectedExpressions = new ArrayList<>(); for (Map.Entry<SimpleNode, List<SimpleNode>> e : store.entrySet()) { @@ -156,7 +156,7 @@ public class JavaParserUtil { return null; } - Set<SimpleNode> castCodes = new LinkedHashSet<SimpleNode>(); + Set<SimpleNode> castCodes = new LinkedHashSet<>(); for (List<SimpleNode> cast : casts.values()) { for (SimpleNode node : cast) { castCodes.add(node); @@ -166,7 +166,7 @@ public class JavaParserUtil { } } - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); for (SimpleNode node : store) { String expression = node.getText().trim(); if (result.contains(expression)) { @@ -229,13 +229,13 @@ public class JavaParserUtil { } - Set<String> objectCodes = new LinkedHashSet<String>(); + Set<String> objectCodes = new LinkedHashSet<>(); for (String expression : result) { // test if we have a cast in this expression - Set<String> tmp = new LinkedHashSet<String>(); + Set<String> tmp = new LinkedHashSet<>(); String[] paths = expression.split("\\s*\\.\\s*"); if (paths.length < 2) { @@ -345,7 +345,7 @@ public class JavaParserUtil { } List<SimpleNode> simpleNodeList = casts.get(lastExpressionNode); if (simpleNodeList == null) { - simpleNodeList = new ArrayList<SimpleNode>(); + simpleNodeList = new ArrayList<>(); casts.put(lastExpressionNode, simpleNodeList); } simpleNodeList.add(node); @@ -368,7 +368,7 @@ public class JavaParserUtil { List<SimpleNode> simpleNodeList = store.get(lastExpressionNode); if (simpleNodeList == null) { - simpleNodeList = new ArrayList<SimpleNode>(); + simpleNodeList = new ArrayList<>(); store.put(node, simpleNodeList); } simpleNodeList.add(node); diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java b/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java index 0abf56e..e6a4ada 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java @@ -76,7 +76,7 @@ public class StylesheetHelper { } catch (Error e) { throw new CompilerException(e); } - List<Rule> rules = new ArrayList<Rule>(); + List<Rule> rules = new ArrayList<>(); for (int i = 0; i < node.jjtGetNumChildren(); i++) { SimpleNode ruleNode = node.getChild(i); Rule rule = processRule(ruleNode); @@ -95,13 +95,13 @@ public class StylesheetHelper { assert selectorsNode.getId() == CSSParserTreeConstants.JJTSELECTORS : "expected node to be of type Selectors"; - List<Selector> selectors = new ArrayList<Selector>(); + List<Selector> selectors = new ArrayList<>(); for (int i = 0; i < selectorsNode.jjtGetNumChildren(); i++) { SimpleNode selectorNode = selectorsNode.getChild(i); selectors.add(processSelector(selectorNode)); } - Map<String, String> properties = new HashMap<String, String>(); + Map<String, String> properties = new HashMap<>(); for (int i = 1; i < ruleNode.jjtGetNumChildren(); i++) { SimpleNode declarationNode = ruleNode.getChild(i); if (declarationNode.getId() == CSSParserTreeConstants.JJTDECLARATION) { @@ -203,12 +203,10 @@ public class StylesheetHelper { public static MethodDescriptor getAddMouseListenerMethod(CompiledObject object) { try { - MethodDescriptor addMouseListener = - object.getObjectClass().getMethodDescriptor( - "addMouseListener", - getMouseListenerDescriptor() - ); - return addMouseListener; + return object.getObjectClass().getMethodDescriptor( + "addMouseListener", + getMouseListenerDescriptor() + ); } catch (NoSuchMethodException e) { throw new CompilerException( "could not find addMouseListener for object " + object); @@ -217,12 +215,10 @@ public class StylesheetHelper { public static MethodDescriptor getMouseListenerMethod(CompiledObject object, String property) { try { - MethodDescriptor methodDescriptor = - getMouseListenerDescriptor().getMethodDescriptor( - property, - getMouseEventDescriptor() - ); - return methodDescriptor; + return getMouseListenerDescriptor().getMethodDescriptor( + property, + getMouseEventDescriptor() + ); } catch (NoSuchMethodException e) { throw new CompilerException( "could not find " + property + " for object " + object); @@ -268,7 +264,7 @@ public class StylesheetHelper { Rule[] pseudoClasses = getApplicablePseudoClasses(stylesheet, object); if (pseudoClasses != null) { Map<String, Map<String, String>> combinedPseudoClasses = - new LinkedHashMap<String, Map<String, String>>(); + new LinkedHashMap<>(); for (Rule pseudoClass1 : pseudoClasses) { Selector[] selectors = pseudoClass1.getSelectors(); for (Selector selector : selectors) { @@ -280,7 +276,7 @@ public class StylesheetHelper { Map<String, String> combinedProperties = combinedPseudoClasses.get(pseudoClass); if (combinedProperties == null) { - combinedProperties = new HashMap<String, String>(); + combinedProperties = new HashMap<>(); combinedPseudoClasses.put(pseudoClass, combinedProperties); } @@ -599,7 +595,7 @@ public class StylesheetHelper { if (apply == Selector.ALWAYS_APPLIES || apply == Selector.ALWAYS_APPLIES_INHERIT_ONLY) { if (result == null) { - result = new HashMap<String, String>(); + result = new HashMap<>(); } for (Map.Entry<String, String> entry : rule.getProperties().entrySet()) { @@ -620,7 +616,7 @@ public class StylesheetHelper { for (Rule rule : s.getRules()) { if (appliesTo(rule, object) == Selector.PSEUDOCLASS_APPLIES) { if (result == null) { - result = new ArrayList<Rule>(); + result = new ArrayList<>(); } result.add(rule); } @@ -631,7 +627,7 @@ public class StylesheetHelper { public static Rule inlineAttribute(CompiledObject object, String propertyName, boolean dataBinding) { - Map<String, String> properties = new HashMap<String, String>(); + Map<String, String> properties = new HashMap<>(); properties.put(propertyName, dataBinding ? Rule.DATA_BINDING : Rule.INLINE_ATTRIBUTE); diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/JJTCSSParserState.java b/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/JJTCSSParserState.java index 7d10cb5..aaa5b40 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/JJTCSSParserState.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/JJTCSSParserState.java @@ -36,8 +36,8 @@ class JJTCSSParserState { private boolean node_created; JJTCSSParserState() { - nodes = new java.util.Stack<Node>(); - marks = new java.util.Stack<Integer>(); + nodes = new java.util.Stack<>(); + marks = new java.util.Stack<>(); sp = 0; mk = 0; } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java index 2474531..81861ff 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java @@ -288,8 +288,7 @@ public class DefaultCompiledObjectDecorator implements CompiledObjectDecorator { ); } } - String result = code.toString(); - return result; + return code.toString(); } @Override diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java index 07acb85..28c1149 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java @@ -50,7 +50,7 @@ import static jaxx.compiler.java.JavaElementFactory.newArgument; public class HelpRootCompiledObjectDecorator extends DefaultCompiledObjectDecorator { /** the list of discovered helpId */ - protected static Set<String> helpIds = new HashSet<String>(); + protected static Set<String> helpIds = new HashSet<>(); @Override public String getName() { @@ -58,8 +58,7 @@ public class HelpRootCompiledObjectDecorator extends DefaultCompiledObjectDecora } protected String getBrokerFQN(JAXXCompiler compiler) { - String helpBrokerFQN = compiler.getConfiguration().getHelpBrokerFQN(); - return helpBrokerFQN; + return compiler.getConfiguration().getHelpBrokerFQN(); } protected String getHelpId(CompiledObject o) { @@ -160,15 +159,13 @@ public class HelpRootCompiledObjectDecorator extends DefaultCompiledObjectDecora if (buffer.length() > 0) { String type = compiler.getImportedType(helpBrokerFQN); - StringBuilder extraCode = new StringBuilder(type); - extraCode.append(" _broker = getBroker();"); buffer.append(eol).append("_broker.prepareUI(this);"); buffer.append(eol); // add the calls compiler.appendLateInitializer("// help broker setup" + eol); - compiler.appendLateInitializer(extraCode.toString()); + compiler.appendLateInitializer(type + " _broker = getBroker();"); compiler.appendLateInitializer(buffer.toString()); } } @@ -211,13 +208,11 @@ public class HelpRootCompiledObjectDecorator extends DefaultCompiledObjectDecora return false; } - boolean superClassResult = isNeedInterface(parentCompiler, validatorInterface); - // ok must add the interface - return superClassResult; + return isNeedInterface(parentCompiler, validatorInterface); } public static Set<String> getHelpIds() { - return new HashSet<String>(helpIds); + return new HashSet<>(helpIds); } } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/SwingFinalizer.java b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/SwingFinalizer.java index d196406..bf58823 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/SwingFinalizer.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/SwingFinalizer.java @@ -50,8 +50,7 @@ public class SwingFinalizer extends AbstractFinalizer { ClassDescriptor descriptor = ClassDescriptorHelper.getClassDescriptor(Application.class); CompiledObject root = compiler.getRootObject(); - boolean accept = descriptor.isAssignableFrom(root.getObjectClass()); - return accept; + return descriptor.isAssignableFrom(root.getObjectClass()); } @Override diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java index d28665f..3452736 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java @@ -74,8 +74,7 @@ public class ValidatorFinalizer extends AbstractFinalizer { public boolean accept(JAXXCompiler compiler) { //use this finalizer if compiler is validation aware - boolean accept = BeanValidatorHandler.hasValidator(compiler); - return accept; + return BeanValidatorHandler.hasValidator(compiler); } @Override diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java index ca4b962..c4a2e9a 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java @@ -81,7 +81,7 @@ public abstract class JavaElement { public Set<String> getAnnotations() { if (annotations == null) { - annotations = new HashSet<String>(); + annotations = new HashSet<>(); } return annotations; } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElementFactory.java b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElementFactory.java index 8dee618..59ffb08 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElementFactory.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElementFactory.java @@ -39,21 +39,18 @@ public class JavaElementFactory { static private final Log log = LogFactory.getLog(JavaElementFactory.class); public static JavaFile newFile(int modifiers, String className) { - JavaFile file = new JavaFile(modifiers, className); - return file; + return new JavaFile(modifiers, className); } public static JavaArgument newArgument(String type, String name) { - JavaArgument argument = newArgument(type, name, false); - return argument; + return newArgument(type, name, false); } public static JavaArgument newArgument(String type, String name, boolean isFinal) { - JavaArgument argument = new JavaArgument(type, name, isFinal); - return argument; + return new JavaArgument(type, name, isFinal); } public static JavaField newField(int modifiers, @@ -173,11 +170,10 @@ public class JavaElementFactory { } public static JavaArgument cloneArgument(JavaArgument argument) { - JavaArgument result = newArgument( + return newArgument( argument.getType(), argument.getName(), argument.isFinal() ); - return result; } } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaField.java b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaField.java index bf42b9b..54eea64 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaField.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaField.java @@ -241,13 +241,13 @@ public class JavaField extends JavaElement implements Comparable<JavaField> { public static EnumMap<FieldOrder, List<JavaField>> getSortedFields(List<JavaField> fields) { EnumMap<FieldOrder, List<JavaField>> result = - new EnumMap<FieldOrder, List<JavaField>>(FieldOrder.class); + new EnumMap<>(FieldOrder.class); for (FieldOrder fieldOrder : FieldOrder.values()) { result.put(fieldOrder, new ArrayList<JavaField>()); } EnumSet<FieldOrder> allConstants = EnumSet.allOf(FieldOrder.class); - List<JavaField> allFields = new ArrayList<JavaField>(fields); + List<JavaField> allFields = new ArrayList<>(fields); int[] scopes = new int[]{Modifier.STATIC, Modifier.PUBLIC, Modifier.PROTECTED, diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java index ab5a8ef..fdb4570 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java @@ -53,15 +53,15 @@ public class JavaFile extends JavaElement { protected static final String SETTER_PATTERN = "%1$s oldValue = this.%2$s;\nthis.%2$s = %2$s;\nfirePropertyChange(%3$s, oldValue, %2$s);"; - private Set<String> imports = new HashSet<String>(); + private Set<String> imports = new HashSet<>(); - private List<JavaField> fields = new ArrayList<JavaField>(); + private List<JavaField> fields = new ArrayList<>(); - private List<JavaMethod> methods = new ArrayList<JavaMethod>(); + private List<JavaMethod> methods = new ArrayList<>(); - private List<JavaConstructor> constructors = new ArrayList<JavaConstructor>(); + private List<JavaConstructor> constructors = new ArrayList<>(); - private List<JavaFile> innerClasses = new ArrayList<JavaFile>(); + private List<JavaFile> innerClasses = new ArrayList<>(); private String superClass; @@ -149,13 +149,13 @@ public class JavaFile extends JavaElement { } public String[] getImports() { - List<String> result = new ArrayList<String>(imports); + List<String> result = new ArrayList<>(imports); Collections.sort(result); return result.toArray(new String[result.size()]); } public List<String> getImportsList() { - List<String> result = new ArrayList<String>(imports); + List<String> result = new ArrayList<>(imports); Collections.sort(result); return result; } @@ -166,7 +166,7 @@ public class JavaFile extends JavaElement { public List<String> getInterfaces() { if (interfaces == null) { - interfaces = new ArrayList<String>(); + interfaces = new ArrayList<>(); } return interfaces; } @@ -229,7 +229,7 @@ public class JavaFile extends JavaElement { } public void setImports(Collection<String> imports) { - this.imports = new HashSet<String>(imports); + this.imports = new HashSet<>(imports); } public void setGenericType(String genericType) { @@ -252,11 +252,10 @@ public class JavaFile extends JavaElement { } public void setInterfaces(List<String> interfaces) { - List<String> simpleInterfaces = new ArrayList<String>(); + List<String> simpleInterfaces = new ArrayList<>(); for (String anInterface : interfaces) { try { - String type = importManager.getType(anInterface); - anInterface = type; + anInterface = importManager.getType(anInterface); } catch (Exception e) { log.error("Could not determine simple name of interface " + anInterface); @@ -483,8 +482,7 @@ public class JavaFile extends JavaElement { String simpleType = importManager.getType(type); simpleTypes[i] = simpleType; } - String format = String.format(pattern, (Object[]) simpleTypes); - return format; + return String.format(pattern, (Object[]) simpleTypes); } public void clear() { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java index ce89056..ef3583b 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java @@ -295,13 +295,13 @@ public class JavaMethod extends JavaElement implements Comparable<JavaMethod> { public static EnumMap<MethodOrder, List<JavaMethod>> getSortedMethods(List<JavaMethod> methods) { EnumMap<MethodOrder, List<JavaMethod>> result = - new EnumMap<MethodOrder, List<JavaMethod>>(MethodOrder.class); + new EnumMap<>(MethodOrder.class); for (MethodOrder methodOrder : MethodOrder.values()) { result.put(methodOrder, new ArrayList<JavaMethod>()); } EnumSet<MethodOrder> allConstants = EnumSet.allOf(MethodOrder.class); - List<JavaMethod> allMethods = new ArrayList<JavaMethod>(methods); + List<JavaMethod> allMethods = new ArrayList<>(methods); int[] scopes = new int[]{Modifier.STATIC, Modifier.PUBLIC, Modifier.PROTECTED, diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JJTJavaParserState.java b/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JJTJavaParserState.java index 8f9e6d4..08bf924 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JJTJavaParserState.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JJTJavaParserState.java @@ -36,8 +36,8 @@ class JJTJavaParserState { private boolean node_created; JJTJavaParserState() { - nodes = new java.util.Stack<Node>(); - marks = new java.util.Stack<Integer>(); + nodes = new java.util.Stack<>(); + marks = new java.util.Stack<>(); sp = 0; mk = 0; } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptor.java b/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptor.java index 821faa5..13df107 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptor.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptor.java @@ -284,11 +284,10 @@ public abstract class ClassDescriptor { } try { - ClassDescriptor result = ClassDescriptorHelper.getClassDescriptor( + return ClassDescriptorHelper.getClassDescriptor( fqn, getClassLoader() ); - return result; } catch (ClassNotFoundException e) { throw new RuntimeException(e); } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorHelper.java b/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorHelper.java index 8ede4d3..520eb84 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorHelper.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorHelper.java @@ -77,13 +77,13 @@ public class ClassDescriptorHelper { private static boolean SHOW_LOADING = log.isDebugEnabled(); private static Map<String, ClassDescriptor> descriptors = - new HashMap<String, ClassDescriptor>(); + new HashMap<>(); private static Map<ResolverType, ClassDescriptorResolver> descriptorResolvers; protected static Map<ResolverType, ClassDescriptorResolver> getDescriptorResolvers() { if (descriptorResolvers == null) { - descriptorResolvers = new EnumMap<ResolverType, ClassDescriptorResolver>(ResolverType.class); + descriptorResolvers = new EnumMap<>(ResolverType.class); descriptorResolvers.put(ResolverType.JAVA_CLASS, new ClassDescriptorResolverFromJavaClass()); descriptorResolvers.put(ResolverType.JAVA_FILE, new ClassDescriptorResolverFromJavaFile()); descriptorResolvers.put(ResolverType.JAXX_FILE, new ClassDescriptorResolverFromJaxxFile()); @@ -98,15 +98,13 @@ public class ClassDescriptorHelper { public static boolean isAssignableFrom(ClassDescriptor classDescriptor, Class<?> awareClass) throws ClassNotFoundException { ClassDescriptor awareDescriptor = getClassDescriptor(awareClass); - boolean result = awareDescriptor.isAssignableFrom(classDescriptor); - return result; + return awareDescriptor.isAssignableFrom(classDescriptor); } public static ClassDescriptor getClassDescriptor(String className) throws ClassNotFoundException { - ClassDescriptor descriptor = getClassDescriptor(className, - Thread.currentThread().getContextClassLoader()); - return descriptor; + return getClassDescriptor(className, + Thread.currentThread().getContextClassLoader()); } public static ClassDescriptor getClassDescriptor(Class<?> javaClass) { @@ -124,8 +122,7 @@ public class ClassDescriptorHelper { if (log.isDebugEnabled()) { log.debug("Path to search : " + path); } - URL url = classLoader.getResource(path); - return url; + return classLoader.getResource(path); } public static ClassDescriptor getClassDescriptor( diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java b/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java index 2d046c7..c7571d4 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java @@ -95,9 +95,7 @@ public class ClassDescriptorResolverFromJavaFile extends ClassDescriptorResolver // log.error(e.getMessage()); throw new RuntimeException(e); } - ClassDescriptor result = - new JavaFileClassDescriptor(parser, classLoader); - return result; + return new JavaFileClassDescriptor(parser, classLoader); } finally { @@ -229,12 +227,12 @@ public class ClassDescriptorResolverFromJavaFile extends ClassDescriptorResolver // We could imagine just to offers to the parser a list of namespaces // (for class resolving)... compiler = JAXXFactory.newDummyCompiler(classLoader); - methods = new ArrayList<MethodDescriptor>(); - constructors = new ArrayList<MethodDescriptor>(); + methods = new ArrayList<>(); + constructors = new ArrayList<>(); // declaredMethods = new ArrayList<MethodDescriptor>(); - interfaces = new HashSet<String>(); - fields = new ArrayList<FieldDescriptor>(); - declaredFields = new ArrayList<FieldDescriptor>(); + interfaces = new HashSet<>(); + fields = new ArrayList<>(); + declaredFields = new ArrayList<>(); superclass = Object.class.getName(); } @@ -506,7 +504,7 @@ public class ClassDescriptorResolverFromJavaFile extends ClassDescriptorResolver protected void scanConstructorDeclaration(SimpleNode node) { String name = null; - List<String> parameterTypes = new ArrayList<String>(); + List<String> parameterTypes = new ArrayList<>(); //List<String> parameterNames = new ArrayList<String>(); for (int i = 0; i < node.jjtGetNumChildren(); i++) { SimpleNode child = node.getChild(i); @@ -556,7 +554,7 @@ public class ClassDescriptorResolverFromJavaFile extends ClassDescriptorResolver protected void scanMethodDeclaration(SimpleNode node) { String returnType = null; String name = null; - List<String> parameterTypes = new ArrayList<String>(); + List<String> parameterTypes = new ArrayList<>(); //List<String> parameterNames = new ArrayList<String>(); for (int i = 0; i < node.jjtGetNumChildren(); i++) { SimpleNode child = node.getChild(i); @@ -706,8 +704,7 @@ public class ClassDescriptorResolverFromJavaFile extends ClassDescriptorResolver SimpleNode child = parentNode.getChild(i); if (child.getId() == JavaParserTreeConstants.JJTMODIFIERS) { String modifiersStr = child.getText().trim(); - int modifiers = scanModifiers(modifiersStr); - return modifiers; + return scanModifiers(modifiersStr); } } return 0; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java b/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java index 66e7536..fff0079 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java @@ -89,7 +89,7 @@ public class ClassDescriptorResolverFromJaxxFile extends ClassDescriptorResolver // Anyway, the only reason of finding constructor is when we want to generate a jaxx file // If it inheritate from another jaxx file, we will mkae sure order is ok for this... - List<MethodDescriptor> constructors = new ArrayList<MethodDescriptor>(); + List<MethodDescriptor> constructors = new ArrayList<>(); List<MethodDescriptor> publicMethods = symbolTable.getScriptMethods(); List<FieldDescriptor> publicFields = symbolTable.getScriptFields(); //List<MethodDescriptor> declaredMethods = new ArrayList<MethodDescriptor>(publicMethods); @@ -108,7 +108,7 @@ public class ClassDescriptorResolverFromJaxxFile extends ClassDescriptorResolver fields.remove(); } } - Set<String> interfaces = new HashSet<String>(); + Set<String> interfaces = new HashSet<>(); if (symbolTable.getInterfaces() != null) { // having interfaces for (String anInterface : symbolTable.getInterfaces()) { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java b/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java index 69a972a..5403f8e 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java @@ -256,7 +256,7 @@ public class ScriptManager { } else if (nodeType == JavaParserTreeConstants.JJTMETHODDECLARATION) { String returnType = null; String name = null; - List<String> parameterTypes = new ArrayList<String>(); + List<String> parameterTypes = new ArrayList<>(); //List<String> parameterNames = new ArrayList<String>(); SimpleNode methodDeclaration = node.getChild(0).getChild(1); assert methodDeclaration.getId() == JavaParserTreeConstants.JJTMETHODDECLARATION; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java b/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java index 144e252..ec9b096 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java @@ -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<Element, CompiledObject>(); + protected static Map<Element, CompiledObject> objectMap = new WeakHashMap<>(); public ProxyEventInfo getEventInfo(String memberName) { return eventInfos != null ? eventInfos.get(memberName) : null; @@ -216,14 +216,14 @@ public class DefaultObjectHandler implements TagHandler { JAXXPropertyDescriptor[] propertiesArray = jaxxBeanInfo.getJAXXPropertyDescriptors(); - properties = new HashMap<String, JAXXPropertyDescriptor>(); + properties = new HashMap<>(); for (int i = propertiesArray.length - 1; i >= 0; i--) { properties.put(propertiesArray[i].getName(), propertiesArray[i]); } JAXXEventSetDescriptor[] eventsArray = jaxxBeanInfo.getJAXXEventSetDescriptors(); - events = new HashMap<String, JAXXEventSetDescriptor>(); + events = new HashMap<>(); for (int i = eventsArray.length - 1; i >= 0; i--) { MethodDescriptor[] methods = eventsArray[i].getListenerMethods(); for (MethodDescriptor method : methods) { @@ -454,7 +454,7 @@ public class DefaultObjectHandler implements TagHandler { info.addMethod = addMethod; info.removeMethod = removeMethod; if (eventInfos == null) { - eventInfos = new HashMap<String, ProxyEventInfo>(); + eventInfos = new HashMap<>(); } eventInfos.put(memberName, info); } @@ -570,7 +570,7 @@ public class DefaultObjectHandler implements TagHandler { */ protected void scanAttributesForDependencies(Element tag, JAXXCompiler compiler) { - List<Attr> attributes = new ArrayList<Attr>(); + List<Attr> attributes = new ArrayList<>(); NamedNodeMap children = tag.getAttributes(); for (int i = 0; i < children.getLength(); i++) { attributes.add((Attr) children.item(i)); @@ -615,7 +615,7 @@ public class DefaultObjectHandler implements TagHandler { public void setAttributes(CompiledObject object, Element tag, JAXXCompiler compiler) { - List<Attr> attributes = new ArrayList<Attr>(); + List<Attr> attributes = new ArrayList<>(); NamedNodeMap children = tag.getAttributes(); for (int i = 0; i < children.getLength(); i++) { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/TagManager.java b/jaxx-compiler/src/main/java/jaxx/compiler/tags/TagManager.java index bd8c027..a8b162d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/TagManager.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tags/TagManager.java @@ -48,15 +48,15 @@ public class TagManager { /** Maps simple tag names to their default namespaces (package names). */ private static Map<String, String> defaultNamespaces = - new HashMap<String, String>(); + new HashMap<>(); /** Maps qualified tag names to the TagHandlers responsible for processing them. */ private static Map<QName, TagHandler> registeredTags = - new HashMap<QName, TagHandler>(); + new HashMap<>(); /** Keeps track of whether or not named classes exist. */ private static Map<String, Boolean> classExistenceCache = - new HashMap<String, Boolean>(); + new HashMap<>(); /** * Maps bean classes to their TagHandler classes. The mapping is to @@ -66,7 +66,7 @@ public class TagManager { * creating a new instance of the TagHandler. */ private static ClassMap<Class<? extends TagHandler>> registeredBeans = - new ClassMap<Class<? extends TagHandler>>(); + new ClassMap<>(); // still targeting 1.4, so I can't use javax.xml.namespace.QName @@ -248,8 +248,7 @@ public class TagManager { public static DefaultObjectHandler getTagHandler(Class<?> klass) throws CompilerException { ClassDescriptor beanClass = ClassDescriptorHelper.getClassDescriptor(klass); - DefaultObjectHandler tagHandler = getTagHandler(beanClass); - return tagHandler; + return getTagHandler(beanClass); } /** diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/CompiledItemContainer.java b/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/CompiledItemContainer.java index 06263d7..5f9df6d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/CompiledItemContainer.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/CompiledItemContainer.java @@ -35,9 +35,9 @@ import java.util.Stack; /** Compiled representation of a class that contains Items arranged in a list or tree structure (JComboBox, JList, JTree). */ class CompiledItemContainer extends CompiledObject { - private List<Item> items = new ArrayList<Item>(); + private List<Item> items = new ArrayList<>(); - private Stack<Item> openNodes = new Stack<Item>(); + private 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/jaxx/compiler/tags/swing/TableHandler.java b/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TableHandler.java index 0f2a0ec..5353a38 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TableHandler.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TableHandler.java @@ -80,7 +80,7 @@ public class TableHandler extends DefaultComponentHandler { class CompiledTable extends CompiledObject { - private List<Integer> rowSpans = new ArrayList<Integer>(); + private List<Integer> rowSpans = new ArrayList<>(); private GridBagConstraints tableConstraints; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java b/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java index 7d4f3e2..a2b6676 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java @@ -97,10 +97,10 @@ public class BeanValidatorHandler extends DefaultObjectHandler { static Log log = LogFactory.getLog(BeanValidatorHandler.class); protected static Map<JAXXCompiler, List<CompiledBeanValidator>> validators = - new HashMap<JAXXCompiler, List<CompiledBeanValidator>>(); + new HashMap<>(); protected static Map<JAXXCompiler, List<String>> validatedComponents = - new HashMap<JAXXCompiler, List<String>>(); + new HashMap<>(); public BeanValidatorHandler(ClassDescriptor beanClass) { super(beanClass); @@ -259,7 +259,7 @@ public class BeanValidatorHandler extends DefaultObjectHandler { //super(id, objectClass, compiler); super(id, getDescriptor(objectClass, compiler), compiler); fields = ArrayListMultimap.create(); - excludeFields = new TreeMap<String, String>(); + excludeFields = new TreeMap<>(); if (log.isDebugEnabled()) { log.debug("validator objectClass " + getObjectClass()); } @@ -270,9 +270,7 @@ public class BeanValidatorHandler extends DefaultObjectHandler { JAXXCompiler compiler) { Class<?> validatorClass = SwingValidator.class; // compiler.getConfiguration().getValidatorClass(); - ClassDescriptor result = - ClassDescriptorHelper.getClassDescriptor(validatorClass); - return result; + return ClassDescriptorHelper.getClassDescriptor(validatorClass); } public Multimap<String, String> getFields() { @@ -861,13 +859,13 @@ public class BeanValidatorHandler extends DefaultObjectHandler { CompiledBeanValidator compiledBeanValidator) { List<CompiledBeanValidator> vals = validators.get(compiler); if (vals == null) { - vals = new ArrayList<CompiledBeanValidator>(); + vals = new ArrayList<>(); validators.put(compiler, vals); } vals.add(compiledBeanValidator); List<String> ids = validatedComponents.get(compiler); if (ids == null) { - ids = new ArrayList<String>(); + ids = new ArrayList<>(); validatedComponents.put(compiler, ids); } // ids.addAll(compiledBeanValidator.getFields().values()); diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java b/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java index b392253..56fbdd5 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java @@ -81,7 +81,7 @@ public class GenerateConstructorsTask extends JAXXEngineTask { JAXXCompilerFile[] files = engine.getCompiledFiles(); // to contains all compilers - List<JAXXCompiler> compilers = new ArrayList<JAXXCompiler>(); + List<JAXXCompiler> compilers = new ArrayList<>(); for (JAXXCompilerFile jaxxFile : files) { compilers.add(jaxxFile.getCompiler()); } @@ -332,7 +332,7 @@ public class GenerateConstructorsTask extends JAXXEngineTask { // we already have the good type ??? this is dangerous // because we could miss an import ? must be improved - constructorTypes = new ArrayList<String>(parameterTypes.length); + constructorTypes = new ArrayList<>(parameterTypes.length); for (ClassDescriptor parameterType : parameterTypes) { constructorTypes.add(parameterType.getName()); @@ -361,9 +361,9 @@ public class GenerateConstructorsTask extends JAXXEngineTask { protected List<List<String>> getDeclaredConstructorPrototypes(JAXXCompiler compiler, JavaFile javaFile) throws ClassNotFoundException { List<JavaConstructor> constructors = javaFile.getConstructors(); - List<List<String>> prototypes = new ArrayList<List<String>>(constructors.size()); + List<List<String>> prototypes = new ArrayList<>(constructors.size()); for (JavaConstructor constructor : constructors) { - List<String> prototype = new ArrayList<String>(); + List<String> prototype = new ArrayList<>(); for (JavaArgument argument : constructor.getArguments()) { String type = argument.getType(); String fqn = TagManager.resolveClassName(type, compiler); @@ -381,7 +381,7 @@ public class GenerateConstructorsTask extends JAXXEngineTask { } private List<String> getConstructorTypes(ClassDescriptor... descriptors) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); // add all parameters from constructor for (ClassDescriptor descriptor : descriptors) { String fqn = JAXXCompiler.getCanonicalName(descriptor); diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateTask.java b/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateTask.java index 0c55745..a9d7d6f 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateTask.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateTask.java @@ -146,7 +146,7 @@ public class GenerateTask extends JAXXEngineTask { } List<String> interfaces = f.getInterfaces(); - List<String> interfaces2 = new ArrayList<String>(interfaces.size()); + List<String> interfaces2 = new ArrayList<>(interfaces.size()); for (String anInterface : interfaces) { try { String newInterface = importsManager.getType(anInterface); diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java b/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java index 15906df..feedd6c 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java +++ b/jaxx-compiler/src/main/java/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<ContextNode>(); + private List<ContextNode> arguments = new ArrayList<>(); @Override diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/CapturedObject.java b/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/CapturedObject.java index 0845581..cafb7a9 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/CapturedObject.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/CapturedObject.java @@ -36,13 +36,13 @@ public class CapturedObject extends AbstractContextNode { private ObjectHandler handler; /** Maps children to their constraints. */ - private Map<CapturedObject, ContextNode> children = new LinkedHashMap<CapturedObject, ContextNode>(); + private Map<CapturedObject, ContextNode> children = new LinkedHashMap<>(); private CapturedObject parent; - private Map<String, String> properties = new LinkedHashMap<String, String>(); + private Map<String, String> properties = new LinkedHashMap<>(); - private Map<String, Object> additionalData = new HashMap<String, Object>(); + private Map<String, Object> additionalData = new HashMap<>(); private StringBuilder innerXML = new StringBuilder(); diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java b/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java index ad33438..4aeeb12 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java +++ b/jaxx-compiler/src/main/java/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<Object>(); + private static 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<String, Object>(); + private Map<String, Object> sourceObjects = new HashMap<>(); - private Map<String, CapturedObject> capturedObjects = new HashMap<String, CapturedObject>(); + private Map<String, CapturedObject> capturedObjects = new HashMap<>(); private ClassLoader classLoader; @@ -358,7 +358,7 @@ public class JAXXCapture { Document document = JAXXCompiler.parseDocument(beansXML); Element rootElement = document.getDocumentElement(); NodeList nodes = rootElement.getChildNodes(); - Stack<ContextNode> context = new Stack<ContextNode>(); + Stack<ContextNode> context = new Stack<>(); for (int i = 0; i < nodes.getLength(); i++) { Node child = nodes.item(i); if (child.getNodeType() == Node.ELEMENT_NODE) { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/types/TypeManager.java b/jaxx-compiler/src/main/java/jaxx/compiler/types/TypeManager.java index c559fb5..88e889c 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/types/TypeManager.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/types/TypeManager.java @@ -38,7 +38,7 @@ public class TypeManager { */ public static Map<Class<?>, TypeConverter> getConverters() { if (converters == null) { - converters = new HashMap<Class<?>, TypeConverter>(); + converters = new HashMap<>(); // load converters ServiceLoader<TypeConverter> loader = ServiceLoader.load(TypeConverter.class); diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/binding/JavaParserUtilTest.java b/jaxx-compiler/src/test/java/jaxx/compiler/binding/JavaParserUtilTest.java index 38125c7..4e596f0 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/binding/JavaParserUtilTest.java +++ b/jaxx-compiler/src/test/java/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<SimpleNode, List<SimpleNode>>(); - Map<SimpleNode, List<SimpleNode>> casts = new LinkedHashMap<SimpleNode, List<SimpleNode>>(); - List<SimpleNode> literals = new ArrayList<SimpleNode>(); + Map<SimpleNode, List<SimpleNode>> store = new LinkedHashMap<>(); + Map<SimpleNode, List<SimpleNode>> casts = new LinkedHashMap<>(); + List<SimpleNode> literals = new ArrayList<>(); Set<String> requirements; Iterator<SimpleNode> simpleNodeIterator; Iterator<String> requirementsIterator; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java b/jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java index a364da3..429e255 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java +++ b/jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java @@ -48,7 +48,7 @@ import java.util.List; public class JavaParserTest { public static final List<String> DUMMY_LIST = new ArrayList<>(); - public static final List<String> DUMMY_LIST2 = new ArrayList<String>(); + public static final List<String> DUMMY_LIST2 = new ArrayList<>(); @Test public void testParseClassButNotMethodBody() throws IOException, ClassNotFoundException, NoSuchMethodException { diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java b/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java index 04d9f0c..506fa21 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java +++ b/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java @@ -360,7 +360,7 @@ public class ClassDescriptorResolverFromJavaFileTest { ClassDescriptor[] descriptors = descriptor.getInterfaces(); Assert.assertEquals(interfaces.length, descriptors.length); - List<String> doFind = new ArrayList<String>(); + List<String> doFind = new ArrayList<>(); for (Class<?> anInterface : interfaces) { doFind.add(anInterface.getName()); } diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java b/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java index d9af222..b844fbf 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java +++ b/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java @@ -204,8 +204,8 @@ public class ConfigUIHandler { JButton button = ui.getQuit(); - Action quitAction = new AbstractAction(button.getText(), - button.getIcon()) { + return new AbstractAction(button.getText(), + button.getIcon()) { private static final long serialVersionUID = 1L; @@ -283,7 +283,6 @@ public class ConfigUIHandler { }); } }; - return quitAction; } protected void closeUI(Window parentWindow, ConfigUIModel model) { @@ -386,7 +385,7 @@ public class ConfigUIHandler { Object[] options, int defaultOption) { - int response = JOptionPane.showOptionDialog( + return JOptionPane.showOptionDialog( ui, message, title, @@ -396,8 +395,6 @@ public class ConfigUIHandler { options, options[defaultOption] ); - - return response; } public void setTopContainer(Container topContainer) { diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBacksManager.java b/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBacksManager.java index 0b25848..4a4db2b 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBacksManager.java +++ b/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBacksManager.java @@ -132,8 +132,7 @@ public class CallBacksManager { */ public CallBackMap getCallBacksForSaved(ConfigUIModel model) { - CallBackMap result = getCallBacks(model,true,false); - return result; + return getCallBacks(model, true, false); } /** @@ -144,8 +143,7 @@ public class CallBacksManager { */ public CallBackMap getCallBacksForSaved(CategoryModel category) { - CallBackMap result = getCallBacks(category,true,false); - return result; + return getCallBacks(category, true, false); } /** diff --git a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java b/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java index 5afc02b..75c9219 100644 --- a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java +++ b/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java @@ -113,23 +113,19 @@ public class MyDelegateConfig extends AbstractBean implements Supplier<Applicati } public Locale getLocale() { - Locale result = applicationConfig.getOption(Locale.class, Option.LOCALE.key); - return result; + return applicationConfig.getOption(Locale.class, Option.LOCALE.key); } public Float getFontSize() { - Float result = applicationConfig.getOption(Float.class, Option.FONT_SIZE.key); - return result; + return applicationConfig.getOption(Float.class, Option.FONT_SIZE.key); } public Color getDemoColor() { - Color result = applicationConfig.getOptionAsColor(Option.DEMO_COLOR.key); - return result; + return applicationConfig.getOptionAsColor(Option.DEMO_COLOR.key); } public Class<?> getDemoClass() { - Class<?> result = applicationConfig.getOptionAsClass(Option.DEMO_CLASS.key); - return result; + return applicationConfig.getOptionAsClass(Option.DEMO_CLASS.key); } public void setFullscreen(boolean fullscreen) { diff --git a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java b/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java index 047f118..2a10834 100644 --- a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java +++ b/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java @@ -125,23 +125,19 @@ public class MyInheritedConfig extends ApplicationConfig { } public Locale getLocale() { - Locale result = getOption(Locale.class, Option.LOCALE.key); - return result; + return getOption(Locale.class, Option.LOCALE.key); } public Float getFontSize() { - Float result = getOption(Float.class, Option.FONT_SIZE.key); - return result; + return getOption(Float.class, Option.FONT_SIZE.key); } public Color getDemoColor() { - Color result = getOptionAsColor(Option.DEMO_COLOR.key); - return result; + return getOptionAsColor(Option.DEMO_COLOR.key); } public Class<?> getDemoClass() { - Class<?> result = getOptionAsClass(Option.DEMO_CLASS.key); - return result; + return getOptionAsClass(Option.DEMO_CLASS.key); } public void setFullscreen(boolean fullscreen) { diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java index dd0f01a..9155a94 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java @@ -134,7 +134,7 @@ public abstract class AbstractGenerateHelpMojo extends AbstractJaxxMojo { "You must set the 'outputHelpXXX' property."); } - List<Locale> tmp = new ArrayList<Locale>(); + List<Locale> tmp = new ArrayList<>(); for (String loc : locales.split(",")) { Locale l = I18nUtil.newLocale(loc); tmp.add(l); @@ -234,7 +234,7 @@ public abstract class AbstractGenerateHelpMojo extends AbstractJaxxMojo { protected Set<String> loadHelpIds(File file) throws IOException { BufferedReader reader; - Set<String> result = new HashSet<String>(); + Set<String> result = new HashSet<>(); reader = new BufferedReader(new InputStreamReader( new FileInputStream(file), getEncoding())); try { diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java index 75176ed..c011517 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java @@ -515,9 +515,7 @@ public class GenerateHelpFilesMojo extends AbstractGenerateHelpMojo { if (isVerbose()) { getLog().info("using template " + templateURL); } - VelocityTemplateGenerator gen = - new VelocityTemplateGenerator(getProject(), templateURL); - return gen; + return new VelocityTemplateGenerator(getProject(), templateURL); } } diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java index 0f7f244..4f71664 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java @@ -229,9 +229,7 @@ public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { } Set<String> existingId = p.stringPropertyNames(); - Set<String> newIds = new HashSet<String>(); - - SortedProperties resultProperties = p; + Set<String> newIds = new HashSet<>(); // get all detected ids for (String helpId : helpIds) { @@ -243,7 +241,7 @@ public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { // remove all obsolete ids for (String s : existingId) { if (!newIds.contains(s)) { - resultProperties.remove(s); + p.remove(s); } } @@ -267,14 +265,14 @@ public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { } for (String helpId : newIds) { - if (!resultProperties.containsKey(helpId)) { - resultProperties.put(helpId, ""); + if (!p.containsKey(helpId)) { + p.put(helpId, ""); } } Writer writer = Files.newWriter(inputFile, Charsets.UTF_8); try { - resultProperties.store(writer, "Generated by " + getClass().getName()); + p.store(writer, "Generated by " + getClass().getName()); writer.close(); } finally { Closeables.close(writer, true); diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java index 895c95e..7975951 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java @@ -211,7 +211,7 @@ public class GenerateHelpSearchMojo extends AbstractGenerateHelpMojo { // FileUtils.copyDirectory(source, tmpDir, "**/*", StringUtils.join(DirectoryScanner.DEFAULTEXCLUDES, ",")+",**/*.jpg"); // prepare arguments of Indexer.main calling - List<String> params = new ArrayList<String>(); + List<String> params = new ArrayList<>(); params.add("-verbose"); params.add("-db"); params.add(target.getAbsolutePath()); diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java index 30f7f9e..632a058 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java @@ -402,7 +402,7 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat updater = new JaxxFileUpdater(cssExtension, src, outJava); - Map<File, String[]> result = new HashMap<File, String[]>(); + Map<File, String[]> result = new HashMap<>(); getFilesToTreateForRoots( includes, excludes, @@ -416,7 +416,7 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat // filter css and jaxx files to obtain only jaxx files // if a css is modified, try to find the corresponding jaxx files if (files != null && files.length > 0) { - Set<String> filterFiles = new HashSet<String>(files.length); + Set<String> filterFiles = new HashSet<>(files.length); int cssExtensionLength = cssExtension.length() + 1; for (String path : files) { if (path.endsWith("." + cssExtension)) { diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/NodeItem.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/NodeItem.java index 4615f3e..25b6c30 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/NodeItem.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/NodeItem.java @@ -112,7 +112,7 @@ public class NodeItem { public void addChild(NodeItem child) { if (childs == null) { - childs = new ArrayList<NodeItem>(); + childs = new ArrayList<>(); } childs.add(child); diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/XmlHelper.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/XmlHelper.java index d704b04..f34f07e 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/XmlHelper.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/XmlHelper.java @@ -114,7 +114,7 @@ public class XmlHelper { public NodeItemHandler(String tagName) { this.tagName = tagName; - stack = new Stack<NodeItem>(); + stack = new Stack<>(); } @Override diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/FileChooserUtil.java b/jaxx-runtime/src/main/java/jaxx/runtime/FileChooserUtil.java index 326fa14..d61b2e2 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/FileChooserUtil.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/FileChooserUtil.java @@ -113,8 +113,7 @@ public class FileChooserUtil { * @return le fichier accepté, ou null si rien n'est chois ou l'utilisateur a annulé */ public static File getFile(javax.swing.filechooser.FileFilter... filters) { - File result = getFile(null, filters); - return result; + return getFile(null, filters); } /** @@ -179,8 +178,7 @@ public class FileChooserUtil { */ public static File getFile(Component parent, javax.swing.filechooser.FileFilter... filters) { - File result = getFile("Ok", "Ok", parent, filters); - return result; + return getFile("Ok", "Ok", parent, filters); } /** @@ -322,8 +320,7 @@ public class FileChooserUtil { * null. */ public static String getDirectory(String title, String approvalText) { - String result = getDirectory(null, title, approvalText); - return result; + return getDirectory(null, title, approvalText); } /** diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java b/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java index f5460b8..926ac37 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java @@ -128,16 +128,12 @@ public class JAXXUtil { public static <O> JAXXContextEntryDef<List<O>> newListContextEntryDef( String name) { Class<List<O>> castList = castList(); - JAXXContextEntryDef<List<O>> contextEntryDef = - new JAXXContextEntryDef<List<O>>(name, castList); - return contextEntryDef; + return new JAXXContextEntryDef<List<O>>(name, castList); } public static <K, V> JAXXContextEntryDef<Map<K, V>> newMapContextEntryDef( String name) { - JAXXContextEntryDef<Map<K, V>> contextEntryDef = - new JAXXContextEntryDef<Map<K, V>>(Map.class, name); - return contextEntryDef; + return new JAXXContextEntryDef<Map<K, V>>(Map.class, name); } @SuppressWarnings({"unchecked"}) @@ -644,11 +640,10 @@ public class JAXXUtil { public static <O> O invokeConstructor(Class<O> type, Class<?>[] prototype, Object... parms) throws Exception { - O o = (O) ConstructorUtils.invokeConstructor(type, - parms, - prototype + return (O) ConstructorUtils.invokeConstructor(type, + parms, + prototype ); - return o; } /** diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java b/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java index 98f8fe5..49c9c49 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java @@ -158,8 +158,7 @@ public abstract class DataContext { public <T> T getContextValue(DataContextEntry<T> entry, String key) { String contextKey = getKey(entry, key); - T result = delegate.getContextValue(entry.getKlass(), contextKey); - return result; + return delegate.getContextValue(entry.getKlass(), contextKey); } public void setContextValue(DataContextEntry<?> entry, diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java index c5d3864..51dd52f 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java @@ -446,8 +446,7 @@ public class JaxxDefaultListModel<E> extends AbstractListModel { * @see Vector#toArray() */ public Object[] toArray() { - Object[] rv = delegate.toArray(); - return rv; + return delegate.toArray(); } /** diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java index dcf0c65..1c9710d 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java @@ -885,9 +885,8 @@ public abstract class NavHelper<M, U, B extends NavBridge<M, N>, N extends NavNo // no model return null; } - N result = node.getChild(id, getBridge(), getDataProvider()); - return result; + return node.getChild(id, getBridge(), getDataProvider()); } /** @@ -952,8 +951,7 @@ public abstract class NavHelper<M, U, B extends NavBridge<M, N>, N extends NavNo */ @SuppressWarnings({"unchecked"}) protected N getNode(TreePath path) { - N result = (N) path.getLastPathComponent(); - return result; + return (N) path.getLastPathComponent(); } protected void setUI(U ui) { diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java index eea989d..f0853e0 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java @@ -84,14 +84,12 @@ public class LocaleListCellRenderer extends DefaultListCellRenderer { return null; } synchronized (cache) { - Icon icon = getSafeIcon(locale); - return icon; + return getSafeIcon(locale); } } public String getToolTipText(Locale locale) { - String tip = locale.getDisplayName(Locale.getDefault()); - return tip; + return locale.getDisplayName(Locale.getDefault()); } public boolean isShowText() { @@ -115,8 +113,7 @@ public class LocaleListCellRenderer extends DefaultListCellRenderer { } public String getSafeText(Locale locale) { - String text = locale.getDisplayName(Locale.getDefault()); - return text; + return locale.getDisplayName(Locale.getDefault()); } public synchronized Icon getSafeIcon(Locale locale) { diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java index f40f6fa..49a5c0c 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java @@ -81,8 +81,7 @@ public class MultiDecoratorListCellRenderer implements ListCellRenderer { value = d.toString(value); } } - Component component = delegate.getListCellRendererComponent( + return delegate.getListCellRendererComponent( list, value, index, isSelected, cellHasFocus); - return component; } } diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java index 8f55ce0..86bb4c3 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java @@ -121,8 +121,7 @@ public class SwingSession { */ @Deprecated public static SwingSession newSession(File file, boolean autoSave) { - SwingSession swingSession = newSession(file, autoSave, Maps.<Class, State>newHashMap()); - return swingSession; + return newSession(file, autoSave, Maps.<Class, State>newHashMap()); } /** diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java index 5e05ad2..113bbb7 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java @@ -148,8 +148,7 @@ public abstract class WizardModel<E extends WizardStep> { } public int getStepIndex(E s) { - int index = steps.indexOf(s); - return index; + return steps.indexOf(s); } public boolean isValidStep() { @@ -157,8 +156,7 @@ public abstract class WizardModel<E extends WizardStep> { } public E getPreviousStep() { - E e = getPreviousStep(step); - return e; + return getPreviousStep(step); } public E getPreviousStep(E step) { @@ -270,8 +268,7 @@ public abstract class WizardModel<E extends WizardStep> { // pas de validation quand aucune etape n'est sélectionnée return; } - boolean validate = validate(step); - validStep = validate; + validStep = validate(step); // toujours forcer la propagation firePropertyChange(VALID_STEP_PROPERTY_NAME, null, validStep); } diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java index de8c787..6e3b96a 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java @@ -188,12 +188,11 @@ public abstract class WizardUILancher<E extends WizardStep, M extends WizardMode // instanciate ui - UI newUI = JAXXUtil.invokeConstructor( + return JAXXUtil.invokeConstructor( uiClass, new Class[]{Window.class, JAXXContext.class}, mainUI, uiContext ); - return newUI; } protected UI createUI(JAXXContext context, @@ -237,7 +236,7 @@ public abstract class WizardUILancher<E extends WizardStep, M extends WizardMode }); // instanciate ui - UI newUI = JAXXUtil.invokeConstructor( + return JAXXUtil.invokeConstructor( uiClass, new Class[]{ JAXXContext.class, @@ -247,6 +246,5 @@ public abstract class WizardUILancher<E extends WizardStep, M extends WizardMode }, uiContext, title, tip, icon ); - return newUI; } } diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java index 2c65ce2..93d3ab5 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java +++ b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java @@ -99,22 +99,19 @@ public class SimpleBeanValidatorMessageTableRenderer extends DefaultTableCellRen } public ImageIcon getIcon(NuitonValidatorScope scope) { - ImageIcon icon = SwingValidatorUtil.getIcon(scope); - return icon; + return SwingValidatorUtil.getIcon(scope); } public String getMessage(JTable table, String value, int row) { SimpleBeanValidatorMessageTableModel tableModel = (SimpleBeanValidatorMessageTableModel) table.getModel(); SimpleBeanValidatorMessage model = tableModel.getRow(row); - String text = SwingValidatorUtil.getMessage(model); - return text; + return SwingValidatorUtil.getMessage(model); } public String getFieldName(JTable table, String value, int row) { SimpleBeanValidatorMessageTableModel tableModel = (SimpleBeanValidatorMessageTableModel) table.getModel(); - String fieldName = value; - return fieldName; + return value; } } diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidator.java b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidator.java index 36c1d03..c2f00a5 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidator.java +++ b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidator.java @@ -66,12 +66,11 @@ public class SwingListValidator<B> extends BeanListValidator<B> { String providerName = NuitonValidatorFactory.getDefaultProviderName(); // get the bean validator with this provider - SwingListValidator<O> beanValidator = newSwingValidator(providerName, - type, - context, - scopes + return newSwingValidator(providerName, + type, + context, + scopes ); - return beanValidator; } /** @@ -105,11 +104,10 @@ public class SwingListValidator<B> extends BeanListValidator<B> { "Could not find provider with name " + providerName); // create the new instance of bean validator - SwingListValidator<O> validator = new SwingListValidator<O>( + + return new SwingListValidator<O>( provider, type, context, scopes ); - - return validator; } protected JComponent editor; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java index 742ea15..868b206 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java +++ b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java @@ -102,32 +102,28 @@ public class SwingListValidatorMessageTableRenderer extends DefaultTableCellRend } public ImageIcon getIcon(NuitonValidatorScope scope) { - ImageIcon icon = SwingValidatorUtil.getIcon(scope); - return icon; + return SwingValidatorUtil.getIcon(scope); } public String getMessage(JTable table, String value, int row) { SwingListValidatorMessageTableModel tableModel = (SwingListValidatorMessageTableModel) table.getModel(); SwingListValidatorMessage model = tableModel.getRow(row); - String text = SwingValidatorUtil.getMessage(model); - return text; + return SwingValidatorUtil.getMessage(model); } public String getFieldName(JTable table, String value, int row) { SwingListValidatorMessageTableModel tableModel = (SwingListValidatorMessageTableModel) table.getModel(); SwingListValidatorMessage model = tableModel.getRow(row); - String fieldName = SwingValidatorUtil.getFieldName(model, value); - return fieldName; + return SwingValidatorUtil.getFieldName(model, value); } public String getBeanValue(JTable table, int row) { SwingListValidatorMessageTableModel tableModel = (SwingListValidatorMessageTableModel) table.getModel(); SwingListValidatorMessage model = tableModel.getRow(row); - String text = decorateBean(model.getBean()); - return text; + return decorateBean(model.getBean()); } protected String decorateBean(Object bean) { diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java index f88bd99..3f2bcc2 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java +++ b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java @@ -153,12 +153,11 @@ public class SwingValidator<B> extends SimpleBeanValidator<B> { String providerName = NuitonValidatorFactory.getDefaultProviderName(); // get the bean validator with this provider - SwingValidator<O> beanValidator = newValidator(providerName, - type, - context, - scopes + return newValidator(providerName, + type, + context, + scopes ); - return beanValidator; } /** @@ -194,10 +193,9 @@ public class SwingValidator<B> extends SimpleBeanValidator<B> { "Could not find provider with name " + providerName); // create the new instance of bean validator - SwingValidator<O> validator = new SwingValidator<O>( - provider, type, context, scopes); - return validator; + return new SwingValidator<O>( + provider, type, context, scopes); } /** diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java index 56b17cb..f419a81 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java +++ b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java @@ -111,13 +111,11 @@ public class SwingValidatorMessageListRenderer extends DefaultListCellRenderer { } public ImageIcon getIcon(NuitonValidatorScope scope) { - ImageIcon icon = SwingValidatorUtil.getIcon(scope); - return icon; + return SwingValidatorUtil.getIcon(scope); } public String getMessage(SwingValidatorMessage model) { - String text = SwingValidatorUtil.getMessage(model); - return text; + return SwingValidatorUtil.getMessage(model); } public String getFieldName(JList list, String value, int row) { @@ -125,7 +123,6 @@ public class SwingValidatorMessageListRenderer extends DefaultListCellRenderer { (SwingValidatorMessageListModel) list.getModel(); SwingValidatorMessage model = (SwingValidatorMessage) tableModel.getElementAt(row); - String fieldName = SwingValidatorUtil.getFieldName(model, value); - return fieldName; + return SwingValidatorUtil.getFieldName(model, value); } } diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java index bd86741..91cbfba 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java +++ b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java @@ -98,23 +98,20 @@ public class SwingValidatorMessageTableRenderer extends DefaultTableCellRenderer } public ImageIcon getIcon(NuitonValidatorScope scope) { - ImageIcon icon = SwingValidatorUtil.getIcon(scope); - return icon; + return SwingValidatorUtil.getIcon(scope); } public String getMessage(JTable table, String value, int row) { SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel(); SwingValidatorMessage model = tableModel.getRow(row); - String text = SwingValidatorUtil.getMessage(model); - return text; + return SwingValidatorUtil.getMessage(model); } public String getFieldName(JTable table, String value, int row) { SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel(); SwingValidatorMessage model = tableModel.getRow(row); - String fieldName = SwingValidatorUtil.getFieldName(model, value); - return fieldName; + return SwingValidatorUtil.getFieldName(model, value); } } diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java index afcd1c9..8939f71 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java +++ b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java @@ -97,13 +97,11 @@ public class SwingValidatorUtil extends SimpleBeanValidators { } public static Color getColor(NuitonValidatorScope scope) { - Color c = scope == null ? null : getColors().get(scope); - return c; + return scope == null ? null : getColors().get(scope); } public static ImageIcon getIcon(NuitonValidatorScope scope) { - ImageIcon icon = scope == null ? null : getIcons().get(scope); - return icon; + return scope == null ? null : getIcons().get(scope); } public static ImageIcon getFatalIcon() { @@ -134,9 +132,7 @@ public class SwingValidatorUtil extends SimpleBeanValidators { // // set the swing bean validator creator // BeanValidatorFactory.setCreator(new DefaultSwingValidatorCreator()); // } - SwingValidator<O> validator = - SwingValidator.newValidator(type, context); - return validator; + return SwingValidator.newValidator(type, context); } /** diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java index 7dfb2c1..ccc7ca6 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java +++ b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java @@ -95,8 +95,7 @@ public abstract class AbstractBeanValidatorUI extends AbstractLayerUI<JComponent scopes.add(scope); } } - NuitonValidatorScope result = scopes.isEmpty() ? null : Ordering.natural().max(scopes); - return result; + return scopes.isEmpty() ? null : Ordering.natural().max(scopes); } diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java index 1f05c3d..28c5cdc 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java +++ b/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java @@ -132,49 +132,40 @@ public class UnifiedValidatorMessageTableRenderer extends DefaultTableCellRender } public ImageIcon getIcon(int row, NuitonValidatorScope scope) { - ImageIcon icon = SwingValidatorUtil.getIcon(scope); - return icon; + return SwingValidatorUtil.getIcon(scope); } public String getIconTip(int row, NuitonValidatorScope scope) { String label = t(scope.getLabel()); - String toolTipText = t("validator.scope.tip", label); - return toolTipText; + return t("validator.scope.tip", label); } public String getMessage(int row, UnifiedValidatorMessage model) { - String text = SwingValidatorUtil.getMessage(model); - return text; + return SwingValidatorUtil.getMessage(model); } public String getMessageTip(int row, String message) { - String tip = t("validator.message.tip", message); - return tip; + return t("validator.message.tip", message); } public String getFieldName(int row, UnifiedValidatorMessage model, String value) { - String fieldName = SwingValidatorUtil.getFieldName(model, value, fieldNameMap.get(value)); - return fieldName; + return SwingValidatorUtil.getFieldName(model, value, fieldNameMap.get(value)); } public String getFieldNameTip(int row, String fieldName) { - String tip = t("validator.field.tip", fieldName); - return tip; + return t("validator.field.tip", fieldName); } public String getListBeanValidatorValue(int row, UnifiedValidatorMessage model) { - String text = decorateBean(model.getBean()); - return text; + return decorateBean(model.getBean()); } public String getListBeanValidatorValueTip(int row, String beanValue) { - String text = StringUtils.isEmpty(beanValue) ? null : t("validator.bean.tip", row, beanValue); - return text; + return StringUtils.isEmpty(beanValue) ? null : t("validator.bean.tip", row, beanValue); } public String getSimpleBeanValidatorValue(int row, UnifiedValidatorMessage model) { - String text = decorateBean(((SimpleBeanValidator) model.getValidator()).getBean()); - return text; + return decorateBean(((SimpleBeanValidator) model.getValidator()).getBean()); } public String getSimpleBeanValidatorValueTip(int row, String simpleBeanValue) { diff --git a/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/jformattedtextfield/JFormatterTextFieldInternalGroups.java b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/jformattedtextfield/JFormatterTextFieldInternalGroups.java index 4a6cb60..70da9dd 100644 --- a/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/jformattedtextfield/JFormatterTextFieldInternalGroups.java +++ b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/jformattedtextfield/JFormatterTextFieldInternalGroups.java @@ -75,8 +75,7 @@ public class JFormatterTextFieldInternalGroups implements Iterable<JFormatterTex } - JFormatterTextFieldInternalGroups result = new JFormatterTextFieldInternalGroups(groups); - return result; + return new JFormatterTextFieldInternalGroups(groups); } diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java index e97cd7f..97a2f29 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java @@ -173,10 +173,8 @@ public class DateTimeEditorHandler implements UIHandler<DateTimeEditor> { } // by default stay on same hour - int hour = newHour; // by default, use the new minute data - int minute = oldMinute; if (log.isDebugEnabled()) { log.debug("hh:mm (old from dateModel) = " + oldHour + ":" + oldMinute); @@ -214,7 +212,7 @@ public class DateTimeEditorHandler implements UIHandler<DateTimeEditor> { } // change time - model.setTimeInMinutes(hour * 60 + minute); + model.setTimeInMinutes(newHour * 60 + oldMinute); } @@ -248,7 +246,6 @@ public class DateTimeEditorHandler implements UIHandler<DateTimeEditor> { int hour = oldHour; // by default, use the new minute data - int minute = newMinute; if (log.isDebugEnabled()) { log.debug("hh:mm (old from dateModel) = " + oldHour + ":" + oldMinute); @@ -307,10 +304,10 @@ public class DateTimeEditorHandler implements UIHandler<DateTimeEditor> { // date has changed if (log.isDebugEnabled()) { - log.debug("Update time model to hh:mm = " + hour + ":" + minute); + log.debug("Update time model to hh:mm = " + hour + ":" + newMinute); } - model.setTimeInMinutes(hour * 60 + minute); + model.setTimeInMinutes(hour * 60 + newMinute); } } 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 592d096..0172d3b 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 @@ -260,8 +260,7 @@ public class DateTimeEditorModel extends AbstractSerializableBean implements Mod Date oldTimeDate = getTimeDate(); Integer oldTimeInMinutes = getTimeInMinutes(); - Date newDate = DateUtil.getDateAndTime(date, timeDate, true, false); - this.date = newDate; + this.date = DateUtil.getDateAndTime(date, timeDate, true, false); fireDate(oldDate); fireTimeDate(oldTimeDate); fireTimeInMinutes(oldTimeInMinutes); @@ -278,8 +277,7 @@ public class DateTimeEditorModel extends AbstractSerializableBean implements Mod Date oldDate = date; Date oldDayDate = getDayDate(); - Date newDate = DateUtil.getDateAndTime(dayDate, date, true, false); - this.date = newDate; + this.date = DateUtil.getDateAndTime(dayDate, date, true, false); fireDate(oldDate); fireDayDate(oldDayDate); diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorHandler.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorHandler.java index 0db83aa..f215103 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorHandler.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorHandler.java @@ -150,10 +150,8 @@ public class TimeEditorHandler implements UIHandler<TimeEditor> { } // by default stay on same hour - int hour = newHour; // by default, use the new minute data - int minute = oldMinute; if (log.isDebugEnabled()) { log.debug("hh:mm (old from dateModel) = " + oldHour + ":" + oldMinute); @@ -161,7 +159,7 @@ public class TimeEditorHandler implements UIHandler<TimeEditor> { } // change time - model.setTimeInMinutes(hour * 60 + minute); + model.setTimeInMinutes(newHour * 60 + oldMinute); } @@ -195,7 +193,6 @@ public class TimeEditorHandler implements UIHandler<TimeEditor> { int hour = oldHour; // by default, use the new minute data - int minute = newMinute; if (log.isDebugEnabled()) { log.debug("hh:mm (old from dateModel) = " + oldHour + ":" + oldMinute); @@ -224,10 +221,10 @@ public class TimeEditorHandler implements UIHandler<TimeEditor> { // time has changed if (log.isDebugEnabled()) { - log.debug("Update time model to hh:mm = " + hour + ":" + minute); + log.debug("Update time model to hh:mm = " + hour + ":" + newMinute); } - model.setTimeInMinutes(hour * 60 + minute); + model.setTimeInMinutes(hour * 60 + newMinute); } } 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 fb2100f..11cef54 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 @@ -208,8 +208,7 @@ public class TimeEditorModel extends AbstractSerializableBean implements ModelTo calendar.set(Calendar.HOUR_OF_DAY, hour); calendar.set(Calendar.MINUTE, minute); - Date newTime = calendar.getTime(); - this.time = newTime; + this.time = calendar.getTime(); } finally { 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 17f7cbd..83ffebc 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 @@ -167,9 +167,8 @@ abstract class DataTipListener extends MouseInputAdapter implements ComponentLis int width = Math.max(cellBounds.width, preferredSize.width); int height = Math.max(cellBounds.height, preferredSize.height); Dimension tipDimension = new Dimension(width, height); - DataTipPopup dataTipPopup = new DataTipPopup(component, dataTipCell, tipPosition, tipDimension); - return dataTipPopup; + return new DataTipPopup(component, dataTipCell, tipPosition, tipDimension); } private boolean isTipShown() { @@ -217,8 +216,7 @@ abstract class DataTipListener extends MouseInputAdapter implements ComponentLis } try { Object pointerInfo = getPointerInfoMethod.invoke(null, NO_ARGUMENTS); - Point mousePosition = (Point) getLocationMethod.invoke(pointerInfo, NO_ARGUMENTS); - return mousePosition; + return (Point) getLocationMethod.invoke(pointerInfo, NO_ARGUMENTS); } catch(IllegalAccessException 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 e5dddd1..fafb739 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 @@ -137,8 +137,7 @@ public class DataTipManager { parentComponent.dispatchEvent(newEvent); // If the datatip has been hidden as a result, then process the exit event, too, so that // e.g. tooltips will hide. - boolean stillVisible = parentComponent != null; - return stillVisible; + return parentComponent != null; } } return false; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/ListDataTipCell.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/ListDataTipCell.java index a57e3bd..98f9be4 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/ListDataTipCell.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/ListDataTipCell.java @@ -45,8 +45,7 @@ class ListDataTipCell implements DataTipCell { } public Rectangle getCellBounds() { - Rectangle cellRect = list.getCellBounds(rowIndex, rowIndex); - return cellRect; + return list.getCellBounds(rowIndex, rowIndex); } public Component getRendererComponent() { @@ -54,8 +53,7 @@ class ListDataTipCell implements DataTipCell { boolean isSelected = list.isSelectedIndex(rowIndex); boolean isFocussed = list.hasFocus() && rowIndex == list.getLeadSelectionIndex(); ListCellRenderer renderer = list.getCellRenderer(); - Component component = renderer.getListCellRendererComponent(list, item, rowIndex, isSelected, isFocussed); - return component; + return renderer.getListCellRendererComponent(list, item, rowIndex, isSelected, isFocussed); } public boolean equals(Object o) { diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TableDataTipCell.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TableDataTipCell.java index 4c92eb0..a2826b0 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TableDataTipCell.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TableDataTipCell.java @@ -48,14 +48,12 @@ class TableDataTipCell implements DataTipCell { } public Rectangle getCellBounds() { - Rectangle cellRect = table.getCellRect(rowIndex, columnIndex, false); - return cellRect; + return table.getCellRect(rowIndex, columnIndex, false); } public Component getRendererComponent() { TableCellRenderer cellRenderer = table.getCellRenderer(rowIndex, columnIndex); - Component component = table.prepareRenderer(cellRenderer, rowIndex, columnIndex); - return component; + return table.prepareRenderer(cellRenderer, rowIndex, columnIndex); } public boolean equals(Object o) { diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TableDataTipListener.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TableDataTipListener.java index 64247b1..645e07e 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TableDataTipListener.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TableDataTipListener.java @@ -42,7 +42,6 @@ class TableDataTipListener extends DataTipListener { if (rowIndex < 0 || columnIndex < 0) { return DataTipCell.NONE; } - TableDataTipCell cellPosition = new TableDataTipCell(table, rowIndex, columnIndex); - return cellPosition; + return new TableDataTipCell(table, rowIndex, columnIndex); } } diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TreeDataTipCell.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TreeDataTipCell.java index eba888a..bc16216 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TreeDataTipCell.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/datatips/TreeDataTipCell.java @@ -52,8 +52,7 @@ class TreeDataTipCell implements DataTipCell { public Rectangle getCellBounds() { TreePath treePath = tree.getPathForRow(rowIndex); - Rectangle cellRect = tree.getPathBounds(treePath); - return cellRect; + return tree.getPathBounds(treePath); } public Component getRendererComponent() { 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 3069875..1968194 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 @@ -162,8 +162,7 @@ public class DefaultEditor extends JPanel implements EditorInterface, @Override public String getText() { - String result = editor.getText(); - return result; + return editor.getText(); } @Override 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 4233ff6..ab00158 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 @@ -479,8 +479,7 @@ public class Editor extends JPanel implements EditorInterface { */ public boolean save() { File file = getOpenedFile(); - boolean result = getCurrentEditor().saveAs(file); - return result; + return getCurrentEditor().saveAs(file); } /** @@ -511,8 +510,7 @@ public class Editor extends JPanel implements EditorInterface { * @return true if currend file is modified */ public boolean isModified() { - boolean result = getCurrentEditor().isModified(); - return result; + return getCurrentEditor().isModified(); } /** @@ -557,8 +555,7 @@ public class Editor extends JPanel implements EditorInterface { * @see EditorInterface#getText() */ public String getText() { - String result = getCurrentEditor().getText(); - return result; + return getCurrentEditor().getText(); } /* 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 b82e236..d279f7f 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 @@ -180,8 +180,7 @@ public class JEditEditor extends JPanel implements EditorInterface, DocumentList @Override public String getText() { - String result = editor.getText(); - return result; + return editor.getText(); } @Override diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/NullEditor.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/NullEditor.java index 09e3f64..3914901 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/NullEditor.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/editor/NullEditor.java @@ -122,8 +122,7 @@ public class NullEditor extends JPanel implements EditorInterface { @Override public String getText() { - String result = ""; - return result; + return ""; } @Override 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 624c1f4..772361e 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 @@ -195,8 +195,7 @@ public class RSyntaxEditor extends JPanel implements EditorInterface, DocumentLi @Override public String getText() { - String result = editor.getText(); - return result; + return editor.getText(); } @Override diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinate.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinate.java index 72babc5..4f4fcf8 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinate.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinate.java @@ -53,8 +53,7 @@ public class DdCoordinate extends AbstractSerializableBean { protected Integer decimal; public static DdCoordinate empty() { - DdCoordinate r = new DdCoordinate(); - return r; + return new DdCoordinate(); } /** @@ -243,18 +242,15 @@ public class DdCoordinate extends AbstractSerializableBean { } public boolean isLatitudeDegreeValid() { - boolean result = isDegreeValid(false); - return result; + return isDegreeValid(false); } public boolean isLongitudeDegreeValid() { - boolean result = isDegreeValid(true); - return result; + return isDegreeValid(true); } public boolean isDecimalValid() { - boolean result = isDecimalNull() || (0 <= decimal && decimal < 1000); - return result; + return isDecimalNull() || (0 <= decimal && decimal < 1000); } @Override diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinate.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinate.java index 56cfe64..6aa47ea 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinate.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinate.java @@ -59,8 +59,7 @@ public class DmdCoordinate extends AbstractSerializableBean { protected Integer decimal; public static DmdCoordinate empty() { - DmdCoordinate r = new DmdCoordinate(); - return r; + return new DmdCoordinate(); } /** @@ -284,13 +283,11 @@ public class DmdCoordinate extends AbstractSerializableBean { } public boolean isLatitudeDegreeValid() { - boolean result = isDegreeValid(false); - return result; + return isDegreeValid(false); } public boolean isLongitudeDegreeValid() { - boolean result = isDegreeValid(true); - return result; + return isDegreeValid(true); } public boolean isMinuteValid() { @@ -308,8 +305,7 @@ public class DmdCoordinate extends AbstractSerializableBean { } public boolean isDecimalValid() { - boolean result = isDecimalNull() || (0 <= decimal && decimal < 100); - return result; + return isDecimalNull() || (0 <= decimal && decimal < 100); } @Override diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinate.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinate.java index dfa00bd..cc3bee5 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinate.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinate.java @@ -60,8 +60,7 @@ public class DmsCoordinate extends AbstractSerializableBean { protected Integer second; public static DmsCoordinate empty() { - DmsCoordinate r = new DmsCoordinate(); - return r; + return new DmsCoordinate(); } /** @@ -314,13 +313,11 @@ public class DmsCoordinate extends AbstractSerializableBean { } public boolean isLatitudeDegreeValid() { - boolean result = isDegreeValid(false); - return result; + return isDegreeValid(false); } public boolean isLongitudeDegreeValid() { - boolean result = isDegreeValid(true); - return result; + return isDegreeValid(true); } public boolean isMinuteValid() { @@ -338,8 +335,7 @@ public class DmsCoordinate extends AbstractSerializableBean { } public boolean isSecondValid() { - boolean result = isSecondNull() || (0 <= second && second < 60); - return result; + return isSecondNull() || (0 <= second && second < 60); } @Override diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorModel.java index 8f54937..ea07b99 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorModel.java @@ -87,8 +87,7 @@ public class AbsoluteDdCoordinateEditorModel extends DdCoordinate { } public String getStringPattern() { - String pattern = COORDINATE_STRING_PATTERN; - return pattern; + return COORDINATE_STRING_PATTERN; } @Override diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorModel.java index 73bba9e..ca1dabf 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorModel.java @@ -103,8 +103,7 @@ public class AbsoluteDmdCoordinateEditorModel extends DmdCoordinate { } public String getStringPattern() { - String pattern = COORDINATE_STRING_PATTERN; - return pattern; + return COORDINATE_STRING_PATTERN; } @Override diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorModel.java index 78a0eee..caefa15 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorModel.java @@ -119,7 +119,6 @@ public class SignedDmdCoordinateEditorModel extends DmdCoordinate { } public String getStringPattern() { - String pattern = COORDINATE_STRING_PATTERN; - return pattern; + return COORDINATE_STRING_PATTERN; } } diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListModel.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListModel.java index 18a83e2..e434c3d 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListModel.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListModel.java @@ -172,8 +172,7 @@ public class FilterableDoubleListModel<O extends Serializable> extends AbstractS public List<O> getSelected() { - List<O> selected = selectedModel.toList(); - return selected; + return selectedModel.toList(); } diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButtonHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButtonHandler.java index ca02362..2f93ab1 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButtonHandler.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButtonHandler.java @@ -78,13 +78,11 @@ public class HidorButtonHandler { } protected String updateToolTipText(boolean c) { - String i = c ? ui.hideTip : ui.showTip; - return i; + return c ? ui.hideTip : ui.showTip; } protected String updateText(boolean c) { - String i = c ? ui.hideText : ui.showText; - return i; + return c ? ui.hideText : ui.showText; } protected Icon updateIcon(boolean c) { diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java index 0630414..d873aed 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java @@ -203,8 +203,7 @@ public class I18nEditorHandler implements PropertyChangeListener, ActionListener protected String getTip(Locale l) { boolean selected = l.equals(ui.selectedLocale); - String tip = selected ? getSelectedTip(l) : getNotSelectedTip(l); - return tip; + return selected ? getSelectedTip(l) : getNotSelectedTip(l); } protected String getSelectedTip(Locale l) { diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java index fb9924e..e679dc9 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java @@ -206,7 +206,6 @@ public class SimpleTimeEditorHandler { int hour = oldHour; // by default, use the new minute data - int minute = newMinute; if (log.isDebugEnabled()) { log.debug("hh:mm (old from dateModel) = " + oldHour + ":" + oldMinute); @@ -254,9 +253,9 @@ public class SimpleTimeEditorHandler { // date has changed if (log.isDebugEnabled()) { - log.debug("Update time model to hh:mm = " + hour + ":" + minute); + log.debug("Update time model to hh:mm = " + hour + ":" + newMinute); } - model.setTimeModel(hour * 60 + minute); + model.setTimeModel(hour * 60 + newMinute); } protected void setDate(Date oldValue, Date newValue) { diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandler.java index a80b3c2..868cc7b 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandler.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandler.java @@ -253,7 +253,6 @@ public class TimeEditorHandler { int hour = oldHour; // by default, use the new minute data - int minute = newMinute; if (log.isDebugEnabled()) { log.debug("hh:mm (old from dateModel) = " + oldHour + ":" + oldMinute); @@ -299,9 +298,9 @@ public class TimeEditorHandler { // date has changed if (log.isDebugEnabled()) { - log.debug("Update time model to hh:mm = " + hour + ":" + minute); + log.debug("Update time model to hh:mm = " + hour + ":" + newMinute); } - getEditor().setTimeModel(hour * 60 + minute); + getEditor().setTimeModel(hour * 60 + newMinute); } protected void setDate(Date oldValue, Date newValue) { diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java index b3e61d0..efa1aa2 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java @@ -205,8 +205,7 @@ public class BeanComboBoxHandler<O> implements PropertyChangeListener { * @since 2.5.9 */ public boolean isEmpty() { - boolean result = CollectionUtils.isEmpty(ui.getData()); - return result; + return CollectionUtils.isEmpty(ui.getData()); } /** diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java index 96361da..7a3cbe9 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java @@ -318,8 +318,7 @@ public class BeanFilterableComboBoxHandler<O> implements PropertyChangeListener * otherwise. */ public boolean isEmpty() { - boolean result = CollectionUtils.isEmpty(ui.getData()); - return result; + return CollectionUtils.isEmpty(ui.getData()); } /** diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinate.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinate.java index 19e98c6..90dd0db 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinate.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinate.java @@ -60,8 +60,7 @@ public class DmdCoordinate extends AbstractSerializableBean { protected Integer decimal; public static DmdCoordinate empty() { - DmdCoordinate r = new DmdCoordinate(); - return r; + return new DmdCoordinate(); } /** @@ -284,13 +283,11 @@ public class DmdCoordinate extends AbstractSerializableBean { } public boolean isLatitudeDegreeValid() { - boolean result = isDegreeValid(false); - return result; + return isDegreeValid(false); } public boolean isLongitudeDegreeValid() { - boolean result = isDegreeValid(true); - return result; + return isDegreeValid(true); } public boolean isMinuteValid() { @@ -308,8 +305,7 @@ public class DmdCoordinate extends AbstractSerializableBean { } public boolean isDecimalValid() { - boolean result = isDecimalNull() || (0 <= decimal && decimal < 100); - return result; + return isDecimalNull() || (0 <= decimal && decimal < 100); } @Override diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorModel.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorModel.java index 1ac212d..beb4bb7 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorModel.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorModel.java @@ -117,7 +117,6 @@ public class DmdCoordinateEditorModel extends DmdCoordinate { } public String getStringPattern() { - String pattern = COORDINATE_STRING_PATTERN; - return pattern; + return COORDINATE_STRING_PATTERN; } } diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinate.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinate.java index d78613f..bdd031e 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinate.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinate.java @@ -60,8 +60,7 @@ public class DmsCoordinate extends AbstractSerializableBean { protected Integer second; public static DmsCoordinate empty() { - DmsCoordinate r = new DmsCoordinate(); - return r; + return new DmsCoordinate(); } /** @@ -313,13 +312,11 @@ public class DmsCoordinate extends AbstractSerializableBean { } public boolean isLatitudeDegreeValid() { - boolean result = isDegreeValid(false); - return result; + return isDegreeValid(false); } public boolean isLongitudeDegreeValid() { - boolean result = isDegreeValid(true); - return result; + return isDegreeValid(true); } public boolean isMinuteValid() { @@ -337,8 +334,7 @@ public class DmsCoordinate extends AbstractSerializableBean { } public boolean isSecondValid() { - boolean result = isSecondNull() || (0 <= second && second < 60); - return result; + return isSecondNull() || (0 <= second && second < 60); } @Override -- 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 722f02bd1e88fb407aa41d4bd5711f0661f32765 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 13 16:40:10 2016 +0200 Quadrant reset is not effective (Fixes #4068) --- .../jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java index a4f2bdc..a29bde4 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java @@ -81,12 +81,9 @@ public class CoordinatesEditorHandler implements UIHandler<CoordinatesEditor> { public void resetQuadrant() { - ui.setQuadrant(null); JAXXButtonGroup quadrantBG = ui.getQuadrantBG(); - quadrantBG.setSelectedValue(null); - quadrantBG.setSelectedButton(null); - + // I don't know why but to reset the buttons, we need to remove them from the button group, quadrantBG.remove(ui.getQuadrant1()); quadrantBG.remove(ui.getQuadrant2()); quadrantBG.remove(ui.getQuadrant3()); @@ -104,6 +101,10 @@ public class CoordinatesEditorHandler implements UIHandler<CoordinatesEditor> { // reset in model at the end ui.setQuadrant(null); + + // reset button group after all + ui.getQuadrantBG().setSelectedValue(null); + } public void init(CoordinatesEditor ui) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.