This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 453e8a3a6b2c6890342c07eb79f186318bee96e1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jan 16 15:27:19 2015 +0100 fixes #3615: Add a label on universe and selected lists --- .../jaxx/widgets/select/FilterableDoubleList.jaxx | 7 ++-- .../widgets/select/FilterableDoubleListConfig.java | 39 ++++++++++++++++++++++ .../select/FilterableDoubleListHandler.java | 14 +++++++- 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx index 7d4156d..8a3f7a5 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx @@ -99,7 +99,7 @@ </row> <row> <cell weightx='0.5' weighty='1' fill='both'> - <JScrollPane onFocusGained='universeList.requestFocus()'> + <JScrollPane id='universeListPane' onFocusGained='universeList.requestFocus()'> <!-- List of all the remaining available elements --> <JList id='universeList' styleClass='enabled' onFocusGained='handler.selectFirstRowIfNoSelection(event)' @@ -116,7 +116,7 @@ </cell> <cell weightx='0.5' weighty='1' fill='both'> - <JScrollPane onFocusGained='selectedList.requestFocus()'> + <JScrollPane id='selectedListPane' onFocusGained='selectedList.requestFocus()'> <!-- List of the selected elements --> <JList id='selectedList' styleClass='enabled' onFocusGained='handler.selectFirstRowIfNoSelection(event)' @@ -143,6 +143,9 @@ public void setBeanType(Class<O> beanType) { model.getConfig().setBeanType(beanT public void setProperty(String property) { model.getConfig().setProperty(property); } public void setUseMultiSelect(boolean useMultiSelect) { model.getConfig().setUseMultiSelect(useMultiSelect); } public void setI18nPrefix(String i18nPrefix) { model.getConfig().setI18nPrefix(i18nPrefix); } +public void setShowListLabel(boolean showListLabel) { model.getConfig().setShowListLabel(showListLabel); } +public void setUniverseLabel(String universeLabel) { model.getConfig().setUniverseLabel(universeLabel); } +public void setSelectedLabel(String selectedLabel) { model.getConfig().setSelectedLabel(selectedLabel); } // Model delegate methods public void setBean(Serializable bean) { model.setBean(bean); } diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListConfig.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListConfig.java index c910980..77d1a1b 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListConfig.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListConfig.java @@ -56,6 +56,21 @@ public class FilterableDoubleListConfig<O extends Serializable> implements Seria */ protected String i18nPrefix; + /** + * {@code true} to see labels above lists. + */ + protected boolean showListLabel; + + /** + * Optional universe list label. + */ + protected String universeLabel; + + /** + * Optional selected list label. + */ + protected String selectedLabel; + public Class<O> getBeanType() { return beanType; } @@ -87,4 +102,28 @@ public class FilterableDoubleListConfig<O extends Serializable> implements Seria public void setI18nPrefix(String i18nPrefix) { this.i18nPrefix = i18nPrefix; } + + public boolean isShowListLabel() { + return showListLabel; + } + + public void setShowListLabel(boolean showListLabel) { + this.showListLabel = showListLabel; + } + + public String getUniverseLabel() { + return universeLabel; + } + + public void setUniverseLabel(String universeLabel) { + this.universeLabel = universeLabel; + } + + public String getSelectedLabel() { + return selectedLabel; + } + + public void setSelectedLabel(String selectedLabel) { + this.selectedLabel = selectedLabel; + } } 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 ab712bd..c7880dc 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 @@ -43,6 +43,7 @@ import org.nuiton.util.beans.BeanUtil; import javax.swing.AbstractButton; import javax.swing.JComponent; +import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPopupMenu; import javax.swing.ListSelectionModel; @@ -93,7 +94,6 @@ 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); ui.setContextValue(model); @@ -336,6 +336,18 @@ public class FilterableDoubleListHandler<O extends Serializable> implements UIHa } } + if (config.isShowListLabel()) { + + JLabel universeListHeader = new JLabel(); + universeListHeader.setText(config.getUniverseLabel()); + ui.getUniverseListPane().setColumnHeaderView(universeListHeader); + + JLabel selectedListHeader = new JLabel(); + selectedListHeader.setText(config.getSelectedLabel()); + ui.getSelectedListPane().setColumnHeaderView(selectedListHeader); + + } + ui.getModel().setUniverse(universe); ui.getModel().setSelected(selected); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.