This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit c4b0e75e2edccc86c497ad9719ffc772587beed2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 2 11:48:34 2015 +0200 Fix merges --- .../ui/content/ref/ContentReferenceUIHandler.java | 24 ++++++++++++++++++---- .../ui/content/table/ContentTableUIHandler.java | 7 +++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 76d2a01..08859b0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -21,8 +21,8 @@ */ package fr.ird.observe.ui.content.ref; -import fr.ird.observe.ObserveContext; -import fr.ird.observe.business.ObserveServiceHelper; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.validation.ValidationContext; @@ -52,10 +52,24 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import javax.swing.*; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.JToolBar; +import javax.swing.ListModel; +import javax.swing.SpringLayout; +import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; import javax.swing.table.TableCellRenderer; -import java.awt.*; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Font; import java.beans.Introspector; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -80,6 +94,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content LogFactory.getLog(ContentReferenceUIHandler.class); final private Runnable revalidate = new Runnable() { + @Override public void run() { @@ -403,6 +418,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content ui.getViewLayout().addPropertyChangeListener( CardLayout2Ext.SELECTED_PROPERTY_NAME, new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java index c0a8b00..9302dd7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java @@ -37,14 +37,17 @@ import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.content.ObserveContentUI; import fr.ird.observe.ui.tree.ObserveNode; +import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.ListSelectionModel; +import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.*; +import java.awt.Rectangle; import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashSet; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.