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 3146d630f5c7713e4e00ee02fc96246fd5971ad4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 14:46:05 2016 +0100 La fonctionnalité «Accéder à la marée» (ou route ou activité) ne fonctionne plus (fixes #8729) --- .../swing/ui/content/list/ContentListUIHandler.java | 17 +++++++++-------- .../swing/ui/content/list/ContentListUIModel.java | 4 ++-- .../ui/content/list/impl/longline/TripLonglinesUI.jaxx | 2 +- .../swing/ui/content/list/impl/seine/TripSeinesUI.jaxx | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java index 1593a80..96c60b0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -23,12 +23,13 @@ package fr.ird.observe.application.swing.ui.content.list; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; @@ -43,6 +44,7 @@ import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.ListCellRenderer; +import javax.swing.SwingUtilities; import java.awt.Color; import java.awt.Component; import java.awt.event.MouseEvent; @@ -155,12 +157,10 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto> e model.setData(data); - if (!model.isEmpty()) { - - // select first data - getUi().getListSelectionModel().setSelectionInterval(0, 0); - - } + SwingUtilities.invokeLater(() -> { + getUi().getListSelectionModel().clearSelection(); +// getUi().getGotoOpenChild().setEnabled(false); + }); // finalize openUI with specified code finalizeOpenUI(); @@ -283,6 +283,7 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto> e comp.setIcon(icon); Color color = treeRenderer.getNavigationTextColor(node); comp.setForeground(color); + comp.setBackground(null); return comp; } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java index d861dba..64b0747 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java @@ -105,8 +105,8 @@ public abstract class ContentListUIModel<E extends IdDto, C extends DataDto> ext log.debug("New selected datas : " + selectedDatas); } firePropertyChange(PROPERTY_SELECTED_DATAS, old, selectedDatas); - firePropertyChange(PROPERTY_ONE_SELECTED_DATA, oldOneSelectedData, isOneSelectedData()); - firePropertyChange(PROPERTY_ONE_OR_MORE_SELECTED_DATA, oldOneOrMoreSelectedData, isOneOrMoreSelectedData()); + firePropertyChange(PROPERTY_ONE_SELECTED_DATA, null, isOneSelectedData()); + firePropertyChange(PROPERTY_ONE_OR_MORE_SELECTED_DATA, null, isOneOrMoreSelectedData()); } public boolean isOneSelectedData() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx index 491bdbc..729ab3e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx @@ -53,7 +53,7 @@ <JButton id='moveSelectedChildren'/> <!-- extra actions --> - <Table id="extraActions" fill='both' weightx='1' weighty='1' insets='0'> + <Table id="extraActions" fill='both' weightx='1' weighty='1' insets='2'> <row weighty="1" weightx="1"> <cell> <JButton id='gotoOpenActivity' styleClass='gotoOpenActivity'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx index 2196cd3..83d1be7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx @@ -55,7 +55,7 @@ <JButton id='moveSelectedChildren'/> <!-- extra actions --> - <Table id="extraActions" fill='both' weightx='1' weighty='1' insets='0'> + <Table id="extraActions" fill='both' weightx='1' weighty='1' insets='2'> <row weighty="1" weightx="1"> <cell> <JButton id='gotoOpenRoute' styleClass='gotoOpenRoute'/> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.