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 37c7ef87659a5f73ac8d43d951f7f5b3c9b50333 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 30 12:00:51 2016 +0100 [iso] clean code + use some java 7-8 api --- .../jaxx/application/bean/JavaBeanObjectUtil.java | 2 +- .../swing/action/ApplicationActionFactory.java | 4 +- .../swing/action/ApplicationUIAction.java | 2 +- .../ApplicationTableModelValidatorDataLocator.java | 2 +- .../application/swing/table/ColumnIdentifier.java | 6 +-- .../swing/table/MoveToNextEditableCellAction.java | 2 +- .../swing/table/MoveToNextEditableRowAction.java | 2 +- .../table/MoveToPreviousEditableCellAction.java | 2 +- .../table/MoveToPreviousEditableRowAction.java | 2 +- .../java/org/nuiton/jaxx/compiler/IDHelper.java | 12 ------ .../org/nuiton/jaxx/compiler/JAXXCompiler.java | 45 +++------------------- .../org/nuiton/jaxx/compiler/JAXXCompilerFile.java | 12 ------ .../java/org/nuiton/jaxx/compiler/JAXXEngine.java | 28 -------------- .../jaxx/compiler/beans/JAXXIntrospector.java | 2 +- .../java/parser/JavaParserTokenManager.java | 2 +- .../ClassDescriptorResolverFromJaxxFile.java | 8 ++-- .../compiler/tools/jaxxcapture/JAXXCapture.java | 4 +- .../org/nuiton/jaxx/config/ConfigUIHandler.java | 2 +- .../nuiton/jaxx/config/model/CallBackEntry.java | 4 +- .../nuiton/jaxx/config/model/CallBacksManager.java | 4 +- .../nuiton/jaxx/config/model/CategoryModel.java | 8 ++-- .../nuiton/jaxx/config/model/ConfigUIModel.java | 4 +- .../jaxx/config/model/MainCallBackFinalizer.java | 2 +- .../org/nuiton/jaxx/demo/DemoSourcesHandler.java | 4 +- .../jaxx/demo/entities/DemoDataProvider.java | 8 ++-- .../java/org/nuiton/jaxx/demo/entities/Movie.java | 4 +- .../jaxx/demo/feature/nav/NavDemoHandler.java | 4 +- .../nuiton/jaxx/demo/tree/DemoDataProvider.java | 2 +- .../java/org/nuiton/jaxx/runtime/JAXXUtil.java | 28 +++++++------- .../org/nuiton/jaxx/runtime/JaxxFileChooser.java | 6 +-- .../java/org/nuiton/jaxx/runtime/SwingUtil.java | 16 ++++---- .../runtime/context/DefaultApplicationContext.java | 6 +-- .../jaxx/runtime/context/DefaultJAXXContext.java | 4 +- .../org/nuiton/jaxx/runtime/css/Pseudoclasses.java | 6 +-- .../java/org/nuiton/jaxx/runtime/css/Rule.java | 2 +- .../nuiton/jaxx/runtime/swing/BlockingLayerUI.java | 4 +- .../org/nuiton/jaxx/runtime/swing/CardLayout2.java | 2 +- .../nuiton/jaxx/runtime/swing/ComponentMover.java | 2 +- .../jaxx/runtime/swing/ComponentResizer.java | 4 +- .../java/org/nuiton/jaxx/runtime/swing/Item.java | 4 +- .../nuiton/jaxx/runtime/swing/JAXXComboBox.java | 4 +- .../org/nuiton/jaxx/runtime/swing/JAXXList.java | 14 +++---- .../org/nuiton/jaxx/runtime/swing/JAXXTree.java | 8 ++-- .../runtime/swing/application/ActionExecutor.java | 2 +- .../runtime/swing/application/ActionWorker.java | 4 +- .../jaxx/runtime/swing/editor/EnumEditor.java | 6 +-- .../jaxx/runtime/swing/help/JAXXHelpBroker.java | 6 +-- .../model/AbstractGenericListSelectionModel.java | 8 ++-- .../swing/model/JaxxDefaultComboBoxModel.java | 6 +-- .../runtime/swing/model/JaxxDefaultListModel.java | 2 +- .../swing/model/JaxxFilterableComboBoxModel.java | 4 +- .../nuiton/jaxx/runtime/swing/nav/NavHelper.java | 6 +-- .../nav/tree/AbstractNavTreeCellRenderer.java | 2 +- .../jaxx/runtime/swing/nav/tree/NavTreeHelper.java | 4 +- .../swing/nav/treetable/NavTreeTableBridge.java | 2 +- .../swing/nav/treetable/NavTreeTableHelper.java | 4 +- .../swing/nav/treetable/NavTreeTableNode.java | 2 +- .../runtime/swing/renderer/EnumEditorRenderer.java | 2 +- .../swing/renderer/LocaleListCellRenderer.java | 2 +- .../renderer/MultiDecoratorListCellRenderer.java | 4 +- .../renderer/MultiDecoratorTableCelleRenderer.java | 4 +- .../jaxx/runtime/swing/session/JTableState.java | 4 +- .../jaxx/runtime/swing/session/SwingSession.java | 4 +- .../jaxx/runtime/swing/wizard/WizardModel.java | 2 +- .../runtime/swing/wizard/ext/WizardExtModel.java | 4 +- .../SimpleBeanValidatorMessageTableModel.java | 8 ++-- .../jaxx/validator/swing/SwingListValidator.java | 2 +- .../SwingListValidatorHighlightPredicate.java | 2 +- .../swing/SwingListValidatorMessageTableModel.java | 2 +- .../jaxx/validator/swing/SwingValidator.java | 6 +-- .../swing/SwingValidatorMessageListModel.java | 6 +-- .../swing/SwingValidatorMessageTableModel.java | 6 +-- .../jaxx/validator/swing/SwingValidatorUtil.java | 12 +++--- .../jaxx/validator/swing/ui/IconValidationUI.java | 2 +- .../jaxx/validator/swing/ui/ImageValidationUI.java | 2 +- .../swing/unified/UnifiedValidatorMessage.java | 2 +- .../unified/UnifiedValidatorMessageTableModel.java | 4 +- .../swing/unified/UnifiedValidatorMessageUtil.java | 2 +- .../JFormattedTextFieldNavigationManager.java | 2 +- .../JFormatterTextFieldInternalGroups.java | 2 +- .../widgets/datetime/DateTimeEditorHandler.java | 6 +-- .../jaxx/widgets/datetime/TimeEditorHandler.java | 2 +- .../widgets/datetime/TimeSliderInitializer.java | 2 +- .../nuiton/jaxx/widgets/extra/GridFlowLayout.java | 4 +- .../org/nuiton/jaxx/widgets/extra/IconFactory.java | 4 +- .../widgets/extra/XMLGridParseConstraints.java | 6 +-- .../nuiton/jaxx/widgets/extra/editor/Editor.java | 8 ++-- .../jaxx/widgets/extra/tooltip/TipWindow.java | 4 +- .../jaxx/widgets/extra/tree/FilterTreeModel.java | 2 +- .../widgets/gis/MaskFormatterFromConverter.java | 4 +- .../widgets/gis/DmsCoordinateConverterTest.java | 8 ++-- .../jaxx/widgets/number/NumberEditorHandler.java | 4 +- .../select/FilterableDoubleListHandler.java | 8 ++-- .../widgets/select/FilterableDoubleListModel.java | 6 +-- .../nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java | 2 +- .../jaxx/runtime/swing/ListSelectorModel.java | 4 +- .../runtime/swing/editor/TimeEditorHandler.java | 2 +- .../swing/editor/bean/BeanDoubleListModel.java | 10 ++--- .../editor/gis/MaskFormatterFromConverter.java | 4 +- .../runtime/swing/list/ActionCheckListModel.java | 4 +- .../nuiton/jaxx/runtime/swing/list/CheckList.java | 2 +- .../jaxx/runtime/swing/list/CheckListAction.java | 2 +- .../runtime/swing/list/DefaultCheckListModel.java | 8 ++-- .../filter/DefaultFilterableCheckListModel.java | 2 +- .../jaxx/runtime/swing/log/JAXXLog4jAppender.java | 2 +- .../swing/table/filter/AbstractTableFilter.java | 4 +- .../runtime/swing/table/filter/JTableFilter.java | 2 +- .../swing/table/filter/TableFilterColumnPopup.java | 6 +-- .../swing/table/filter/TableFilterState.java | 6 +-- .../editor/gis/DmdCoordinateConverterTest.java | 8 ++-- .../editor/gis/DmsCoordinateConverterTest.java | 8 ++-- 111 files changed, 246 insertions(+), 335 deletions(-) diff --git a/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectUtil.java b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectUtil.java index 05c850d..2ddd259 100644 --- a/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectUtil.java +++ b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/bean/JavaBeanObjectUtil.java @@ -52,7 +52,7 @@ public class JavaBeanObjectUtil { public static void removeAllPropertyChangeListeners(JavaBeanObject bean) { - removePropertyChangeListeners(bean, Predicates.<PropertyChangeListener>alwaysTrue()); + removePropertyChangeListeners(bean, Predicates.alwaysTrue()); } 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 bdeabcc..cea99b0 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 @@ -68,8 +68,8 @@ public class ApplicationActionFactory { A logicAction) { // create ui action - return new ApplicationUIAction<A>(abstractButton, - logicAction); + return new ApplicationUIAction<>(abstractButton, + logicAction); } diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java index 88fddb5..d8b0594 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java @@ -135,7 +135,7 @@ public class ApplicationUIAction<A extends AbstractApplicationAction> extends Ab if (doAction) { final ApplicationActionSwingWorker<A> worker = - new ApplicationActionSwingWorker<A>(action); + new ApplicationActionSwingWorker<>(action); SwingUtilities.invokeLater(new Runnable() { @Override 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 cbea7fc..303328d 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 @@ -39,7 +39,7 @@ import java.io.Serializable; public class ApplicationTableModelValidatorDataLocator<R extends Serializable, T extends AbstractApplicationTableModel<R>> implements SwingListValidatorDataLocator<R> { public static <R extends Serializable, T extends AbstractApplicationTableModel<R>> ApplicationTableModelValidatorDataLocator<R, T> newLocator(Class<R> rowType) { - return new ApplicationTableModelValidatorDataLocator<R, T>(rowType); + return new ApplicationTableModelValidatorDataLocator<>(rowType); } private final Class<R> rowType; diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ColumnIdentifier.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ColumnIdentifier.java index c10c9b7..c1eb021 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ColumnIdentifier.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ColumnIdentifier.java @@ -45,9 +45,9 @@ public class ColumnIdentifier<R> implements Serializable { public static <R> ColumnIdentifier<R> newId(String propertyName, String headerI18nKey, String headerTipI18nKey) { - return new ColumnIdentifier<R>(propertyName, - headerI18nKey, - headerTipI18nKey); + return new ColumnIdentifier<>(propertyName, + headerI18nKey, + headerTipI18nKey); } public static <R> ColumnIdentifier<R> newReadOnlyId(String propertyName, diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToNextEditableCellAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToNextEditableCellAction.java index 0cd0b7d..757b4f2 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToNextEditableCellAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToNextEditableCellAction.java @@ -43,7 +43,7 @@ public class MoveToNextEditableCellAction<M extends AbstractApplicationTableMode LogFactory.getLog(MoveToNextEditableCellAction.class); public static <M extends AbstractApplicationTableModel> MoveToNextEditableCellAction<M> newAction(M model, JTable table) { - return new MoveToNextEditableCellAction<M>(model, table); + return new MoveToNextEditableCellAction<>(model, table); } protected MoveToNextEditableCellAction(M model, JTable table) { diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToNextEditableRowAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToNextEditableRowAction.java index f684e2c..a164214 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToNextEditableRowAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToNextEditableRowAction.java @@ -43,7 +43,7 @@ public class MoveToNextEditableRowAction<M extends AbstractApplicationTableModel LogFactory.getLog(MoveToNextEditableRowAction.class); public static <M extends AbstractApplicationTableModel> MoveToNextEditableRowAction<M> newAction(M model, JTable table) { - return new MoveToNextEditableRowAction<M>(model, table); + return new MoveToNextEditableRowAction<>(model, table); } protected MoveToNextEditableRowAction(M model, JTable table) { diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToPreviousEditableCellAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToPreviousEditableCellAction.java index ede243d..1139f3f 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToPreviousEditableCellAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToPreviousEditableCellAction.java @@ -43,7 +43,7 @@ public class MoveToPreviousEditableCellAction<M extends AbstractApplicationTable LogFactory.getLog(MoveToPreviousEditableCellAction.class); public static <M extends AbstractApplicationTableModel> MoveToPreviousEditableCellAction<M> newAction(M model, JTable table) { - return new MoveToPreviousEditableCellAction<M>(model, table); + return new MoveToPreviousEditableCellAction<>(model, table); } protected MoveToPreviousEditableCellAction(M model, JTable table) { diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToPreviousEditableRowAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToPreviousEditableRowAction.java index 032032d..f61cfa1 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToPreviousEditableRowAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/MoveToPreviousEditableRowAction.java @@ -43,7 +43,7 @@ public class MoveToPreviousEditableRowAction<M extends AbstractApplicationTableM LogFactory.getLog(MoveToPreviousEditableRowAction.class); public static <M extends AbstractApplicationTableModel> MoveToPreviousEditableRowAction<M> newAction(M model, JTable table) { - return new MoveToPreviousEditableRowAction<M>(model, table); + return new MoveToPreviousEditableRowAction<>(model, table); } protected MoveToPreviousEditableRowAction(M model, JTable table) { diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/IDHelper.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/IDHelper.java index 4730858..855e222 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/IDHelper.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/IDHelper.java @@ -86,18 +86,6 @@ public class IDHelper { return result; } - public void revertId(String name) { - if (optimize) { - optimizedAutogenId--; - } else { - name = name.substring(name.lastIndexOf(".") + 1); - Integer integer = autoGenIds.get(name); - if (integer != null) { - autoGenIds.put(name, --integer); - } - } - } - public String getUniqueId(Object object) { String result = uniqueIds.get(object); if (result == null) { diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java index efbdc5b..1fab187 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java @@ -651,8 +651,7 @@ public class JAXXCompiler { } public void compileFirstPass() throws IOException { - InputStream in = new FileInputStream(src); - try { + try (InputStream in = new FileInputStream(src)) { document = parseDocument(in); Element documentElement = document.getDocumentElement(); @@ -703,7 +702,7 @@ public class JAXXCompiler { if (uiHandlerClass != null && !ClassDescriptorHelper.isAssignableFrom(uiHandlerClass, UIHandler.class)) { reportError( "Found a handler " + uiHandlerFullClassName - + " which does not implements " + UIHandler.class.getName()); + + " which does not implements " + UIHandler.class.getName()); uiHandlerClass = null; } } catch (ClassNotFoundException e) { @@ -725,8 +724,6 @@ public class JAXXCompiler { reportError(e.getLineNumber(), "Invalid XML: " + e.getMessage()); } catch (SAXException e) { reportError(null, "Error parsing XML document: " + e); - } finally { - in.close(); } } @@ -1288,12 +1285,6 @@ public class JAXXCompiler { return merged; } - public FieldDescriptor[] getScriptFields() { - List<FieldDescriptor> scriptFields = symbolTable.getScriptFields(); - return scriptFields.toArray( - new FieldDescriptor[scriptFields.size()]); - } - public FieldDescriptor getScriptField(String fieldName) { for (FieldDescriptor f : symbolTable.getScriptFields()) { if (fieldName.equals(f.getName())) { @@ -1563,8 +1554,7 @@ public class JAXXCompiler { return ""; } try { - FileReader in = new FileReader(file); - try { + try (FileReader in = new FileReader(file)) { StringWriter styleBuffer = new StringWriter(); char[] readBuffer = new char[2048]; int c; @@ -1572,8 +1562,6 @@ public class JAXXCompiler { styleBuffer.write(readBuffer, 0, c); } return styleBuffer.toString(); - } finally { - in.close(); } } catch (IOException e) { reportError("Could not read file " + file + " for reason " + @@ -1695,10 +1683,6 @@ public class JAXXCompiler { return javaFile; } - public void preFinalizeCompiler() throws Exception { - - } - public void finalizeCompiler() throws Exception { int dotPos = getOutputClassName().lastIndexOf("."); @@ -1815,11 +1799,8 @@ public class JAXXCompiler { if (dest.exists() && !dest.setLastModified(System.currentTimeMillis())) { log.warn("could not touch file " + dest); } - PrintWriter out = new PrintWriter(new FileWriter(dest)); - try { + try (PrintWriter out = new PrintWriter(new FileWriter(dest))) { generator.generateFile(javaFile, out); - } finally { - out.close(); } } @@ -1937,9 +1918,7 @@ public class JAXXCompiler { SAXParser parser; parser = factory.newSAXParser(); return parser; - } catch (SAXException e) { - throw new RuntimeException(e); - } catch (ParserConfigurationException e) { + } catch (SAXException | ParserConfigurationException e) { throw new RuntimeException(e); } } @@ -2035,10 +2014,6 @@ public class JAXXCompiler { } } -// public void setIdentCssFound(boolean identCssFound) { -// this.identCssFound = identCssFound; -// } - public void setClassLoader(ClassLoader classLoader) { this.classLoader = classLoader; } @@ -2113,16 +2088,6 @@ public class JAXXCompiler { this.needSwingUtil = needSwingUtil; } - public boolean containsScriptField(String fieldName) { - FieldDescriptor[] scriptFields = getScriptFields(); - for (FieldDescriptor f : scriptFields) { - if (fieldName.equals(f.getName())) { - return true; - } - } - return false; - } - protected String uiHandler; public String getUiHandler() { diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompilerFile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompilerFile.java index 8ea5beb..2c96da8 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompilerFile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompilerFile.java @@ -135,18 +135,10 @@ public class JAXXCompilerFile { return basedir; } - public String getRelativePath() { - return relativePath; - } - public JAXXCompiler getCompiler() { return compiler; } -// public SymbolTable getSymbolTable() { -// return compiler==null?null:compiler.getSymbolTable(); -// } - public File getJaxxFile() { if (jaxxFile == null) { jaxxFile = new File(basedir, relativePath); @@ -194,10 +186,6 @@ public class JAXXCompilerFile { } } -// public void setSymbolTable(SymbolTable symbolTable) { -// this.symbolTable = symbolTable; -// } - public void setCompiler(JAXXCompiler compiler) { this.compiler = compiler; } diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java index ed141ab..44a5f59 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java @@ -157,15 +157,6 @@ public class JAXXEngine { return configuration; } - public JAXXCompilerFile[] getIncomingFiles() { - return incomingFiles; - } - -// public JAXXCompilerFile[] getCompilingFiles() { -// return compilingFiles.toArray( -// new JAXXCompilerFile[compilingFiles.size()]); -// } - public JAXXCompilerFile[] getFilesToCompile() { List<JAXXCompilerFile> files = new ArrayList<>(); for (JAXXCompilerFile file : compilingFiles) { @@ -259,22 +250,6 @@ public class JAXXEngine { } /** - * Obtain the symbo table for the given class name. - * - * @param className the name of the class to use - * @return the symbol table for the specified JAXX class. - * Must be called during the second compiler pass. - * Returns <code>null</code> if no such symbol table could be found. - */ - public SymbolTable getSymbolTable(String className) { - JAXXCompiler compiler = getJAXXCompiler(className); - if (compiler == null) { - return null; - } - return compiler.getSymbolTable(); - } - - /** * Obtain the decorator of the given name. * * @param name the name of the decorator @@ -361,9 +336,6 @@ public class JAXXEngine { return success ? compilingFiles.size() : -1; //FIXME : deal better the exception treatment... - } catch (CompilerException e) { - log.error(e.getMessage(), e); - return -1; } catch (Throwable e) { log.error(e.getMessage(), e); return -1; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXIntrospector.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXIntrospector.java index 504962f..92366d1 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXIntrospector.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXIntrospector.java @@ -172,7 +172,7 @@ public class JAXXIntrospector { private static BeanInfo getExplicitBeanInfo(ClassDescriptor classDescriptor) { try { Class<?> beanClass = Class.forName(classDescriptor.getName(), true, classDescriptor.getClassLoader()); // see if there is a class by that name in this package - Method findExplicitBeanInfo = Introspector.class.getDeclaredMethod("findExplicitBeanInfo", new Class[]{Class.class}); + Method findExplicitBeanInfo = Introspector.class.getDeclaredMethod("findExplicitBeanInfo", Class.class); findExplicitBeanInfo.setAccessible(true); return (BeanInfo) findExplicitBeanInfo.invoke(null, beanClass); } catch (ClassNotFoundException e) { diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTokenManager.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTokenManager.java index c19f7a3..a8438d2 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTokenManager.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTokenManager.java @@ -1571,7 +1571,7 @@ public class JavaParserTokenManager implements JavaParserConstants { } } while (i != startsAt); } else { - int hiByte = (int) (curChar >> 8); + int hiByte = curChar >> 8; int i1 = hiByte >> 6; long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java index 653bc23..d7e29e3 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java @@ -21,6 +21,8 @@ */ package org.nuiton.jaxx.compiler.reflect.resolvers; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.compiler.CompilerException; import org.nuiton.jaxx.compiler.JAXXCompiler; import org.nuiton.jaxx.compiler.JAXXEngine; @@ -33,12 +35,9 @@ import org.nuiton.jaxx.compiler.reflect.FieldDescriptor; import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; import org.nuiton.jaxx.runtime.JAXXObject; import org.nuiton.jaxx.runtime.JAXXObjectDescriptor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.lang.reflect.Modifier; import java.net.URL; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; @@ -89,7 +88,6 @@ 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<>(); List<MethodDescriptor> publicMethods = symbolTable.getScriptMethods(); List<FieldDescriptor> publicFields = symbolTable.getScriptFields(); //List<MethodDescriptor> declaredMethods = new ArrayList<MethodDescriptor>(publicMethods); @@ -142,7 +140,7 @@ public class ClassDescriptorResolverFromJaxxFile extends ClassDescriptorResolver packageName, interfaces, classLoader, - constructors.toArray(new MethodDescriptor[constructors.size()]), + new MethodDescriptor[0], publicMethods.toArray(new MethodDescriptor[publicMethods.size()]), publicFields.toArray(new FieldDescriptor[publicFields.size()]) ); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java index 1318f0f..e52eeb1 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java @@ -220,7 +220,7 @@ public class JAXXCapture { // use the package-private class java.beans.ReflectionUtils to resolve the method. This isn't 100% safe, but it's better than // having to rewrite the resolution myself. Class<?> reflectionUtils = Class.forName("java.beans.ReflectionUtils"); - Method getMethod = reflectionUtils.getDeclaredMethod("getMethod", new Class<?>[]{Class.class, String.class, Class[].class}); + Method getMethod = reflectionUtils.getDeclaredMethod("getMethod", Class.class, String.class, Class[].class); getMethod.setAccessible(true); return (Method) getMethod.invoke(null, target, methodName, arguments); } catch (Exception e) { @@ -234,7 +234,7 @@ public class JAXXCapture { // use the package-private class java.beans.ReflectionUtils to resolve the constructor. This isn't 100% safe, but it's better than // having to rewrite the resolution myself. Class<?> reflectionUtils = Class.forName("java.beans.ReflectionUtils"); - Method getConstructor = reflectionUtils.getDeclaredMethod("getConstructor", new Class<?>[]{Class.class, Class[].class}); + Method getConstructor = reflectionUtils.getDeclaredMethod("getConstructor", Class.class, Class[].class); getConstructor.setAccessible(true); return (Constructor<?>) getConstructor.invoke(null, target, arguments); } catch (Exception e) { diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java index 18a2170..1071629 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java @@ -269,7 +269,7 @@ public class ConfigUIHandler { add(ui). add(CALLBACKS_WITH_OPTIONS, forSaved). add(CALLBACKS, - new ArrayList<CallBackEntry>(forSaved.keySet())). + new ArrayList<>(forSaved.keySet())). add(new ConfigCallBackUIHandler()); if (topContainer == null) { diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackEntry.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackEntry.java index fe9564d..9740af5 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackEntry.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBackEntry.java @@ -46,7 +46,7 @@ public class CallBackEntry { Runnable action) { this.description = description; this.icon = icon; - options = new ArrayList<OptionModel>(); + options = new ArrayList<>(); this.name = name; this.action = action; } @@ -69,7 +69,7 @@ public class CallBackEntry { public List<OptionModel> getOptions() { // always send a copy - return new ArrayList<OptionModel>(options); + return new ArrayList<>(options); } protected void addOption(OptionModel option) { diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBacksManager.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBacksManager.java index 231b639..f991989 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBacksManager.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CallBacksManager.java @@ -42,7 +42,7 @@ public class CallBacksManager { protected CallBackFinalizer finalizer; public CallBacksManager() { - callbacks = new ArrayList<CallBackEntry>(); + callbacks = new ArrayList<>(); } /** @@ -204,7 +204,7 @@ public class CallBacksManager { if (callBackEntry != null) { List<OptionModel> models = result.get(callBackEntry); if (models == null) { - models = new ArrayList<OptionModel>(); + models = new ArrayList<>(); result.put(callBackEntry, models); } models.add(optionModel); diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java index 9a2add5..a4464d7 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java @@ -66,7 +66,7 @@ public class CategoryModel implements Iterable<OptionModel>, Serializable { protected CategoryModel(String category, String categoryLabel) { this.category = category; this.categoryLabel = categoryLabel; - entries = new ArrayList<OptionModel>(); + entries = new ArrayList<>(); } protected void addOption(OptionModel option) { @@ -149,7 +149,7 @@ public class CategoryModel implements Iterable<OptionModel>, Serializable { public List<OptionModel> getInvalidOptions() { - List<OptionModel> result = new ArrayList<OptionModel>(); + List<OptionModel> result = new ArrayList<>(); for (OptionModel m : this) { if (!m.isValid()) { result.add(m); @@ -160,7 +160,7 @@ public class CategoryModel implements Iterable<OptionModel>, Serializable { public List<OptionModel> getModifiedOptions() { - List<OptionModel> result = new ArrayList<OptionModel>(); + List<OptionModel> result = new ArrayList<>(); for (OptionModel m : this) { if (m.isModified()) { result.add(m); @@ -170,7 +170,7 @@ public class CategoryModel implements Iterable<OptionModel>, Serializable { } public List<OptionModel> getSavedOptions() { - List<OptionModel> result = new ArrayList<OptionModel>(); + List<OptionModel> result = new ArrayList<>(); for (OptionModel option : this) { if (option.isSaved()) { result.add(option); diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java index 2f0727e..6dad48c 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java @@ -113,7 +113,7 @@ public class ConfigUIModel implements Iterable<CategoryModel> { this.configBean = configBean; this.applicationConfig = applicationConfig; this.configFile = configFile; - categories = new LinkedHashMap<String, CategoryModel>(); + categories = new LinkedHashMap<>(); callBacksManager = new CallBacksManager(); pcs = new PropertyChangeSupport(this); } @@ -259,7 +259,7 @@ public class ConfigUIModel implements Iterable<CategoryModel> { public void saveModified() { // compute transients keys (to never be saved) - List<String> transients = new ArrayList<String>(); + List<String> transients = new ArrayList<>(); applicationConfig.setAdjusting(true); diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/MainCallBackFinalizer.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/MainCallBackFinalizer.java index 3d5754e..37abd30 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/MainCallBackFinalizer.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/MainCallBackFinalizer.java @@ -51,7 +51,7 @@ public class MainCallBackFinalizer implements CallBackFinalizer { } else { newResult = new CallBackMap(); // on passe toutes les options sur ce callback - List<OptionModel> options = new ArrayList<OptionModel>(); + List<OptionModel> options = new ArrayList<>(); for (List<OptionModel> optionModels : result.values()) { options.addAll(optionModels); diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java index d6289e7..299084f 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java @@ -86,7 +86,7 @@ public class DemoSourcesHandler implements UIHandler<DemoSources> { public static Map<String, String> getSourcesCache() { if (sourcesCache == null) { - sourcesCache = new TreeMap<String, String>(); + sourcesCache = new TreeMap<>(); } return sourcesCache; } @@ -173,7 +173,7 @@ public class DemoSourcesHandler implements UIHandler<DemoSources> { return; } - List<String> toFill = new ArrayList<String>(); + List<String> toFill = new ArrayList<>(); String prefix = ui.getIncomingClass() == null ? "" : ui.getIncomingClass().getPackage().getName() + ""; for (String source : sources) { diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java index 3bf5456..7d12993 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java @@ -46,8 +46,8 @@ public class DemoDataProvider implements NavDataProvider { public DemoDataProvider() { - movies = new HashMap<String, Movie>(); - peoples = new HashMap<String, People>(); + movies = new HashMap<>(); + peoples = new HashMap<>(); if (log.isDebugEnabled()) { log.debug("for " + this); @@ -91,11 +91,11 @@ public class DemoDataProvider implements NavDataProvider { } public List<Movie> getMovies() { - return new ArrayList<Movie>(movies.values()); + return new ArrayList<>(movies.values()); } public List<People> getPeoples() { - return new ArrayList<People>(peoples.values()); + return new ArrayList<>(peoples.values()); } public List<People> getPeoples(Movie m) { diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Movie.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Movie.java index 7355700..5f68e40 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Movie.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/Movie.java @@ -63,11 +63,11 @@ public class Movie extends AbstractDemoBean { super(id, image); this.title = title; this.year = year; - actors = new ArrayList<People>(); + actors = new ArrayList<>(); } public Movie() { - actors = new ArrayList<People>(); + actors = new ArrayList<>(); } public List<People> getActors() { diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java index d9c86b5..a89ed44 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java @@ -167,7 +167,7 @@ public class NavDemoHandler implements UIHandler<NavDemo> { contentUI.getContextValue(DecoratorProvider.class); JXPathDecorator<Movie> decorator = (JXPathDecorator<Movie>) provider.getDecoratorByType(Movie.class); - contentUI.getListHeader().init(decorator, new ArrayList<Movie>()); + contentUI.getListHeader().init(decorator, new ArrayList<>()); } public void initUI(ActorsContentUI contentUI) { @@ -175,7 +175,7 @@ public class NavDemoHandler implements UIHandler<NavDemo> { contentUI.getContextValue(DecoratorProvider.class); JXPathDecorator<People> decorator = (JXPathDecorator<People>) provider.getDecoratorByType(People.class); - contentUI.getListHeader().init(decorator, new ArrayList<People>()); + contentUI.getListHeader().init(decorator, new ArrayList<>()); } public void selectChild(AbstractContentUI<?> contentUI, diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java index cf18879..324baf3 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java @@ -93,7 +93,7 @@ public class DemoDataProvider implements NavDataProvider { public DemoDataProvider() { - mapping = new HashMap<String, List<Object>>(); + mapping = new HashMap<>(); if (log.isDebugEnabled()) { log.debug("for " + this); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXUtil.java index 4feb5b4..d4b03cd 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXUtil.java @@ -59,10 +59,10 @@ public class JAXXUtil { // Maps root objects to lists of event listeners private static Map<Object, WeakReference<List<EventListenerDescriptor>>> - eventListeners = new WeakHashMap<Object, WeakReference<List<EventListenerDescriptor>>>(); + eventListeners = new WeakHashMap<>(); private static Map<JAXXObject, WeakReference<List<DataBindingUpdateListener>>> - dataBindingUpdateListeners = new WeakHashMap<JAXXObject, WeakReference<List<DataBindingUpdateListener>>>(); + dataBindingUpdateListeners = new WeakHashMap<>(); private static final PropertyChangeListener[] EMPTY_ARRAY_PROPERTY_CHANGE_LISTENERS = new PropertyChangeListener[0]; @@ -118,7 +118,7 @@ public class JAXXUtil { public static <O> JAXXContextEntryDef<O> newContextEntryDef( String name, Class<?> klass) { - return new JAXXContextEntryDef<O>(name, (Class<O>) klass); + return new JAXXContextEntryDef<>(name, (Class<O>) klass); } public static <O> JAXXContextEntryDef<List<O>> newListContextEntryDef() { @@ -128,12 +128,12 @@ public class JAXXUtil { public static <O> JAXXContextEntryDef<List<O>> newListContextEntryDef( String name) { Class<List<O>> castList = castList(); - return new JAXXContextEntryDef<List<O>>(name, castList); + return new JAXXContextEntryDef<>(name, castList); } public static <K, V> JAXXContextEntryDef<Map<K, V>> newMapContextEntryDef( String name) { - return new JAXXContextEntryDef<Map<K, V>>(Map.class, name); + return new JAXXContextEntryDef<>(Map.class, name); } @SuppressWarnings({"unchecked"}) @@ -177,10 +177,10 @@ public class JAXXUtil { List<EventListenerDescriptor> descriptors = ref != null ? ref.get() : null; if (descriptors == null) { - descriptors = new ArrayList<EventListenerDescriptor>(); + descriptors = new ArrayList<>(); eventListeners.put( methodContainer, - new WeakReference<List<EventListenerDescriptor>>( + new WeakReference<>( descriptors)); } else { for (EventListenerDescriptor descriptor : descriptors) { @@ -294,10 +294,10 @@ public class JAXXUtil { List<DataBindingUpdateListener> listeners = ref == null ? null : ref.get(); if (listeners == null) { - listeners = new ArrayList<DataBindingUpdateListener>(); + listeners = new ArrayList<>(); dataBindingUpdateListeners.put( object, - new WeakReference<List<DataBindingUpdateListener>>( + new WeakReference<>( listeners)); } else { for (DataBindingUpdateListener listener : listeners) { @@ -597,7 +597,7 @@ public class JAXXUtil { List<String> pNames = Arrays.asList(propertyNames); List<PropertyChangeListener> toRemove = - new ArrayList<PropertyChangeListener>(); + new ArrayList<>(); for (PropertyChangeListener listener : listeners) { String pName = null; @@ -608,7 +608,7 @@ public class JAXXUtil { // not on the good property continue; } - listener = (PropertyChangeListener) plistener.getListener(); + listener = plistener.getListener(); pName = plistener.getPropertyName(); } if (plistener != null && @@ -640,9 +640,9 @@ public class JAXXUtil { public static <O> O invokeConstructor(Class<O> type, Class<?>[] prototype, Object... parms) throws Exception { - return (O) ConstructorUtils.invokeConstructor(type, - parms, - prototype + return ConstructorUtils.invokeConstructor(type, + parms, + prototype ); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java index f022b00..e0c1811 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java @@ -233,7 +233,7 @@ public class JaxxFileChooser { @Override public FileChooserBuilderImpl setPatternOrDescriptionFilters(String pattern, String description, String... patternOrDescriptionFilters) { - List<String> r = new ArrayList<String>(); + List<String> r = new ArrayList<>(); r.add(pattern); r.add(description); r.addAll(Arrays.asList(patternOrDescriptionFilters)); @@ -245,7 +245,7 @@ public class JaxxFileChooser { public FileChooserBuilderImpl setPatternOrDescriptionFilters(List<String> patternOrDescriptionFilters) { - List<FileFilter> r = new ArrayList<FileFilter>(); + List<FileFilter> r = new ArrayList<>(); if (patternOrDescriptionFilters.size() % 2 != 0) { throw new IllegalArgumentException( "Arguments must be (pattern, description) couple"); @@ -262,7 +262,7 @@ public class JaxxFileChooser { @Override public FileChooserBuilderImpl setFileFilters(FileFilter fileFilter, FileFilter... fileFilters) { - List<FileFilter> r = new ArrayList<FileFilter>(); + List<FileFilter> r = new ArrayList<>(); r.add(fileFilter); r.addAll(Arrays.asList(fileFilters)); return setFileFilters(r); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java index 3554caa..52a3ac1 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java @@ -212,7 +212,7 @@ public class SwingUtil extends JAXXUtil { model.removeListDataListener(combo); // set data - model.setAllElements((Collection) data); + model.setAllElements(data); // attach the model model.addListDataListener(combo); @@ -292,7 +292,7 @@ public class SwingUtil extends JAXXUtil { public static void fillComboBox(JAXXComboBox combo, Collection<?> data, Object select, boolean firstNull) { - List<Item> items = new ArrayList<Item>(); + List<Item> items = new ArrayList<>(); if (firstNull) { items.add(new Item("null", " ", null, false)); } @@ -462,13 +462,13 @@ public class SwingUtil extends JAXXUtil { if (layer != null) { return layer; } - layer = new JXLayer<V>(); + layer = new JXLayer<>(); layer.setView(component); return layer; } public static List<JComponent> getLayeredComponents(JAXXObject object) { - List<JComponent> result = new ArrayList<JComponent>(); + List<JComponent> result = new ArrayList<>(); for (Entry<String, Object> child : object.get$objectMap().entrySet()) { if (child.getValue() == null) { log.warn("find a null object in $objectMap " + child.getKey()); @@ -516,12 +516,12 @@ public class SwingUtil extends JAXXUtil { public static Map<String, JComponent> lookingForEditor( Class<?> clazz, Container container) { - Map<String, JComponent> result = new HashMap<String, JComponent>(); + Map<String, JComponent> result = new HashMap<>(); try { // looking for all component with name set Map<String, JComponent> allNamedComponent = - new HashMap<String, JComponent>(); - List<Container> todo = new LinkedList<Container>(); + new HashMap<>(); + List<Container> todo = new LinkedList<>(); todo.add(container); while (todo.size() > 0) { for (ListIterator<Container> i = todo.listIterator(); @@ -1053,7 +1053,7 @@ public class SwingUtil extends JAXXUtil { public static <E extends Enum<E>> EnumTableCellRenderer<E> newEnumTableCellRenderer(TableCellRenderer renderer, Class<E> enumClass) { - return new EnumTableCellRenderer<E>(renderer, enumClass); + return new EnumTableCellRenderer<>(renderer, enumClass); } /** diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContext.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContext.java index da14046..c2e807b 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContext.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContext.java @@ -110,7 +110,7 @@ public class DefaultApplicationContext extends DefaultJAXXContext { protected Map<JAXXContextEntryDef<?>, String> entryListened; public DefaultApplicationContext() { - forwards = new HashMap<Class<?>, Class<?>>(); + forwards = new HashMap<>(); pcs = new PropertyChangeSupport(this); } @@ -265,7 +265,7 @@ public class DefaultApplicationContext extends DefaultJAXXContext { String name, PropertyChangeListener listener) { if (entryListened == null) { - entryListened = new HashMap<JAXXContextEntryDef<?>, String>(); + entryListened = new HashMap<>(); } entryListened.put(entry, name); if (log.isDebugEnabled()) { @@ -286,7 +286,7 @@ public class DefaultApplicationContext extends DefaultJAXXContext { String name, PropertyChangeListener listener) { if (entryListened == null) { - entryListened = new HashMap<JAXXContextEntryDef<?>, String>(); + entryListened = new HashMap<>(); } entryListened.remove(entry); pcs.removePropertyChangeListener(name, listener); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultJAXXContext.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultJAXXContext.java index 5b71957..07009f6 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultJAXXContext.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultJAXXContext.java @@ -64,7 +64,7 @@ public class DefaultJAXXContext implements JAXXContext { protected final Map<JAXXContextEntryDef<?>, Object> data; public DefaultJAXXContext() { - data = new HashMap<JAXXContextEntryDef<?>, Object>(); + data = new HashMap<>(); } @Override @@ -144,7 +144,7 @@ public class DefaultJAXXContext implements JAXXContext { * @since 1.3 */ public String[] getKeys(Class<?> klass) { - List<String> keys = new ArrayList<String>(); + List<String> keys = new ArrayList<>(); for (JAXXContextEntryDef<?> key : data.keySet()) { if (key.getKlass().equals(klass)) { keys.add(key.getName()); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Pseudoclasses.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Pseudoclasses.java index b2ea026..88afe7e 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Pseudoclasses.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Pseudoclasses.java @@ -34,7 +34,7 @@ public class Pseudoclasses { public static final String NO_PSEUDOCLASS = "no pseudoclass"; - private static Map<Object, Map<String, List<PropertyValue>>> properties = new WeakHashMap<Object, Map<String, List<PropertyValue>>>(); + private static Map<Object, Map<String, List<PropertyValue>>> properties = new WeakHashMap<>(); private static class PropertyValue implements Comparable<PropertyValue> { @@ -89,13 +89,13 @@ public class Pseudoclasses { private static List<PropertyValue> getPropertyList(Object object, String property) { Map<String, List<PropertyValue>> propertyMap = properties.get(object); if (propertyMap == null) { - propertyMap = new HashMap<String, List<PropertyValue>>(); + propertyMap = new HashMap<>(); properties.put(object, propertyMap); } List<PropertyValue> propertyList = propertyMap.get(property); if (propertyList == null) { - propertyList = new ArrayList<PropertyValue>(); + propertyList = new ArrayList<>(); propertyMap.put(property, propertyList); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Rule.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Rule.java index 41b7b9f..dbc1b8e 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Rule.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Rule.java @@ -44,7 +44,7 @@ public class Rule implements java.io.Serializable, Comparable<Rule> { public Rule(Selector[] selectors, String[] keys, String[] values) { this.selectors = selectors; java.util.Arrays.sort(selectors); - this.properties = new java.util.HashMap<String, String>(); + this.properties = new java.util.HashMap<>(); if (keys.length != values.length) { throw new IllegalArgumentException("keys and values must have the same number of entries"); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/BlockingLayerUI.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/BlockingLayerUI.java index bd32214..51b921a 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/BlockingLayerUI.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/BlockingLayerUI.java @@ -104,8 +104,8 @@ public class BlockingLayerUI extends AbstractLayerUI<JComponent> { protected final Set<Class<?>> acceptedComponentTypes; public BlockingLayerUI() { - acceptedComponentNames = new HashSet<String>(); - acceptedComponentTypes = new HashSet<Class<?>>(); + acceptedComponentNames = new HashSet<>(); + acceptedComponentTypes = new HashSet<>(); } public void setAcceptedComponentNames(String... acceptedComponentNames) { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2.java index 7b01b64..14df9ca 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2.java @@ -55,7 +55,7 @@ public class CardLayout2 extends CardLayout { private static final long serialVersionUID = 1L; /** list of already loaded context (since the {@link #vector} attribute is package visible... */ - protected List<Serializable> contexts = new LinkedList<Serializable>(); + protected List<Serializable> contexts = new LinkedList<>(); /** * A flag to compute dimension only on visible component. diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentMover.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentMover.java index 120052e..94a6b23 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentMover.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentMover.java @@ -371,7 +371,7 @@ public class ComponentMover extends MouseAdapter { if (autoLayout) { if (destination instanceof JComponent) { - ((JComponent) destination).revalidate(); + destination.revalidate(); } else { destination.validate(); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentResizer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentResizer.java index e2254de..19c8eff 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentResizer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentResizer.java @@ -55,7 +55,7 @@ public class ComponentResizer extends MouseAdapter { private final static Dimension MAXIMUM_SIZE = new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE); - private static Map<Integer, Integer> cursors = new HashMap<Integer, Integer>(); + private static Map<Integer, Integer> cursors = new HashMap<>(); static { cursors.put(1, Cursor.N_RESIZE_CURSOR); @@ -96,7 +96,7 @@ public class ComponentResizer extends MouseAdapter { private Dimension maximumSize = MAXIMUM_SIZE; - protected Map<Component, String> authorizedDirectionByComponent = new HashMap<Component, String>(); + protected Map<Component, String> authorizedDirectionByComponent = new HashMap<>(); /** * Convenience contructor. All borders are resizable in increments of diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Item.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Item.java index 38875ec..55542f2 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Item.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Item.java @@ -155,7 +155,7 @@ public class Item { */ public void addChild(Item item) { if (children == null) { - children = new ArrayList<Item>(); + children = new ArrayList<>(); } children.add(item); item.parent = this; @@ -190,7 +190,7 @@ public class Item { */ public List<Item> getChildren() { if (children == null) { - children = new ArrayList<Item>(); + children = new ArrayList<>(); } return children; } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXComboBox.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXComboBox.java index 101a062..bb1b9c2 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXComboBox.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXComboBox.java @@ -208,7 +208,7 @@ public class JAXXComboBox extends JComboBox { throw new IllegalArgumentException("could not find method " + methodName + " on " + select.getClass()); } - List<Item> items = new ArrayList<Item>(); + List<Item> items = new ArrayList<>(); for (Object o : data) { boolean selected = o.equals(select); try { @@ -233,7 +233,7 @@ public class JAXXComboBox extends JComboBox { public void setItems(List<Item> items) { setModel(new JAXXComboBoxModel(items)); - List<Integer> selectedIndexList = new ArrayList<Integer>(); + List<Integer> selectedIndexList = new ArrayList<>(); for (int i = 0; i < items.size(); i++) { if (items.get(i).isSelected()) { selectedIndexList.add(i); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXList.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXList.java index d39bd8c..47419a1 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXList.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXList.java @@ -163,7 +163,7 @@ public class JAXXList extends JList { public void setItems(List<Item> items) { setModel(new JAXXListModel(items)); - List<Integer> selectedIndexList = new ArrayList<Integer>(); + List<Integer> selectedIndexList = new ArrayList<>(); for (int i = 0; i < items.size(); i++) { if (items.get(i).isSelected()) { selectedIndexList.add(i); @@ -194,7 +194,7 @@ public class JAXXList extends JList { */ public void setSelectedValues(Object[] values) { if (values != null) { - List<Integer> selectedIndices = new ArrayList<Integer>(); + List<Integer> selectedIndices = new ArrayList<>(); ListModel model = getModel(); for (int i = 0; i < model.getSize(); i++) { Object o = model.getElementAt(i); @@ -240,7 +240,7 @@ public class JAXXList extends JList { public List<Item> getSelectedItems() { Object[] selected = super.getSelectedValues(); - java.util.List<Item> itemsSelected = new ArrayList<Item>(); + java.util.List<Item> itemsSelected = new ArrayList<>(); for (Object s : selected) { itemsSelected.add(findItem(s)); } @@ -301,7 +301,7 @@ public class JAXXList extends JList { if (selects == null) { selects = java.util.Collections.EMPTY_LIST; } - List<Item> items = new ArrayList<Item>(); + List<Item> items = new ArrayList<>(); for (Object o : data) { boolean selected = false; for (Object select : selects) { @@ -321,7 +321,7 @@ public class JAXXList extends JList { * @param select object to select in list after reflling his model */ public void fillList(Collection<?> data, Object select) { - List<Item> items = new ArrayList<Item>(); + List<Item> items = new ArrayList<>(); for (Object o : data) { boolean selected = o.equals(select); items.add(new Item(o.toString(), o.toString(), o, selected)); @@ -340,7 +340,7 @@ public class JAXXList extends JList { // prepare method to use Method m = null; - List<Item> items = new ArrayList<Item>(); + List<Item> items = new ArrayList<>(); for (Object o : data) { boolean selected = o.equals(select); if (m == null) { @@ -381,7 +381,7 @@ public class JAXXList extends JList { // prepare method to use Method m = null; - List<Item> items = new ArrayList<Item>(); + List<Item> items = new ArrayList<>(); for (Object o : data) { boolean selected = selects.contains(o); if (m == null) { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTree.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTree.java index 9dc26e7..b1acca0 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTree.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTree.java @@ -45,7 +45,7 @@ public class JAXXTree extends JTree { private Item root; - private List<TreeModelListener> listeners = new ArrayList<TreeModelListener>(); + private List<TreeModelListener> listeners = new ArrayList<>(); public JAXXTreeModel(List<Item> items) { if (items.size() == 1) { @@ -117,7 +117,7 @@ public class JAXXTree extends JTree { } private TreePath getTreePath(Item node) { - List<Object> path = new ArrayList<Object>(); + List<Object> path = new ArrayList<>(); while (node != null) { path.add(0, node.getValue()); node = node.getParent(); @@ -232,7 +232,7 @@ public class JAXXTree extends JTree { } public void setItem(Item items) { - List<Item> newItems = new ArrayList<Item>(); + List<Item> newItems = new ArrayList<>(); newItems.add(items); setItems(newItems); } @@ -248,7 +248,7 @@ public class JAXXTree extends JTree { // Appli selected items if (items != null) { - List<TreePath> treePathSelected = new ArrayList<TreePath>(); + List<TreePath> treePathSelected = new ArrayList<>(); for (Item i : items) { if (i.isSelected()) { treePathSelected.add(model.getTreePath(i)); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionExecutor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionExecutor.java index f0951e4..6844a2b 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionExecutor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionExecutor.java @@ -50,7 +50,7 @@ public abstract class ActionExecutor { /** current tasks */ protected final Set<ActionWorker<?, ?>> tasks = - new HashSet<ActionWorker<?, ?>>(); + new HashSet<>(); /** the listener of running action */ protected final PropertyChangeListener workerListener; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionWorker.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionWorker.java index 196c686..7ba2b6d 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionWorker.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionWorker.java @@ -57,7 +57,7 @@ public class ActionWorker<R, P> extends SwingWorker<R, P> { } public ActionWorker(String actionLabel, Runnable target) { - this.target = new RunnableBridge<R>(target); + this.target = new RunnableBridge<>(target); this.actionLabel = actionLabel; } @@ -66,7 +66,7 @@ public class ActionWorker<R, P> extends SwingWorker<R, P> { } public void setTarget(Runnable target) { - setTarget(new RunnableBridge<R>(target)); + setTarget(new RunnableBridge<>(target)); } /** diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/EnumEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/EnumEditor.java index 487ccb4..3f74fa6 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/EnumEditor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/EnumEditor.java @@ -69,7 +69,7 @@ public class EnumEditor<E extends Enum<E>> extends JComboBox { * @return the instanciated editor */ public static <E extends Enum<E>> EnumEditor<E> newEditor(Class<E> type) { - return new EnumEditor<E>(type); + return new EnumEditor<>(type); } @@ -85,7 +85,7 @@ public class EnumEditor<E extends Enum<E>> extends JComboBox { */ public static <E extends Enum<E>> EnumEditor<E> newEditor(Class<E> type, int maxOrdinal) { - return new EnumEditor<E>(type, maxOrdinal); + return new EnumEditor<>(type, maxOrdinal); } /** @@ -97,7 +97,7 @@ public class EnumEditor<E extends Enum<E>> extends JComboBox { * @return the instanciated editor */ public static <E extends Enum<E>> EnumEditor<E> newEditor(E... universe) { - return new EnumEditor<E>(universe); + return new EnumEditor<>(universe); } public EnumEditor(Class<E> type) { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpBroker.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpBroker.java index c13c9b8..7e10e80 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpBroker.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpBroker.java @@ -122,7 +122,7 @@ public class JAXXHelpBroker { this.helpKey = helpKey; this.defaultID = defaultID; this.handler = handler; - this.cache = new HashMap<Component, String>(); + this.cache = new HashMap<>(); } public void prepareUI(JAXXObject c) { @@ -243,7 +243,7 @@ public class JAXXHelpBroker { cursors = null; if (onItemCursor != null) { - cursors = new Hashtable<Component, Cursor>(); + cursors = new Hashtable<>(); topComponents = getTopContainers(source); for (Object topComponent : topComponents) { setAndStoreCursors((Container) topComponent, onItemCursor); @@ -362,7 +362,7 @@ public class JAXXHelpBroker { // in a Applet, cursor for applets is not changed to question mark. Only for // Frames, Windows and Dialogs is cursor changed properly. - Vector<Component> containers = new Vector<Component>(); + Vector<Component> containers = new Vector<>(); Component topComponent = null; topComponent = getRoot(source); if (topComponent instanceof Applet) { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java index 30bbcbd..41c8f8f 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java @@ -185,7 +185,7 @@ public abstract class AbstractGenericListSelectionModel<B> extends DefaultListSe for (int i = listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == GenericListListener.class) { if (e == null) { - e = new GenericListEvent<B>(this, values); + e = new GenericListEvent<>(this, values); } ((GenericListListener)listeners[i+1]).valuesAdded(e); } @@ -202,7 +202,7 @@ public abstract class AbstractGenericListSelectionModel<B> extends DefaultListSe for (int i = listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == GenericListListener.class) { if (e == null) { - e = new GenericListEvent<B>(this, values); + e = new GenericListEvent<>(this, values); } ((GenericListListener)listeners[i+1]).valuesRemoved(e); } @@ -219,7 +219,7 @@ public abstract class AbstractGenericListSelectionModel<B> extends DefaultListSe for (int i = listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == GenericListListener.class) { if (e == null) { - e = new GenericListEvent<B>(this, selectedValues); + e = new GenericListEvent<>(this, selectedValues); } ((GenericListListener)listeners[i+1]).selectionAdded(e); } @@ -236,7 +236,7 @@ public abstract class AbstractGenericListSelectionModel<B> extends DefaultListSe for (int i = listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == GenericListListener.class) { if (e == null) { - e = new GenericListEvent<B>(this, selectedValues); + e = new GenericListEvent<>(this, selectedValues); } ((GenericListListener)listeners[i+1]).selectionAdded(e); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java index 87aabbc..ea25944 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java @@ -51,11 +51,11 @@ public class JaxxDefaultComboBoxModel<E> extends AbstractListModel implements Mu protected E selectedObject; public JaxxDefaultComboBoxModel() { - delegate = new ArrayList<E>(); + delegate = new ArrayList<>(); } public JaxxDefaultComboBoxModel(E... items) { - delegate = new ArrayList<E>(items.length); + delegate = new ArrayList<>(items.length); int i, c; for (i = 0, c = items.length; i < c; i++) @@ -67,7 +67,7 @@ public class JaxxDefaultComboBoxModel<E> extends AbstractListModel implements Mu } public JaxxDefaultComboBoxModel(Collection<E> v) { - delegate = new ArrayList<E>(v); + delegate = new ArrayList<>(v); if (getSize() > 0) { selectedObject = getElementAt(0); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultListModel.java index 6388423..60a741c 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultListModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultListModel.java @@ -42,7 +42,7 @@ public class JaxxDefaultListModel<E> extends AbstractListModel { private static final long serialVersionUID = 1L; - protected ArrayList<E> delegate = new ArrayList<E>(); + protected ArrayList<E> delegate = new ArrayList<>(); protected boolean valueIsAdjusting; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java index a58ebba..14d0caf 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java @@ -65,7 +65,7 @@ public class JaxxFilterableComboBoxModel<E> extends JaxxDefaultComboBoxModel<E> } public JaxxFilterableComboBoxModel(E... items) { - delegate = new ArrayList<E>(items.length); + delegate = new ArrayList<>(items.length); int i, c; for (i = 0, c = items.length; i < c; i++) @@ -74,7 +74,7 @@ public class JaxxFilterableComboBoxModel<E> extends JaxxDefaultComboBoxModel<E> } public JaxxFilterableComboBoxModel(Collection<E> v) { - delegate = new ArrayList<E>(v); + delegate = new ArrayList<>(v); } @Override diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavHelper.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavHelper.java index ae091ef..a7feb44 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavHelper.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavHelper.java @@ -258,7 +258,7 @@ public abstract class NavHelper<M, U, B extends NavBridge<M, N>, N extends NavNo protected static Set<? super NavNodeChildLoador<?, ?, ?, ?, ?>> getChildLoadors() { if (childLoadors == null) { - childLoadors = new HashSet<NavNodeChildLoador<?, ?, ?, ?, ?>>(); + childLoadors = new HashSet<>(); } return childLoadors; } @@ -536,7 +536,7 @@ public abstract class NavHelper<M, U, B extends NavBridge<M, N>, N extends NavNo * @return the array of ids from root node to selected node. */ public String[] getSelectedIds() { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); N selectedNode = getSelectedNode(); while (selectedNode != null && !selectedNode.isRoot()) { @@ -777,7 +777,7 @@ public abstract class NavHelper<M, U, B extends NavBridge<M, N>, N extends NavNo // no model return; } - List<TreePath> paths = new ArrayList<TreePath>(); + List<TreePath> paths = new ArrayList<>(); for (N node : nodes) { paths.add(new TreePath(bridge.getPathToRoot(node))); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java index 7b20f49..696c705 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java @@ -49,7 +49,7 @@ public abstract class AbstractNavTreeCellRenderer<M, N extends NavNode<M, N>> ex protected NavDataProvider dataProvider; /** le cache de rendu */ - protected final Map<N, String> renderCache = new HashMap<N, String>(); + protected final Map<N, String> renderCache = new HashMap<>(); /** * Determines the text render of a node using the {@link #dataProvider}. diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeHelper.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeHelper.java index cb38c9e..b6fe0e1 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeHelper.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeHelper.java @@ -42,7 +42,7 @@ import java.util.List; public class NavTreeHelper<N extends NavTreeNode<N>> extends NavHelper<DefaultTreeModel, JTree, NavTreeBridge<N>, N> { public NavTreeHelper() { - this(new NavTreeBridge<N>()); + this(new NavTreeBridge<>()); } public NavTreeHelper(NavTreeBridge<N> bridge) { @@ -131,7 +131,7 @@ public class NavTreeHelper<N extends NavTreeNode<N>> extends NavHelper<DefaultTr return null; } TreePath[] paths = tree.getSelectionPaths(); - List<N> nodes = new ArrayList<N>(); + List<N> nodes = new ArrayList<>(); if (paths != null) { for (TreePath path : paths) { if (path != null) { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java index c7ba09b..9ea79a6 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java @@ -264,7 +264,7 @@ public class NavTreeTableBridge<N extends NavTreeTableNode<N>> implements NavBri @SuppressWarnings({"unchecked"}) public <T extends EventListener> T[] getListeners(Class<T> listenerType) { TreeModelListener[] treeModelListeners = getTreeModelListeners(); - List<TreeModelListener> result = new ArrayList<TreeModelListener>(); + List<TreeModelListener> result = new ArrayList<>(); for (TreeModelListener listener : treeModelListeners) { if (listener.getClass().isAssignableFrom(listenerType)) { result.add(listener); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java index adb8101..90c89df 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java @@ -46,7 +46,7 @@ public class NavTreeTableHelper<N extends NavTreeTableNode<N>> extends NavHelper static private final Log log = LogFactory.getLog(NavTreeTableHelper.class); public NavTreeTableHelper() { - super(new NavTreeTableBridge<N>()); + super(new NavTreeTableBridge<>()); } @Override @@ -119,7 +119,7 @@ public class NavTreeTableHelper<N extends NavTreeTableNode<N>> extends NavHelper return null; } TreePath[] paths = tree.getTreeSelectionModel().getSelectionPaths(); - List<N> nodes = new ArrayList<N>(); + List<N> nodes = new ArrayList<>(); if (paths != null) { for (TreePath path : paths) { if (path != null) { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java index e3ccbe2..a9d95fe 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java @@ -329,7 +329,7 @@ public class NavTreeTableNode<N extends NavTreeTableNode<N>> extends DefaultMuta @Override public Enumeration<N> children() { List<? extends MutableTreeTableNode> newChildrenList = - new ArrayList<MutableTreeTableNode>(children); + new ArrayList<>(children); return (Enumeration<N>) Collections.enumeration(newChildrenList); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumEditorRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumEditorRenderer.java index 6ddc8ee..a34fb11 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumEditorRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumEditorRenderer.java @@ -46,7 +46,7 @@ public class EnumEditorRenderer<E extends Enum<E>> extends DefaultListCellRender public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { if (value != null) { - value = labels.get((E) value); + value = labels.get(value); } return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java index 88cf004..49179cc 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java @@ -41,7 +41,7 @@ public class LocaleListCellRenderer extends DefaultListCellRenderer { private static final long serialVersionUID = 1L; - protected final Map<Locale, Icon> cache = new HashMap<Locale, Icon>(); + protected final Map<Locale, Icon> cache = new HashMap<>(); protected boolean showIcon; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java index a9405de..af17fa9 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java @@ -52,8 +52,8 @@ public class MultiDecoratorListCellRenderer implements ListCellRenderer { public MultiDecoratorListCellRenderer(ListCellRenderer delegate, JXPathDecorator<?>... decorator) { this.delegate = delegate; - this.types = new ArrayList<Class<?>>(); - List<Decorator<?>> tmp = new ArrayList<Decorator<?>>(); + this.types = new ArrayList<>(); + List<Decorator<?>> tmp = new ArrayList<>(); for (JXPathDecorator<?> d : decorator) { if (types.contains(d.getType())) { throw new IllegalArgumentException("can not have twice a decorator of type " + d.getType()); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java index 4235e6c..a975820 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java @@ -58,8 +58,8 @@ public class MultiDecoratorTableCelleRenderer implements TableCellRenderer { JXPathDecorator<?>... decorator) { this.delegate = delegate; - types = new ArrayList<Class<?>>(); - List<Decorator<?>> tmp = new ArrayList<Decorator<?>>(); + types = new ArrayList<>(); + List<Decorator<?>> tmp = new ArrayList<>(); for (JXPathDecorator<?> d : decorator) { if (types.contains(d.getType())) { throw new IllegalArgumentException( diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JTableState.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JTableState.java index 8d88ec3..945351e 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JTableState.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JTableState.java @@ -108,7 +108,7 @@ public class JTableState implements State { List<? extends RowSorter.SortKey> sortKeys = table.getRowSorter().getSortKeys(); Map<Integer, String> sortKeysMap = null; if (sortKeys != null) { - sortKeysMap = new HashMap<Integer, String>(); + sortKeysMap = new HashMap<>(); for (RowSorter.SortKey sortKey : sortKeys) { sortKeysMap.put(sortKey.getColumn(), String.valueOf(sortKey.getSortOrder())); } @@ -142,7 +142,7 @@ public class JTableState implements State { } Map<Integer, String> sortKeysMap = jTableState.getSortKeys(); if (sortKeysMap != null) { - List<RowSorter.SortKey> sortKeys = new ArrayList<RowSorter.SortKey>(); + List<RowSorter.SortKey> sortKeys = new ArrayList<>(); for (Integer index : sortKeysMap.keySet()) { SortOrder sortOrder = SortOrder.valueOf(sortKeysMap.get(index)); RowSorter.SortKey sortKey = new RowSorter.SortKey(index, sortOrder); diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/SwingSession.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/SwingSession.java index fb9af50..4e830c8 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/SwingSession.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/SwingSession.java @@ -121,7 +121,7 @@ public class SwingSession { */ @Deprecated public static SwingSession newSession(File file, boolean autoSave) { - return newSession(file, autoSave, Maps.<Class, State>newHashMap()); + return newSession(file, autoSave, Maps.newHashMap()); } /** @@ -139,7 +139,7 @@ public class SwingSession { } public SwingSession(File file, boolean autoSave) { - this(file, autoSave, Maps.<Class, State>newHashMap()); + this(file, autoSave, Maps.newHashMap()); } public SwingSession(File file, boolean autoSave, Map<Class, State> additionalStates) { diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardModel.java index 9c2c9c2..008c63b 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardModel.java @@ -91,7 +91,7 @@ public abstract class WizardModel<E extends WizardStep> { } this.stepClass = stepClass; pcs = new PropertyChangeSupport(this); - this.steps = new ArrayList<E>(); + this.steps = new ArrayList<>(); if (steps.length > 0) { setSteps(steps); } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtModel.java index 433eb01..ab79c04 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtModel.java @@ -302,7 +302,7 @@ public abstract class WizardExtModel<E extends WizardExtStep> extends WizardMode public void updateUniverse() { // setValueAdjusting(true); - List<E> oldSteps = new ArrayList<E>(getSteps()); + List<E> oldSteps = new ArrayList<>(getSteps()); log.info("Start updateUniverse (oldSteps = " + oldSteps + ")"); E[] newSteps = updateStepUniverse(); log.info("newSteps = " + Arrays.toString(newSteps)); @@ -328,7 +328,7 @@ public abstract class WizardExtModel<E extends WizardExtStep> extends WizardMode } models.clear(); - List<E> toAdd = new ArrayList<E>(Arrays.asList(newSteps)); + List<E> toAdd = new ArrayList<>(Arrays.asList(newSteps)); log.info("Will add models for " + toAdd); diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java index 30bc2fa..e9b4469 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java @@ -65,8 +65,8 @@ public class SimpleBeanValidatorMessageTableModel extends AbstractTableModel protected List<SimpleBeanValidatorMessage> data; public SimpleBeanValidatorMessageTableModel() { - validators = new ArrayList<SimpleBeanValidator<?>>(); - data = new ArrayList<SimpleBeanValidatorMessage>(); + validators = new ArrayList<>(); + data = new ArrayList<>(); } /** @@ -218,7 +218,7 @@ public class SimpleBeanValidatorMessageTableModel extends AbstractTableModel // add new errors for (String error : messages) { SimpleBeanValidatorMessage row = - new SimpleBeanValidatorMessage<SimpleBeanValidatorMessage<?>>( + new SimpleBeanValidatorMessage<>( validator, fieldName, error, @@ -247,7 +247,7 @@ public class SimpleBeanValidatorMessageTableModel extends AbstractTableModel String... messages) { List<String> messagesToDel = - new ArrayList<String>(Arrays.asList(messages)); + new ArrayList<>(Arrays.asList(messages)); // do it in reverse mode (only one pass in that way since index // will stay coherent while removing them) diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidator.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidator.java index f09c1d7..bb0eec9 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidator.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidator.java @@ -105,7 +105,7 @@ public class SwingListValidator<B> extends BeanListValidator<B> { // create the new instance of bean validator - return new SwingListValidator<O>( + return new SwingListValidator<>( provider, type, context, scopes ); } diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorHighlightPredicate.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorHighlightPredicate.java index 70394c2..554150c 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorHighlightPredicate.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorHighlightPredicate.java @@ -103,7 +103,7 @@ public class SwingListValidatorHighlightPredicate<O> implements HighlightPredica NuitonValidatorScope scope, BeanListValidator<O> validator, SwingListValidatorDataLocator<O> dataLocator) { - return new SwingListValidatorHighlightPredicate<O>( + return new SwingListValidatorHighlightPredicate<>( scope, validator, dataLocator diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java index 136e1e2..fce1f69 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java @@ -251,7 +251,7 @@ public class SwingListValidatorMessageTableModel extends AbstractTableModel String... messages) { List<String> messagesToDel = - new ArrayList<String>(Arrays.asList(messages)); + new ArrayList<>(Arrays.asList(messages)); // do it in reverse mode (only one pass in that way since index // will stay coherent while removing them) diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidator.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidator.java index 5a235c1..93e4b6d 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidator.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidator.java @@ -194,7 +194,7 @@ public class SwingValidator<B> extends SimpleBeanValidator<B> { // create the new instance of bean validator - return new SwingValidator<O>( + return new SwingValidator<>( provider, type, context, scopes); } @@ -218,7 +218,7 @@ public class SwingValidator<B> extends SimpleBeanValidator<B> { String contextName, NuitonValidatorScope... filterScopes) { super(provider, beanClass, contextName, filterScopes); - fieldRepresentation = new HashMap<String, JComponent>(); + fieldRepresentation = new HashMap<>(); } public SwingValidator(Class<B> beanClass, @@ -229,7 +229,7 @@ public class SwingValidator<B> extends SimpleBeanValidator<B> { contextName, filterScopes ); - fieldRepresentation = new HashMap<String, JComponent>(); + fieldRepresentation = new HashMap<>(); } public SwingValidator(Class<B> beanClass, String contextName) { diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListModel.java index aad5b55..3151ead 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListModel.java @@ -55,8 +55,8 @@ public class SwingValidatorMessageListModel protected List<SwingValidatorMessage> data; public SwingValidatorMessageListModel() { - validators = new ArrayList<SwingValidator<?>>(); - data = new ArrayList<SwingValidatorMessage>(); + validators = new ArrayList<>(); + data = new ArrayList<>(); } public boolean isEmpty() { @@ -169,7 +169,7 @@ public class SwingValidatorMessageListModel String... messages) { List<String> messagesToDel = - new ArrayList<String>(Arrays.asList(messages)); + new ArrayList<>(Arrays.asList(messages)); // do it in reverse mode (only one pass in that way since index // will stay coherent while removing them) diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java index 8341a84..43ec4d8 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java @@ -66,8 +66,8 @@ public class SwingValidatorMessageTableModel protected List<SwingValidatorMessage> data; public SwingValidatorMessageTableModel() { - validators = new ArrayList<SwingValidator<?>>(); - data = new ArrayList<SwingValidatorMessage>(); + validators = new ArrayList<>(); + data = new ArrayList<>(); } /** @@ -316,7 +316,7 @@ public class SwingValidatorMessageTableModel String... messages) { List<String> messagesToDel = - new ArrayList<String>(Arrays.asList(messages)); + new ArrayList<>(Arrays.asList(messages)); // do it in reverse mode (only one pass in that way since index // will stay coherent while removing them) diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java index 197042e..5ffce70 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java @@ -76,7 +76,7 @@ public class SwingValidatorUtil extends SimpleBeanValidators { public static EnumMap<NuitonValidatorScope, ImageIcon> getIcons() { if (icons == null) { - icons = new EnumMap<NuitonValidatorScope, ImageIcon>(NuitonValidatorScope.class); + icons = new EnumMap<>(NuitonValidatorScope.class); icons.put(NuitonValidatorScope.FATAL, SwingUtil.createImageIcon("fatal.png")); icons.put(NuitonValidatorScope.ERROR, SwingUtil.createImageIcon("error.png")); icons.put(NuitonValidatorScope.WARNING, SwingUtil.createImageIcon("warning.png")); @@ -87,7 +87,7 @@ public class SwingValidatorUtil extends SimpleBeanValidators { public static EnumMap<NuitonValidatorScope, Color> getColors() { if (colors == null) { - colors = new EnumMap<NuitonValidatorScope, Color>(NuitonValidatorScope.class); + colors = new EnumMap<>(NuitonValidatorScope.class); colors.put(NuitonValidatorScope.FATAL, Color.MAGENTA); colors.put(NuitonValidatorScope.ERROR, Color.RED); colors.put(NuitonValidatorScope.WARNING, Color.YELLOW); @@ -186,7 +186,7 @@ public class SwingValidatorUtil extends SimpleBeanValidators { * @return the list of ids of validators found on the given ui */ public static List<String> detectValidators(JAXXValidator ui) { - List<String> validatorIds = new ArrayList<String>(); + List<String> validatorIds = new ArrayList<>(); Map<Field, Validator> validators = ReflectUtil.getFieldAnnotation( ui.getClass(), Validator.class, @@ -357,7 +357,7 @@ public class SwingValidatorUtil extends SimpleBeanValidators { // listen on editor model to add / remove bean into validator dataTable.getModel().addTableModelListener( - new SwingListValidatorTableEditorModelListener<O>(validator, dataLocator)); + new SwingListValidatorTableEditorModelListener<>(validator, dataLocator)); } /** @@ -663,7 +663,7 @@ public class SwingValidatorUtil extends SimpleBeanValidators { JAXXValidator jaxxValidator = (JAXXValidator) ui; List<String> validatorIds = jaxxValidator.getValidatorIds(); if (excludeIds.length > 0) { - validatorIds = new ArrayList<String>(validatorIds); + validatorIds = new ArrayList<>(validatorIds); for (String excludeId : excludeIds) { validatorIds.remove(excludeId); } @@ -699,7 +699,7 @@ public class SwingValidatorUtil extends SimpleBeanValidators { JAXXValidator jaxxValidator = (JAXXValidator) ui; List<String> validatorIds = jaxxValidator.getValidatorIds(); if (excludeIds.length > 0) { - validatorIds = new ArrayList<String>(validatorIds); + validatorIds = new ArrayList<>(validatorIds); for (String excludeId : excludeIds) { validatorIds.remove(excludeId); } diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/IconValidationUI.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/IconValidationUI.java index db468c5..16cc4ca 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/IconValidationUI.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/IconValidationUI.java @@ -56,7 +56,7 @@ public class IconValidationUI extends AbstractBeanValidatorUI { public IconValidationUI(Collection<String> fields) { super(fields); - icons = new EnumMap<NuitonValidatorScope, BufferedImage>(NuitonValidatorScope.class); + icons = new EnumMap<>(NuitonValidatorScope.class); for (NuitonValidatorScope scope : NuitonValidatorScope.values()) { diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/ImageValidationUI.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/ImageValidationUI.java index 9c97491..8c18516 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/ImageValidationUI.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/ImageValidationUI.java @@ -54,7 +54,7 @@ public class ImageValidationUI extends AbstractBeanValidatorUI { public ImageValidationUI(Collection<String> fields) { super(fields); - icons = new EnumMap<NuitonValidatorScope, BufferedImage>(NuitonValidatorScope.class); + icons = new EnumMap<>(NuitonValidatorScope.class); for (NuitonValidatorScope scope : NuitonValidatorScope.values()) { diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessage.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessage.java index 097619d..8bee8a4 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessage.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessage.java @@ -187,7 +187,7 @@ public class UnifiedValidatorMessage implements Comparable<UnifiedValidatorMessa } else { StringTokenizer stk = new StringTokenizer(error, "##"); String errorName = stk.nextToken(); - List<String> args = new ArrayList<String>(); + List<String> args = new ArrayList<>(); while (stk.hasMoreTokens()) { args.add(stk.nextToken()); } diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java index b00c7a3..bbd19ad 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java @@ -322,7 +322,7 @@ public class UnifiedValidatorMessageTableModel extends AbstractTableModel { String... messages) { List<String> messagesToDel = - new ArrayList<String>(Arrays.asList(messages)); + new ArrayList<>(Arrays.asList(messages)); // do it in reverse mode (only one pass in that way since index // will stay coherent while removing them) @@ -374,7 +374,7 @@ public class UnifiedValidatorMessageTableModel extends AbstractTableModel { String... messages) { List<String> messagesToDel = - new ArrayList<String>(Arrays.asList(messages)); + new ArrayList<>(Arrays.asList(messages)); // do it in reverse mode (only one pass in that way since index // will stay coherent while removing them) diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java index 19cdd58..901dfc4 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java @@ -118,7 +118,7 @@ public class UnifiedValidatorMessageUtil { // listen on editor model to add / remove bean into validator dataTable.getModel().addTableModelListener( - new SwingListValidatorTableEditorModelListener<O>(validator, dataLocator)); + new SwingListValidatorTableEditorModelListener<>(validator, dataLocator)); } /** diff --git a/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/jformattedtextfield/JFormattedTextFieldNavigationManager.java b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/jformattedtextfield/JFormattedTextFieldNavigationManager.java index 51c2192..6fd11d6 100644 --- a/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/jformattedtextfield/JFormattedTextFieldNavigationManager.java +++ b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/jformattedtextfield/JFormattedTextFieldNavigationManager.java @@ -97,7 +97,7 @@ public class JFormattedTextFieldNavigationManager { this.groups = groups; - this.actions = new HashMap<JFormatterTextFieldInternalGroup, SelectComponentAction>(); + this.actions = new HashMap<>(); for (JFormatterTextFieldInternalGroup componentPosition : groups) { actions.put(componentPosition, new SelectComponentAction(component, componentPosition)); } 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 70da9dd..1b1e9d9 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 @@ -47,7 +47,7 @@ public class JFormatterTextFieldInternalGroups implements Iterable<JFormatterTex // TODO See which other caracters must be especad by MaskFormatter mask = mask.replaceAll("''", "'"); - Set<JFormatterTextFieldInternalGroup> groups = new LinkedHashSet<JFormatterTextFieldInternalGroup>(); + Set<JFormatterTextFieldInternalGroup> groups = new LinkedHashSet<>(); JFormatterTextFieldInternalGroup previousGroup = null; int length = mask.length(); 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 2ab50b8..736e167 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 @@ -90,7 +90,7 @@ public class DateTimeEditorHandler implements UIHandler<DateTimeEditor> { // When model day date changed, let's push it back in bean model.addPropertyChangeListener( DateTimeEditorModel.PROPERTY_DAY_DATE, - new MutateOnConditionalPropertyChangeListener<DateTimeEditorModel>(model, mutator, predicate)); + new MutateOnConditionalPropertyChangeListener<>(model, mutator, predicate)); } @@ -102,7 +102,7 @@ public class DateTimeEditorHandler implements UIHandler<DateTimeEditor> { // When model time date changed, let's push it back in bean model.addPropertyChangeListener( DateTimeEditorModel.PROPERTY_TIME_DATE, - new MutateOnConditionalPropertyChangeListener<DateTimeEditorModel>(model, mutator, predicate)); + new MutateOnConditionalPropertyChangeListener<>(model, mutator, predicate)); } @@ -114,7 +114,7 @@ public class DateTimeEditorHandler implements UIHandler<DateTimeEditor> { // When model full date changed, let's push it back in bean model.addPropertyChangeListener( DateTimeEditorModel.PROPERTY_DATE, - new MutateOnConditionalPropertyChangeListener<DateTimeEditorModel>(model, mutator, predicate)); + new MutateOnConditionalPropertyChangeListener<>(model, mutator, predicate)); } 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 1fab880..511e7f3 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 @@ -91,7 +91,7 @@ public class TimeEditorHandler implements UIHandler<TimeEditor> { // When model time date changed, let's push it back in bean model.addPropertyChangeListener( TimeEditorModel.PROPERTY_TIME, - new MutateOnConditionalPropertyChangeListener<TimeEditorModel>(model, mutator, predicate)); + new MutateOnConditionalPropertyChangeListener<>(model, mutator, predicate)); } diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeSliderInitializer.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeSliderInitializer.java index ba56c10..6f2c29a 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeSliderInitializer.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeSliderInitializer.java @@ -45,7 +45,7 @@ class TimeSliderInitializer { public void init(JSlider slider) { // create slider labels - Map<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>(); + Map<Integer, JLabel> labelTable = new Hashtable<>(); for (int i = 0; i < 25; i += 2) { labelTable.put(i * 60, new JLabel(i + "")); } diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/GridFlowLayout.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/GridFlowLayout.java index 5afc6c4..6ae8335 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/GridFlowLayout.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/GridFlowLayout.java @@ -59,7 +59,7 @@ import javax.swing.JViewport; */ public class GridFlowLayout implements LayoutManager2 { // GridFlowLayout - protected java.util.Map<Component, Object> positions = new HashMap<Component, Object>(); + protected java.util.Map<Component, Object> positions = new HashMap<>(); int hgap; int vgap; @@ -410,7 +410,7 @@ public class GridFlowLayout implements LayoutManager2 { // GridFlowLayout // contient les composants dont la contrainte n'est pas bonne // et que l'on place comme s'il n'avait pas de contraint. - HashSet<Component> inWait = new HashSet<Component>(); + HashSet<Component> inWait = new HashSet<>(); // on commence par mettre les composants dont on connait la position for (Component comp : positions.keySet()) { diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/IconFactory.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/IconFactory.java index 1cc8885..a1ba8a7 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/IconFactory.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/IconFactory.java @@ -99,7 +99,7 @@ public class IconFactory { protected Map<Object, String> iconURLs; protected IconFactory() { - iconURLs = new IdentityHashMap<Object, String>(); + iconURLs = new IdentityHashMap<>(); iconURLs.put(APPEARANCE, "/22x22/appearance.png"); iconURLs.put(APPOINTMENT, "/22x22/appointment.png"); @@ -142,7 +142,7 @@ public class IconFactory { iconURLs.put(UNDO, "/22x22/undo.png"); } - static protected ReferenceIdentityMap<Object, Icon> cache = new ReferenceIdentityMap<Object, Icon>( + static protected ReferenceIdentityMap<Object, Icon> cache = new ReferenceIdentityMap<>( AbstractReferenceMap.ReferenceStrength.HARD, AbstractReferenceMap.ReferenceStrength.SOFT); /** diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridParseConstraints.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridParseConstraints.java index 0ca39ef..a08308a 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridParseConstraints.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/XMLGridParseConstraints.java @@ -80,8 +80,8 @@ class XMLGridParseConstraints extends DefaultHandler { } public Map<String, GridBagConstraints> parse(String s) throws SAXException { - constraints = new HashMap<String, GridBagConstraints>(); - styles = new HashMap<String, GridBagConstraints>(); + constraints = new HashMap<>(); + styles = new HashMap<>(); try { xr.parse(new InputSource(new ByteArrayInputStream(s.getBytes()))); } catch (IOException e) { @@ -136,7 +136,7 @@ class XMLGridParseConstraints extends DefaultHandler { } private void handleOpenTable(Attributes attributes) { - table = new HashMap<Point, GridBagConstraints>(); + table = new HashMap<>(); for (int i = 0; i < attributes.getLength(); i++) { String name = attributes.getLocalName(i); String value = attributes.getValue(i); 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 ab00158..2dc72fa 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 @@ -126,7 +126,7 @@ public class Editor extends JPanel implements EditorInterface { } static { - registered = new ArrayList<EditorInterface>(); + registered = new ArrayList<>(); // we try to automatic register some Editor addEditor(SDocEditor.class.getName()); @@ -209,15 +209,15 @@ public class Editor extends JPanel implements EditorInterface { static protected EditorInterface nullEditor = new NullEditor(); /** editor already instanciate for this editor */ - protected Map<EditorInterface, EditorInterface> usedEditor = new HashMap<EditorInterface, EditorInterface>(); + protected Map<EditorInterface, EditorInterface> usedEditor = new HashMap<>(); /** currentEditor is currently opened editor in this editor */ protected EditorInterface currentEditor = nullEditor; /** current opened file */ protected File openedFile = null; /** All document listener registered on this editor */ - protected Set<DocumentListener> documentListeners = new HashSet<DocumentListener>(); + protected Set<DocumentListener> documentListeners = new HashSet<>(); /** All caret listener registered on this editor */ - protected Set<CaretListener> caretListeners = new HashSet<CaretListener>(); + protected Set<CaretListener> caretListeners = new HashSet<>(); /** * If the edited file is modifier, before switch to other or close it, ask diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipWindow.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipWindow.java index 553619f..ee8ce66 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipWindow.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tooltip/TipWindow.java @@ -233,8 +233,8 @@ public class TipWindow extends JWindow implements ActionListener { // Use specified size Dimension d = component.getPreferredSize(); - d.height = width; - d.width = height; + d.width= width; + d.height = height; component.setPreferredSize(d); component.setSize(d); pack(); diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tree/FilterTreeModel.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tree/FilterTreeModel.java index 5cf8b91..9436220 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tree/FilterTreeModel.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/tree/FilterTreeModel.java @@ -68,7 +68,7 @@ public class FilterTreeModel implements TreeModel { public FilterTreeModel(TreeModel delegateModel, TreeFilter filter) { this.delegateModel = delegateModel; this.treeFilter = filter; - treeModelListeners = new ArrayList<TreeModelListener>(); + treeModelListeners = new ArrayList<>(); } /** diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/MaskFormatterFromConverter.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/MaskFormatterFromConverter.java index c5628d0..37e82d1 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/MaskFormatterFromConverter.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/MaskFormatterFromConverter.java @@ -44,7 +44,7 @@ public class MaskFormatterFromConverter<O> extends MaskFormatter { public static <O> MaskFormatterFromConverter<O> newFormatter(Class<O> type, String pattern, Converter converter) throws ParseException { - return new MaskFormatterFromConverter<O>(type, pattern, converter); + return new MaskFormatterFromConverter<>(type, pattern, converter); } protected MaskFormatterFromConverter(Class<O> type, @@ -57,7 +57,7 @@ public class MaskFormatterFromConverter<O> extends MaskFormatter { @Override public String valueToString(Object value) throws ParseException { - return (String) converter.convert(String.class, value); + return converter.convert(String.class, value); } @Override diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverterTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverterTest.java index e0742e5..c88af6b 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverterTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverterTest.java @@ -72,7 +72,7 @@ public class DmsCoordinateConverterTest { // String -> DmsCoordinate - actualCoordinate = (DmsCoordinate) converter.convert(DmsCoordinate.class, expectedString); + actualCoordinate = converter.convert(DmsCoordinate.class, expectedString); Assert.assertNotNull(actualCoordinate); Assert.assertEquals(actualCoordinate.isSign(), expectedCoordinate.isSign()); Assert.assertEquals(actualCoordinate.getDegree(), expectedCoordinate.getDegree()); @@ -81,21 +81,21 @@ public class DmsCoordinateConverterTest { // DmsCoordinate -> String - actualStr = (String) converter.convert(String.class, expectedCoordinate); + actualStr = converter.convert(String.class, expectedCoordinate); Assert.assertNotNull(actualStr); Assert.assertEquals(expectedString, actualStr); // String -> String - actualStr = (String) converter.convert(String.class, expectedString); + actualStr = converter.convert(String.class, expectedString); Assert.assertNotNull(actualStr); Assert.assertEquals(expectedString, actualStr); // DmsCoordinate -> DmsCoordinate - actualCoordinate = (DmsCoordinate) converter.convert(DmsCoordinate.class, expectedCoordinate); + actualCoordinate = converter.convert(DmsCoordinate.class, expectedCoordinate); Assert.assertNotNull(actualCoordinate); Assert.assertEquals(actualCoordinate.isSign(), expectedCoordinate.isSign()); Assert.assertEquals(actualCoordinate.getDegree(), expectedCoordinate.getDegree()); diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java index 289ff96..612a50c 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java @@ -394,7 +394,7 @@ public class NumberEditorHandler implements UIHandler<NumberEditor> { // When model number changed, let's push it back in bean model.addPropertyChangeListener( NumberEditorModel.PROPERTY_NUMBER_VALUE, - new MutateOnConditionalPropertyChangeListener<NumberEditorModel>(model, mutator, model.canUpdateBeanNumberValuePredicate())); + new MutateOnConditionalPropertyChangeListener<>(model, mutator, model.canUpdateBeanNumberValuePredicate())); } } @@ -550,7 +550,7 @@ public class NumberEditorHandler implements UIHandler<NumberEditor> { if (numberFactories == null) { - numberFactories = new HashMap<Class<?>, NumberParserFormatter<?>>(); + numberFactories = new HashMap<>(); NumberParserFormatter<Byte> byteSupport = new NumberParserFormatter<Byte>() { @Override diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java index 7472463..05242f1 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java @@ -94,8 +94,8 @@ public class FilterableDoubleListHandler<O extends Serializable> implements UIHa public void beforeInit(FilterableDoubleList<O> ui) { this.ui = ui; - FilterableDoubleListConfig<O> config = new FilterableDoubleListConfig<O>(); - FilterableDoubleListModel<O> model = new FilterableDoubleListModel<O>(config); + FilterableDoubleListConfig<O> config = new FilterableDoubleListConfig<>(); + FilterableDoubleListModel<O> model = new FilterableDoubleListModel<>(config); ui.setContextValue(model); } @@ -331,7 +331,7 @@ public class FilterableDoubleListHandler<O extends Serializable> implements UIHa // When selected list changed, let's push it back in bean model.addPropertyChangeListener( FilterableDoubleListModel.PROPERTY_SELECTED, - new MutateOnConditionalPropertyChangeListener<FilterableDoubleListModel>(model, mutator, Predicates.<FilterableDoubleListModel>alwaysTrue())); + new MutateOnConditionalPropertyChangeListener<FilterableDoubleListModel>(model, mutator, Predicates.alwaysTrue())); } } @@ -366,7 +366,7 @@ public class FilterableDoubleListHandler<O extends Serializable> implements UIHa } }); - final JaxxFilterableListModel<O> filterModel = (JaxxFilterableListModel) ui.getModel().getUniverseModel(); + final JaxxFilterableListModel<O> filterModel = ui.getModel().getUniverseModel(); filterModel.setDecorator(this.decorator); 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 1aa2465..519e54f 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 @@ -89,17 +89,17 @@ public class FilterableDoubleListModel<O extends Serializable> extends AbstractS /** * Universe of items useables in not-selected and selected lists. */ - protected final List<O> universe = new ArrayList<O>(); + protected final List<O> universe = new ArrayList<>(); /** * Model containing the remaining available items. */ - protected final JaxxFilterableListModel<O> universeModel = new JaxxFilterableListModel<O>(); + protected final JaxxFilterableListModel<O> universeModel = new JaxxFilterableListModel<>(); /** * Model containing the selected items. */ - protected final JaxxDefaultListModel<O> selectedModel = new JaxxDefaultListModel<O>(); + protected final JaxxDefaultListModel<O> selectedModel = new JaxxDefaultListModel<>(); private final FilterableDoubleListConfig<O> config; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java index 696565d..1d08f7b 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java @@ -56,6 +56,6 @@ public class JAXXWidgetUtil extends SwingUtil { } public static <E extends Number> NumberCellEditor<E> newNumberTableCellEditor(Class<E> type, boolean useSign) { - return new NumberCellEditor<E>(type, useSign); + return new NumberCellEditor<>(type, useSign); } } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java index f6fb2b0..d1a1a11 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java @@ -50,7 +50,7 @@ public class ListSelectorModel<B> { protected ListSelectorModel() { - fromModel = new GenericListModel<B>(); + fromModel = new GenericListModel<>(); fromModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -58,7 +58,7 @@ public class ListSelectorModel<B> { } }); - toModel = new GenericListModel<B>(); + toModel = new GenericListModel<>(); toModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditorHandler.java index 0d25c02..59dfd42 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditorHandler.java @@ -78,7 +78,7 @@ public class TimeEditorHandler { } // create slider labels - Map<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>(); + Map<Integer, JLabel> labelTable = new Hashtable<>(); for (int i = 0; i < 25; i += 2) { labelTable.put(i * 60, new JLabel(i + "")); } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java index bdead8c..81e526a 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java @@ -61,16 +61,16 @@ public class BeanDoubleListModel<O> extends AbstractSerializableBean { private static final long serialVersionUID = 1L; /** List of all the available items */ - protected List<O> universe = new ArrayList<O>(); + protected List<O> universe = new ArrayList<>(); /** Model containing the remaining available items */ - protected JaxxFilterableListModel<O> universeModel = new JaxxFilterableListModel<O>(); + protected JaxxFilterableListModel<O> universeModel = new JaxxFilterableListModel<>(); /** List of the selected items */ - protected List<O> selected = new ArrayList<O>(); + protected List<O> selected = new ArrayList<>(); /** Model containing the selected items */ - protected JaxxDefaultListModel<O> selectedModel = new JaxxDefaultListModel<O>(); + protected JaxxDefaultListModel<O> selectedModel = new JaxxDefaultListModel<>(); protected boolean addEnabled; @@ -82,7 +82,7 @@ public class BeanDoubleListModel<O> extends AbstractSerializableBean { protected boolean useMultiSelect; - protected Collection<Predicate<List<O>>> canRemoveItemsPredicates = new ArrayList<Predicate<List<O>>>(); + protected Collection<Predicate<List<O>>> canRemoveItemsPredicates = new ArrayList<>(); /** * To get the selected items. diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/MaskFormatterFromConverter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/MaskFormatterFromConverter.java index ab675eb..a429e98 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/MaskFormatterFromConverter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/MaskFormatterFromConverter.java @@ -44,7 +44,7 @@ public class MaskFormatterFromConverter<O> extends MaskFormatter { public static <O> MaskFormatterFromConverter<O> newFormatter(Class<O> type, String pattern, Converter converter) throws ParseException { - return new MaskFormatterFromConverter<O>(type, pattern, converter); + return new MaskFormatterFromConverter<>(type, pattern, converter); } protected MaskFormatterFromConverter(Class<O> type, @@ -57,7 +57,7 @@ public class MaskFormatterFromConverter<O> extends MaskFormatter { @Override public String valueToString(Object value) throws ParseException { - return (String) converter.convert(String.class, value); + return converter.convert(String.class, value); } @Override diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/ActionCheckListModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/ActionCheckListModel.java index e40d205..2fd0aca 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/ActionCheckListModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/ActionCheckListModel.java @@ -48,11 +48,11 @@ public class ActionCheckListModel<T> implements CheckListModel<T> { protected final List<ListDataListener> listeners = Collections.synchronizedList( new ArrayList<ListDataListener>()); protected final CheckListModel<T> originalModel; - protected final CheckListAction<T> actionCheckAll = new CheckListAction.CheckAll<T>(); + protected final CheckListAction<T> actionCheckAll = new CheckListAction.CheckAll<>(); @SuppressWarnings("unchecked") protected final List<CheckListAction<T>> actionItems = Arrays.asList( actionCheckAll ); - protected final Set<CheckListAction<T>> checks = new HashSet<CheckListAction<T>>(); + protected final Set<CheckListAction<T>> checks = new HashSet<>(); public ActionCheckListModel( final CheckListModel<T> originalModel ) { diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckList.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckList.java index dd84d77..95d38a9 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckList.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckList.java @@ -102,7 +102,7 @@ public class CheckList<T> { * @param data */ public void setData( Collection<T> data ) { - setModel( new DefaultCheckListModel<T>(data)); + setModel(new DefaultCheckListModel<>(data)); } /** diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java index 8b608f4..12e6e90 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java @@ -43,7 +43,7 @@ public interface CheckListAction<T> { @SuppressWarnings("unchecked") @Override public void check(CheckListModel<T> model, boolean value) { - Collection<T> items = new ArrayList<T>(); + Collection<T> items = new ArrayList<>(); if (value) { for( int i=0, s=model.getSize(); i<s; i++ ) { items.add((T) model.getElementAt(i)); diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/DefaultCheckListModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/DefaultCheckListModel.java index ff6e708..9eb57b0 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/DefaultCheckListModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/DefaultCheckListModel.java @@ -55,8 +55,8 @@ public class DefaultCheckListModel<T> extends AbstractListModel implements Check private static final long serialVersionUID = 1L; - protected final List<T> data = new ArrayList<T>(); - protected final Set<T> checks = new HashSet<T>(); + protected final List<T> data = new ArrayList<>(); + protected final Set<T> checks = new HashSet<>(); public DefaultCheckListModel( Collection<? extends T> data ) { @@ -120,7 +120,7 @@ public class DefaultCheckListModel<T> extends AbstractListModel implements Check */ @Override public Collection<T> getCheckedItems() { - List<T> items = new ArrayList<T>(checks); + List<T> items = new ArrayList<>(checks); items.retainAll(data); return Collections.unmodifiableList( items ); } @@ -131,7 +131,7 @@ public class DefaultCheckListModel<T> extends AbstractListModel implements Check @Override public void setCheckedItems( Collection<T> items ) { - List<T> correctedItems = new ArrayList<T>(items); + List<T> correctedItems = new ArrayList<>(items); correctedItems.retainAll(data); checks.clear(); diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java index e317c04..9717b2f 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java @@ -62,7 +62,7 @@ public class DefaultFilterableCheckListModel<T> extends DefaultCheckListModel<T> String f = filter.toLowerCase(); - List<T> fData = new ArrayList<T>(); + List<T> fData = new ArrayList<>(); for( T o: data ) { String decorated; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java index d9065b0..060ecd7 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java @@ -45,7 +45,7 @@ public class JAXXLog4jAppender extends WriterAppender { protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); public JAXXLog4jAppender() { - events = new LinkedList<LoggingEvent>(); + events = new LinkedList<>(); logs = new StringBuilder(); } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java index 51eb5bd..ee5e01f 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java @@ -65,7 +65,7 @@ public abstract class AbstractTableFilter<T extends JTable> implements TableFilt private final T table; private final TableFilterState filterState = new TableFilterState(); - private Map<Integer, Integer> columnDistnctIntemNumbers = new HashMap<Integer, Integer>(); + private Map<Integer, Integer> columnDistnctIntemNumbers = new HashMap<>(); public AbstractTableFilter( T table ) { this.table = table; @@ -125,7 +125,7 @@ public abstract class AbstractTableFilter<T extends JTable> implements TableFilt Set<Object> set = distinctValuesForColumn(column); List<Object> result = null; if (set != null) { - result = new ArrayList<Object>(set); + result = new ArrayList<>(set); // if ( nullIndex >= 0 ) result.add(0, null); // add null to resulting collection if we had it Collections.sort(result, new Comparator<Object>() { diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java index 9600f2f..97d809a 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java @@ -109,7 +109,7 @@ public class JTableFilter extends AbstractTableFilter<JTable> { } public void modelChanged( TableModel model ) { - getTable().setRowSorter( new TableRowSorter<TableModel>( model )); + getTable().setRowSorter(new TableRowSorter<>(model)); } @Override diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java index 68da901..1ab338a 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java @@ -74,7 +74,7 @@ class TableFilterColumnPopup extends MouseAdapter { private final FilterableCheckList<Object> filterList = new FilterableCheckList(); private final JSearchTextField searchField = new JSearchTextField(); - private final Map<Integer, ColumnAttrs> colAttrs = new HashMap<Integer, ColumnAttrs>(); + private final Map<Integer, ColumnAttrs> colAttrs = new HashMap<>(); private int mColumnIndex = -1; private final TableFilter<?> filter; @@ -341,8 +341,8 @@ class TableFilterColumnPopup extends MouseAdapter { Collection<Object> distinctItems = filter.getDistinctColumnItems(mColumnIndex); if (distinctItems != null) { - DefaultFilterableCheckListModel<Object> model = new DefaultFilterableCheckListModel<Object>(distinctItems); - filterList.setModel(actionsVisible ? new FilterableActionCheckListModel<Object>(model) : model); + DefaultFilterableCheckListModel<Object> model = new DefaultFilterableCheckListModel<>(distinctItems); + filterList.setModel(actionsVisible ? new FilterableActionCheckListModel<>(model) : model); Collection<Object> checked = filter.getFilterState(mColumnIndex); // replace empty checked items with full selection diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterState.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterState.java index 610d370..f7ab0e0 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterState.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterState.java @@ -47,7 +47,7 @@ class TableFilterState implements Serializable { private static final long serialVersionUID = 1L; // no set - filter cleared; set - some kind of filtering - private final Map<Integer,Set<Object>> data = new HashMap<Integer,Set<Object>>(); + private final Map<Integer,Set<Object>> data = new HashMap<>(); /** * Clears filtering for specific column @@ -67,7 +67,7 @@ class TableFilterState implements Serializable { private Set<Object> prepareValueSet( int column ) { Set<Object> vals = data.get(column); if ( vals == null ) { - vals = new HashSet<Object>(); + vals = new HashSet<>(); data.put(column, vals); } return vals; @@ -107,7 +107,7 @@ class TableFilterState implements Serializable { public Collection<Object> getValues( int column ) { Set<Object> vals = data.get(column); - return vals == null? Collections.<Object>emptySet(): vals; + return vals == null? Collections.emptySet(): vals; } /** diff --git a/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateConverterTest.java b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateConverterTest.java index 542dc9d..f8e43f0 100644 --- a/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateConverterTest.java +++ b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateConverterTest.java @@ -69,7 +69,7 @@ public class DmdCoordinateConverterTest { // String -> DmdCoordinate - actualCoordinate = (DmdCoordinate) converter.convert(DmdCoordinate.class, expectedString); + actualCoordinate = converter.convert(DmdCoordinate.class, expectedString); Assert.assertNotNull(actualCoordinate); Assert.assertEquals(actualCoordinate.isSign(), expectedCoordinate.isSign()); Assert.assertEquals(actualCoordinate.getDegree(), expectedCoordinate.getDegree()); @@ -78,21 +78,21 @@ public class DmdCoordinateConverterTest { // DmdCoordinate -> String - actualStr = (String) converter.convert(String.class, expectedCoordinate); + actualStr = converter.convert(String.class, expectedCoordinate); Assert.assertNotNull(actualStr); Assert.assertEquals(expectedString, actualStr); // String -> String - actualStr = (String) converter.convert(String.class, expectedString); + actualStr = converter.convert(String.class, expectedString); Assert.assertNotNull(actualStr); Assert.assertEquals(expectedString, actualStr); // DmdCoordinate -> DmdCoordinate - actualCoordinate = (DmdCoordinate) converter.convert(DmdCoordinate.class, expectedCoordinate); + actualCoordinate = converter.convert(DmdCoordinate.class, expectedCoordinate); Assert.assertNotNull(actualCoordinate); Assert.assertEquals(actualCoordinate.isSign(), expectedCoordinate.isSign()); Assert.assertEquals(actualCoordinate.getDegree(), expectedCoordinate.getDegree()); diff --git a/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateConverterTest.java b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateConverterTest.java index 0a11097..3938a9f 100644 --- a/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateConverterTest.java +++ b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateConverterTest.java @@ -72,7 +72,7 @@ public class DmsCoordinateConverterTest { // String -> DmsCoordinate - actualCoordinate = (DmsCoordinate) converter.convert(DmsCoordinate.class, expectedString); + actualCoordinate = converter.convert(DmsCoordinate.class, expectedString); Assert.assertNotNull(actualCoordinate); Assert.assertEquals(actualCoordinate.isSign(), expectedCoordinate.isSign()); Assert.assertEquals(actualCoordinate.getDegree(), expectedCoordinate.getDegree()); @@ -81,21 +81,21 @@ public class DmsCoordinateConverterTest { // DmsCoordinate -> String - actualStr = (String) converter.convert(String.class, expectedCoordinate); + actualStr = converter.convert(String.class, expectedCoordinate); Assert.assertNotNull(actualStr); Assert.assertEquals(expectedString, actualStr); // String -> String - actualStr = (String) converter.convert(String.class, expectedString); + actualStr = converter.convert(String.class, expectedString); Assert.assertNotNull(actualStr); Assert.assertEquals(expectedString, actualStr); // DmsCoordinate -> DmsCoordinate - actualCoordinate = (DmsCoordinate) converter.convert(DmsCoordinate.class, expectedCoordinate); + actualCoordinate = converter.convert(DmsCoordinate.class, expectedCoordinate); Assert.assertNotNull(actualCoordinate); Assert.assertEquals(actualCoordinate.isSign(), expectedCoordinate.isSign()); Assert.assertEquals(actualCoordinate.getDegree(), expectedCoordinate.getDegree()); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.