This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 8d65ee5be2354a5ece07e4c3a926608e09253c8a Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 18:30:01 2017 +0100 Improve i18n widgets (See #4119) --- .../java/org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx | 8 -------- .../org/nuiton/jaxx/widgets/i18n/I18nEditorHandler.java | 17 ++++++++++------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx b/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx index dd53525..bec0fc1 100644 --- a/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx +++ b/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx @@ -46,8 +46,6 @@ static org.nuiton.i18n.I18n.n </import> - <I18nEditorHandler id='handler' constructorParams='this'/> - <String id='selectedToolTipText' javaBean='null'/> <String id='notSelectedToolTipText' javaBean='null'/> @@ -104,12 +102,6 @@ public static final String SHOW_POPUP_TEXT_PROPERTY = "showPopupText"; public static final String POPUP_BORDER_PROPERTY = "popupBorder"; public static final String POPUP_VISIBLE_PROPERTY = "popupVisible"; - - -void $afterCompleteSetup() { - handler.$afterCompleteSetup(); -} - @Override public void propertyChange(PropertyChangeEvent evt) { handler.propertyChange(evt); diff --git a/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditorHandler.java b/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditorHandler.java index 9c623bc..0250daa 100644 --- a/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditorHandler.java +++ b/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditorHandler.java @@ -24,6 +24,7 @@ package org.nuiton.jaxx.widgets.i18n; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import javax.swing.Icon; @@ -48,15 +49,11 @@ import java.util.Locale; * @author Tony Chemit - dev@tchemit.fr * @since 2.0 */ -public class I18nEditorHandler implements PropertyChangeListener, ActionListener { +public class I18nEditorHandler implements PropertyChangeListener, ActionListener, UIHandler<I18nEditor> { private static final Log log = LogFactory.getLog(I18nEditorHandler.class); - protected final I18nEditor ui; - - public I18nEditorHandler(I18nEditor ui) { - this.ui = ui; - } + protected I18nEditor ui; public static final String DEFAULT_SELECTED_TOOLTIP = I18n.n("i18neditor.selected"); @@ -237,7 +234,13 @@ public class I18nEditorHandler implements PropertyChangeListener, ActionListener } }; - void $afterCompleteSetup() { + @Override + public void beforeInit(I18nEditor ui) { + this.ui = ui; + } + + @Override + public void afterInit(I18nEditor ui) { ui.addPropertyChangeListener(this); } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.