Author: tchemit Date: 2012-08-01 15:14:59 +0200 (Wed, 01 Aug 2012) New Revision: 2467 Url: http://nuiton.org/repositories/revision/jaxx/2467 Log: fixes #2221: Do not show sort property to change if there is only one property available in BeanUI api Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2012-08-01 12:22:37 UTC (rev 2466) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2012-08-01 13:14:59 UTC (rev 2467) @@ -96,7 +96,7 @@ actionIcon="bean-sort-down" text='bean.sort.down' selected='{isReverseSort()}'/> - <JSeparator/> + <JSeparator id='popupSeparator'/> <JLabel id='popupLabel'/> <JSeparator/> </JPopupMenu> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2012-08-01 12:22:37 UTC (rev 2466) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2012-08-01 13:14:59 UTC (rev 2467) @@ -142,6 +142,7 @@ ui.getI18nPrefix(), ui.getPopupTitleText(), indexes, + ui.getPopupSeparator(), ui.getPopupLabel(), ui.getSortUp(), ui.getSortDown(), Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2012-08-01 12:22:37 UTC (rev 2466) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2012-08-01 13:14:59 UTC (rev 2467) @@ -89,8 +89,7 @@ actionIcon="bean-sort-down" text='bean.sort.down' selected='{isReverseSort()}'/> - <JSeparator/> - + <JSeparator id='popupSeparator'/> <JLabel id='popupLabel'/> </JPopupMenu> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2012-08-01 12:22:37 UTC (rev 2466) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2012-08-01 13:14:59 UTC (rev 2467) @@ -113,6 +113,7 @@ ui.getI18nPrefix(), ui.getPopupTitleText(), indexes, + ui.getPopupSeparator(), ui.getPopupLabel(), ui.getSortUp(), ui.getSortDown(), Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2012-08-01 12:22:37 UTC (rev 2466) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2012-08-01 13:14:59 UTC (rev 2467) @@ -48,6 +48,7 @@ import javax.swing.JLabel; import javax.swing.JPopupMenu; import javax.swing.JRadioButtonMenuItem; +import javax.swing.JSeparator; import javax.swing.SwingUtilities; import javax.swing.text.Document; import javax.swing.text.JTextComponent; @@ -335,6 +336,7 @@ String i18nPrefix, String title, ButtonGroup indexes, + JSeparator popupSeparator, JLabel popupLabel, AbstractButton sortUp, AbstractButton sortDown, @@ -350,21 +352,25 @@ JPopupMenu popup = getPopup(); //Container container = ui.getIndexesContainer(); - for (int i = 0, max = decorator.getNbContext(); i < max; i++) { - String property = i18nPrefix + decorator.getProperty(i); - String propertyI18n = _(property); - JRadioButtonMenuItem button = new JRadioButtonMenuItem(propertyI18n); - button.putClientProperty(JAXXButtonGroup.BUTTON8GROUP_CLIENT_PROPERTY, indexes); - button.putClientProperty(JAXXButtonGroup.VALUE_CLIENT_PROPERTY, i); - popup.add(button); - if (selectedTip != null) { - button.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, _(selectedTip, propertyI18n)); + + int nbContext = decorator.getNbContext(); + if (nbContext>1) { + for (int i = 0; i < nbContext; i++) { + String property = i18nPrefix + decorator.getProperty(i); + String propertyI18n = _(property); + JRadioButtonMenuItem button = new JRadioButtonMenuItem(propertyI18n); + button.putClientProperty(JAXXButtonGroup.BUTTON8GROUP_CLIENT_PROPERTY, indexes); + button.putClientProperty(JAXXButtonGroup.VALUE_CLIENT_PROPERTY, i); + popup.add(button); + if (selectedTip != null) { + button.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, _(selectedTip, propertyI18n)); + } + if (notSelectedTip != null) { + button.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, _(notSelectedTip, propertyI18n)); + } + button.setSelected(false); + indexes.add(button); } - if (notSelectedTip != null) { - button.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, _(notSelectedTip, propertyI18n)); - } - button.setSelected(false); - indexes.add(button); } if (title == null) { // use default popup title @@ -389,6 +395,10 @@ sortUp.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, _("bean.sort.up.tip")); sortUp.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, _("bean.sort.up.toSelect.tip")); + if (nbContext < 2) { + getPopup().remove(popupSeparator); + getPopup().remove(popupLabel); + } popupLabel.setText(title); getPopup().setLabel(title); getPopup().invalidate();
participants (1)
-
tchemit＠users.nuiton.org