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 f79f74b717ab6c986d9f1af87c1ac096b45d1265 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 18:23:48 2017 +0100 Improve font widgets (See #4119) --- .../org/nuiton/jaxx/widgets/font/FontSizor.jaxx | 8 +------ .../nuiton/jaxx/widgets/font/FontSizorHandler.java | 26 ++++++++++------------ 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/jaxx-widgets-font/src/main/java/org/nuiton/jaxx/widgets/font/FontSizor.jaxx b/jaxx-widgets-font/src/main/java/org/nuiton/jaxx/widgets/font/FontSizor.jaxx index d7c1779..44b420f 100644 --- a/jaxx-widgets-font/src/main/java/org/nuiton/jaxx/widgets/font/FontSizor.jaxx +++ b/jaxx-widgets-font/src/main/java/org/nuiton/jaxx/widgets/font/FontSizor.jaxx @@ -21,8 +21,6 @@ --> <JPanel layout='{new BorderLayout()}'> - <FontSizorHandler id='handler' constructorParams='this'/> - <!-- default size of font --> <Float id='defaultFontSize' javaBean='12f'/> @@ -45,11 +43,7 @@ boolean updateDefaultSizeEnabled(Float fontSize, Float defaultFontSize, boolean public void setCallBack(Runnable action) { handler.setCallBack(action); } - -void $afterCompleteSetup() { - handler.$afterCompleteSetup(); -} - ]]> +]]> </script> <JToolBar floatable='false' borderPainted='false' diff --git a/jaxx-widgets-font/src/main/java/org/nuiton/jaxx/widgets/font/FontSizorHandler.java b/jaxx-widgets-font/src/main/java/org/nuiton/jaxx/widgets/font/FontSizorHandler.java index e84f1b8..50447dc 100644 --- a/jaxx-widgets-font/src/main/java/org/nuiton/jaxx/widgets/font/FontSizorHandler.java +++ b/jaxx-widgets-font/src/main/java/org/nuiton/jaxx/widgets/font/FontSizorHandler.java @@ -22,6 +22,7 @@ package org.nuiton.jaxx.widgets.font; import org.nuiton.jaxx.runtime.binding.SimpleJAXXObjectBinding; +import org.nuiton.jaxx.runtime.spi.UIHandler; /** * Handler of ui {@link FontSizor}. @@ -29,13 +30,9 @@ import org.nuiton.jaxx.runtime.binding.SimpleJAXXObjectBinding; * @author Tony Chemit - dev@tchemit.fr * @since 2.0 */ -public class FontSizorHandler { +public class FontSizorHandler implements UIHandler<FontSizor> { - protected final FontSizor ui; - - public FontSizorHandler(FontSizor ui) { - this.ui = ui; - } + protected FontSizor ui; public static final String BINDING_FONT_SIZE_CALL_BACK = "fontSize.callBack"; @@ -47,13 +44,8 @@ public class FontSizorHandler { } } - boolean updateDefaultSizeEnabled(Float fontSize, - Float defaultFontSize, - boolean enabled) { - if (fontSize == null || defaultFontSize == null) { - return false; - } - return !fontSize.equals(defaultFontSize) && enabled; + boolean updateDefaultSizeEnabled(Float fontSize, Float defaultFontSize, boolean enabled) { + return !(fontSize == null || defaultFontSize == null) && !fontSize.equals(defaultFontSize) && enabled; } public void setCallBack(final Runnable action) { @@ -68,7 +60,13 @@ public class FontSizorHandler { ui.applyDataBinding(BINDING_FONT_SIZE_CALL_BACK); } - void $afterCompleteSetup() { + @Override + public void beforeInit(FontSizor ui) { + this.ui = ui; + } + + @Override + public void afterInit(FontSizor ui) { ui.registerDataBinding(new SimpleJAXXObjectBinding(ui, BINDING_DEFAULT_FONT_SIZE_CALL_BACK, true, "defaultFontSize") { @Override -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.