August 2012 - Jaxx-commits - mailman.cloud.codelutin.com

r2476 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer
by tchemit＠users.nuiton.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 14:20:21 +0200 (Wed, 08 Aug 2012) New Revision: 2476 Url: http://nuiton.org/repositories/revision/jaxx/2476 Log: fixes #2239: Introduce a ClassTableCellRenderer Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ClassTableCellRenderer.java Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ClassTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ClassTableCellRenderer.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ClassTableCellRenderer.java 2012-08-08 12:20:21 UTC (rev 2476) @@ -0,0 +1,60 @@ +package jaxx.runtime.swing.renderer; +/* + * #%L + * JAXX :: Runtime + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import javax.swing.JTable; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellRenderer; +import java.awt.Component; + +/** + * Table cell renderer for a {@link Class} + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.4 + */ +public class ClassTableCellRenderer implements TableCellRenderer { + + protected final TableCellRenderer defaultDelegate; + + public ClassTableCellRenderer() { + this.defaultDelegate = new DefaultTableCellRenderer(); + } + + public ClassTableCellRenderer(TableCellRenderer defaultDelegate) { + this.defaultDelegate = defaultDelegate; + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + + return defaultDelegate.getTableCellRendererComponent( + table, + value == null ? null : ((Class<?>) value).getName(), + isSelected, + hasFocus, + row, + column); + } +} Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ClassTableCellRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2475 - in trunk: jaxx-maven-plugin/src/main/resources jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer
by tchemit＠users.nuiton.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 10:50:22 +0200 (Wed, 08 Aug 2012) New Revision: 2475 Url: http://nuiton.org/repositories/revision/jaxx/2475 Log: add missing svn properties and license headers Modified: trunk/jaxx-maven-plugin/src/main/resources/logback-test.xml trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java Modified: trunk/jaxx-maven-plugin/src/main/resources/logback-test.xml =================================================================== --- trunk/jaxx-maven-plugin/src/main/resources/logback-test.xml 2012-08-08 08:50:04 UTC (rev 2474) +++ trunk/jaxx-maven-plugin/src/main/resources/logback-test.xml 2012-08-08 08:50:22 UTC (rev 2475) @@ -2,25 +2,24 @@  Property changes on: trunk/jaxx-maven-plugin/src/main/resources/logback-test.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java 2012-08-08 08:50:04 UTC (rev 2474) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java 2012-08-08 08:50:22 UTC (rev 2475) @@ -2,8 +2,8 @@ /* * #%L * JAXX :: Runtime - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2474 - trunk
by tchemit＠users.nuiton.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 10:50:04 +0200 (Wed, 08 Aug 2012) New Revision: 2474 Url: http://nuiton.org/repositories/revision/jaxx/2474 Log: fixes #2236: updates to nuiton-utils 2.5.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-07 12:35:10 UTC (rev 2473) +++ trunk/pom.xml 2012-08-08 08:50:04 UTC (rev 2474) @@ -117,7 +117,7 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.5.2</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <eugeneVersion>2.4.2</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion>

1 0

r2473 - trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 07 Aug '12

07 Aug '12

Author: tchemit Date: 2012-08-07 14:35:10 +0200 (Tue, 07 Aug 2012) New Revision: 2473 Url: http://nuiton.org/repositories/revision/jaxx/2473 Log: fix tests build Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Evolution74Test.java trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java 2012-08-07 07:50:18 UTC (rev 2472) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java 2012-08-07 12:35:10 UTC (rev 2473) @@ -26,6 +26,8 @@ package org.nuiton.jaxx.plugin; import jaxx.runtime.context.DefaultJAXXContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.logging.SystemStreamLog; @@ -39,6 +41,9 @@ public class CompilerTest extends JaxxBaseTest { + /** Logger. */ + private static final Log log = LogFactory.getLog(CompilerTest.class); + @Test public void InnerClasses() throws Exception { getMojo().execute(); Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java 2012-08-07 07:50:18 UTC (rev 2472) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java 2012-08-07 12:35:10 UTC (rev 2473) @@ -25,6 +25,8 @@ package org.nuiton.jaxx.plugin; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.logging.SystemStreamLog; @@ -35,6 +37,11 @@ public class CompilerValidatorTest extends JaxxBaseTest { + /** Logger. */ + private static final Log log = + LogFactory.getLog(CompilerValidatorTest.class); + + @Test public void ValidatorOk() throws Exception { getMojo().execute(); Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Evolution74Test.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Evolution74Test.java 2012-08-07 07:50:18 UTC (rev 2472) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Evolution74Test.java 2012-08-07 12:35:10 UTC (rev 2473) @@ -25,6 +25,8 @@ package org.nuiton.jaxx.plugin; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.maven.plugin.MojoExecutionException; @@ -34,6 +36,9 @@ public class Evolution74Test extends JaxxBaseTest { + /** Logger. */ + private static final Log log = LogFactory.getLog(Evolution74Test.class); + @Test public void ok() throws Exception { GenerateMojo mojo = getMojo(); Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-08-07 07:50:18 UTC (rev 2472) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-08-07 12:35:10 UTC (rev 2473) @@ -31,6 +31,8 @@ import jaxx.compiler.decorators.DefaultCompiledObjectDecorator; import jaxx.runtime.context.DefaultJAXXContext; import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.plugin.AbstractMojoTest; import java.io.File; @@ -51,6 +53,9 @@ */ public abstract class JaxxBaseTest extends AbstractMojoTest<GenerateMojo> { + /** Logger. */ + private static final Log log = LogFactory.getLog(JaxxBaseTest.class); + @Override protected String getGoalName(String methodName) { return "generate";

1 0

r2472 - trunk
by tchemit＠users.nuiton.org 07 Aug '12

07 Aug '12

Author: tchemit Date: 2012-08-07 09:50:18 +0200 (Tue, 07 Aug 2012) New Revision: 2472 Url: http://nuiton.org/repositories/revision/jaxx/2472 Log: Update mavenpom4redmine to 3.3.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-06 12:17:07 UTC (rev 2471) +++ trunk/pom.xml 2012-08-07 07:50:18 UTC (rev 2472) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.4</version> + <version>3.3.5</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2471 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing: editor renderer
by tchemit＠users.nuiton.org 06 Aug '12

06 Aug '12

Author: tchemit Date: 2012-08-06 14:17:07 +0200 (Mon, 06 Aug 2012) New Revision: 2471 Url: http://nuiton.org/repositories/revision/jaxx/2471 Log: refs #2227: Make a color editor and its renderer (reformat code, add javadoc, override annotation, ...) Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java 2012-08-06 11:29:21 UTC (rev 2470) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java 2012-08-06 12:17:07 UTC (rev 2471) @@ -24,23 +24,37 @@ */ import javax.swing.AbstractCellEditor; -import javax.swing.table.TableCellEditor; import javax.swing.JButton; import javax.swing.JColorChooser; import javax.swing.JDialog; import javax.swing.JTable; +import javax.swing.table.TableCellEditor; import java.awt.Color; import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +/** + * A {@link Color} cell editor. + * + * @author mallon <mallon(a)codelutin.com> + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.4 + */ public class ColorCellEditor extends AbstractCellEditor implements TableCellEditor, ActionListener { - Color currentColor; - JButton button; - JColorChooser colorChooser; - JDialog dialog; + + private static final long serialVersionUID = 1L; + + protected Color currentColor; + + protected JButton button; + + protected JColorChooser colorChooser; + + protected JDialog dialog; + protected static final String EDIT = "edit"; public ColorCellEditor() { @@ -56,17 +70,18 @@ //Set up the dialog that the button brings up. colorChooser = new JColorChooser(); dialog = JColorChooser.createDialog(button, - "", - true, //modal - colorChooser, - this, //OK button handler - null); //no CANCEL button handler + "", + true, //modal + colorChooser, + this, //OK button handler + null); //no CANCEL button handler } /** * Handles events from the editor button and from * the dialog's OK button. */ + @Override public void actionPerformed(ActionEvent e) { if (EDIT.equals(e.getActionCommand())) { //The user has clicked the cell, so @@ -83,10 +98,10 @@ } } - //Implement the one CellEditor method that AbstractCellEditor doesn't. - public Color getCellEditorValue() { - //String currentColorHexa = toHex(currentColor.getRed(), currentColor.getGreen(), currentColor.getBlue()); - return currentColor; + @Override + public Color getCellEditorValue() { + //String currentColorHexa = toHex(currentColor.getRed(), currentColor.getGreen(), currentColor.getBlue()); + return currentColor; } protected static String toHex(int r, int g, int b) { @@ -102,13 +117,13 @@ } - //Implement the one method defined by TableCellEditor. + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - currentColor = (Color)value; + currentColor = (Color) value; return button; } } \ No newline at end of file Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java 2012-08-06 11:29:21 UTC (rev 2470) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java 2012-08-06 12:17:07 UTC (rev 2471) @@ -24,7 +24,6 @@ */ import javax.swing.JButton; -import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; import java.awt.Color; @@ -41,8 +40,13 @@ protected JButton button = new JButton(); @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - button.setBackground((Color)value); + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + button.setBackground((Color) value); return button; } }

1 0

r2470 - trunk
by tchemit＠users.nuiton.org 06 Aug '12

06 Aug '12

Author: tchemit Date: 2012-08-06 13:29:21 +0200 (Mon, 06 Aug 2012) New Revision: 2470 Url: http://nuiton.org/repositories/revision/jaxx/2470 Log: fixes #2226: Updates to swingx 1.6.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-06 08:12:22 UTC (rev 2469) +++ trunk/pom.xml 2012-08-06 11:29:21 UTC (rev 2470) @@ -122,7 +122,7 @@ <eugeneVersion>2.4.2</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> - <swingXVersion>1.6.3</swingXVersion> + <swingXVersion>1.6.4</swingXVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>

1 0

r2469 - trunk
by sletellier＠users.nuiton.org 06 Aug '12

06 Aug '12

Author: sletellier Date: 2012-08-06 10:12:22 +0200 (Mon, 06 Aug 2012) New Revision: 2469 Url: http://nuiton.org/repositories/revision/jaxx/2469 Log: Complete register to MasterBranch.com : mb:5923519d-c62a-428b-98c6-9a7310a18c86 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-01 13:45:53 UTC (rev 2468) +++ trunk/pom.xml 2012-08-06 08:12:22 UTC (rev 2469) @@ -106,7 +106,6 @@ </developer> </developers> - <name>JAXX</name> <description>JAXX Project</description> <inceptionYear>2008</inceptionYear> @@ -154,7 +153,6 @@ <dependencies>  - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -330,7 +328,6 @@ </dependency>  - <dependency> <groupId>com.sun</groupId> <artifactId>dt</artifactId> @@ -346,7 +343,6 @@ </dependency>  - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> @@ -369,7 +365,6 @@ </dependency>  - <dependency> <groupId>org.swinglabs</groupId> <artifactId>jxlayer</artifactId>

1 0

r2468 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer
by maven-release＠users.nuiton.org 01 Aug '12

01 Aug '12

Author: maven-release Date: 2012-08-01 15:45:53 +0200 (Wed, 01 Aug 2012) New Revision: 2468 Url: http://nuiton.org/repositories/revision/jaxx/2468 Log: add missing file header Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java 2012-08-01 13:14:59 UTC (rev 2467) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java 2012-08-01 13:45:53 UTC (rev 2468) @@ -1,4 +1,27 @@ package jaxx.runtime.swing.renderer; +/* + * #%L + * JAXX :: Runtime + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ import javax.swing.JButton; import javax.swing.JComponent;

1 0

r2467 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 01 Aug '12

01 Aug '12

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();

1 0