This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 7d7cd08179f0d00fd1c382fa9b8ccddfcc3209c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 11:17:58 2016 +0200 amélioration de code (lambda,...) --- .../observe/ui/content/ContentUIInitializer.java | 128 +++++---------------- 1 file changed, 30 insertions(+), 98 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 8915c46..04806b7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -157,15 +157,15 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E public static <B> ComboBoxCellEditor newDataColumnEditor(List<B> data, Decorator<B> decorator) { - JComboBox comboBox = new JComboBox(); + JComboBox<B> comboBox = new JComboBox<>(); return newDataColumnEditor(comboBox, data, decorator); } - public static <B> ComboBoxCellEditor newDataColumnEditor(JComboBox comboBox, List<B> data, Decorator<B> decorator) { + public static <B> ComboBoxCellEditor newDataColumnEditor(JComboBox<B> comboBox, List<B> data, Decorator<B> decorator) { - ListCellRenderer renderer = new DecoratorListCellRenderer(decorator); + ListCellRenderer<B> renderer = new DecoratorListCellRenderer(decorator); comboBox.setRenderer(renderer); prepareComboBoxData(comboBox, data); @@ -327,13 +327,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_RESET_PROPERTY_NAME); if (propertyName != null) { - editor.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - JavaBeanObjectUtil.setProperty(getBean(), propertyName, null); - } - }); + editor.addActionListener(e -> JavaBeanObjectUtil.setProperty(getBean(), propertyName, null)); } return; @@ -424,11 +418,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E editor.init(); if (isAutoSelectOnFocus(editor)) { - JSpinner.DateEditor hourEditor = (JSpinner.DateEditor) editor.getHourEditor().getEditor(); - addAutoSelectOnFocus(hourEditor.getTextField()); - - JSpinner.DateEditor minuteEditor = (JSpinner.DateEditor) editor.getMinuteEditor().getEditor(); - addAutoSelectOnFocus(minuteEditor.getTextField()); + addAutoSelectOnFocus((JSpinner.DateEditor) editor.getHourEditor().getEditor()); + addAutoSelectOnFocus((JSpinner.DateEditor) editor.getMinuteEditor().getEditor()); } } @@ -440,15 +431,16 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E editor.init(); if (isAutoSelectOnFocus(editor)) { - JSpinner.DateEditor hourEditor = (JSpinner.DateEditor) editor.getHourEditor().getEditor(); - addAutoSelectOnFocus(hourEditor.getTextField()); - - JSpinner.DateEditor minuteEditor = (JSpinner.DateEditor) editor.getMinuteEditor().getEditor(); - addAutoSelectOnFocus(minuteEditor.getTextField()); + addAutoSelectOnFocus((JSpinner.DateEditor) editor.getHourEditor().getEditor()); + addAutoSelectOnFocus((JSpinner.DateEditor) editor.getMinuteEditor().getEditor()); } } + private void addAutoSelectOnFocus(JSpinner.DateEditor hourEditor) { + addAutoSelectOnFocus(hourEditor.getTextField()); + } + protected void init(CoordinatesEditor editor) { if (log.isDebugEnabled()) { log.debug("init coordinates editor " + editor.getName()); @@ -494,15 +486,11 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { - editor.addItemListener(new ItemListener() { - - @Override - public void itemStateChanged(ItemEvent event) { - if (event.getStateChange() == ItemEvent.SELECTED) { + editor.addItemListener(event -> { + if (event.getStateChange() == ItemEvent.SELECTED) { - Boolean newValue = ((BooleanEditor) event.getSource()).getBooleanValue(); - JavaBeanObjectUtil.setProperty(getBean(), propertyName, newValue); - } + Boolean newValue = ((BooleanEditor) event.getSource()).getBooleanValue(); + JavaBeanObjectUtil.setProperty(getBean(), propertyName, newValue); } }); } @@ -531,13 +519,9 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { - editor.addItemListener(new ItemListener() { - - @Override - public void itemStateChanged(ItemEvent event) { - Boolean newValue = ((JCheckBox) event.getSource()).isSelected(); - JavaBeanObjectUtil.setProperty(getBean(), propertyName, newValue); - } + editor.addItemListener(event -> { + Boolean newValue = ((JCheckBox) event.getSource()).isSelected(); + JavaBeanObjectUtil.setProperty(getBean(), propertyName, newValue); }); } } @@ -556,25 +540,21 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E final String propertyName = (String) picker.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { - picker.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - JXDatePicker source = (JXDatePicker) e.getSource(); - Date date = source.getDate(); - JavaBeanObjectUtil.setProperty(getBean(), propertyName, date); - } + picker.addActionListener(e -> { + JXDatePicker source = (JXDatePicker) e.getSource(); + Date date = source.getDate(); + JavaBeanObjectUtil.setProperty(getBean(), propertyName, date); }); } } - protected <E extends Enum<E>> void init(EnumEditor<E> editor) { + protected <B extends Enum<B>> void init(EnumEditor<B> editor) { if (log.isDebugEnabled()) { log.debug("init enumEditor editor " + editor.getName()); } - ImmutableMap.Builder<E, String> labelsBuilder = ImmutableMap.builder(); - for (E e : EnumSet.allOf(editor.getType())) { + ImmutableMap.Builder<B, String> labelsBuilder = ImmutableMap.builder(); + for (B e : EnumSet.allOf(editor.getType())) { String label = I18nEnumUtil.getLabel(e); labelsBuilder.put(e, label); } @@ -591,13 +571,9 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E @Override public void focusGained(final FocusEvent e) { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - JTextField source = (JTextField) e.getSource(); - source.selectAll(); - } + SwingUtilities.invokeLater(() -> { + JTextField source = (JTextField) e.getSource(); + source.selectAll(); }); } @@ -829,51 +805,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E comp.setToolTipText(tip); return comp; } -// -// @Override -// public Component getListCellRendererComponent(JList<? extends D> list, -// D value, -// int index, -// boolean isSelected, -// boolean cellHasFocus) { -// JComponent comp; -// comp = (JComponent) delegate.getListCellRendererComponent( -// list, -// value, -// index, -// isSelected, -// cellHasFocus); -// if (normalColor == null) { -// // premiere fois, on intialise la couleur dite normale -// normalColor = comp.getForeground(); -// } -// -// String tip = null; -// -// // par defaut, on utilise la couleur normale -// Color col = normalColor; -// if (value != null) { -// -// boolean enabled = true; -// -// if (value instanceof ReferentialReference<?>) { -// -// ReferentialReference e = (ReferentialReference) value; -// enabled = e.isEnabled(); -// -// } -// -// if (!enabled) { -// // l'entite est desactivee -// // on la grise pour bien la differencier -// col = disableColor; -// tip = t("observe.common.obsolete.entity", ((JLabel) comp).getText()); -// } -// } -// comp.setForeground(col); -// comp.setToolTipText(tip); -// return comp; -// } + } private static class ComboBoxListCellRenderer<E> implements ListCellRenderer<E> { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.