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 c45b9034a872f2ba023b629d797fbdaa72e89779 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 17:49:24 2017 +0100 Improve status widgets (See #4119) --- .../jaxx/widgets/status/MemoryStatusWidget.jaxx | 13 ++------- .../widgets/status/MemoryStatusWidgetHandler.java | 18 ++++++------ .../jaxx/widgets/status/StatusMessagePanel.jaxx | 32 ++-------------------- .../widgets/status/StatusMessagePanelHandler.java | 24 +++++++++------- 4 files changed, 29 insertions(+), 58 deletions(-) diff --git a/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/MemoryStatusWidget.jaxx b/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/MemoryStatusWidget.jaxx index 76aebb0..c34eb68 100644 --- a/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/MemoryStatusWidget.jaxx +++ b/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/MemoryStatusWidget.jaxx @@ -20,10 +20,7 @@ #L% --> - -<JComponent implements='java.awt.event.ActionListener' - foreground='{Color.BLACK}' - background='{Color.WHITE}'> +<JComponent implements='java.awt.event.ActionListener' foreground='{Color.BLACK}' background='{Color.WHITE}'> <import> java.awt.Color @@ -32,9 +29,7 @@ javax.swing.Timer </import> - <MemoryStatusWidgetHandler id='handler' constructorParams='this'/> - - <javax.swing.Timer id='timer' javaBean='null'/> + <Timer id='timer' javaBean='null'/> <Color id='progressBackground' javaBean='Color.decode("#666699a")'/> <Color id='progressForeground' javaBean='Color.decode("#cccccc")'/> @@ -69,10 +64,6 @@ public void paintComponent(Graphics g) { handler.paintComponent(g); } - -void $afterCompleteSetup() { - handler.$afterCompleteSetup(); -} ]]> </script> </JComponent> diff --git a/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/MemoryStatusWidgetHandler.java b/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/MemoryStatusWidgetHandler.java index 05c07df..f9dadae 100644 --- a/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/MemoryStatusWidgetHandler.java +++ b/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/MemoryStatusWidgetHandler.java @@ -21,6 +21,8 @@ */ package org.nuiton.jaxx.widgets.status; +import org.nuiton.jaxx.runtime.spi.UIHandler; + import javax.swing.JLabel; import java.awt.Dimension; import java.awt.Graphics; @@ -37,7 +39,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - dev@tchemit.fr * @since 2.0 */ -public class MemoryStatusWidgetHandler { +public class MemoryStatusWidgetHandler implements UIHandler<MemoryStatusWidget>{ private final static String memoryTestStr = "99999/99999Mb"; @@ -45,11 +47,7 @@ public class MemoryStatusWidgetHandler { private final LineMetrics lm = new JLabel().getFont().getLineMetrics(memoryTestStr, frc); - protected final MemoryStatusWidget ui; - - public MemoryStatusWidgetHandler(MemoryStatusWidget ui) { - this.ui = ui; - } + protected MemoryStatusWidget ui; public void paintComponent(Graphics g) { Insets insets = new Insets(0, 0, 0, 0); @@ -86,13 +84,17 @@ public class MemoryStatusWidgetHandler { g2.dispose(); } + @Override + public void beforeInit(MemoryStatusWidget ui) { + this.ui = ui; + } - void $afterCompleteSetup() { + @Override + public void afterInit(MemoryStatusWidget ui) { ui.setFont(new JLabel().getFont()); Rectangle2D bounds = ui.getFont().getStringBounds(memoryTestStr, frc); Dimension dim = new Dimension((int) bounds.getWidth(), (int) bounds.getHeight()); ui.setPreferredSize(dim); ui.setMaximumSize(dim); } - } diff --git a/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/StatusMessagePanel.jaxx b/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/StatusMessagePanel.jaxx index e130c64..9ca8d9b 100644 --- a/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/StatusMessagePanel.jaxx +++ b/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/StatusMessagePanel.jaxx @@ -21,8 +21,7 @@ --> -<Table border='{BorderFactory.createBevelBorder(BevelBorder.LOWERED)}' - insets='0' +<Table border='{BorderFactory.createBevelBorder(BevelBorder.LOWERED)}' insets='0' implements='java.awt.event.ActionListener'> <import> @@ -88,33 +87,19 @@ public void addWidget(Component w, int index) { public void init() { handler.init(); } - -void $afterCompleteSetup() { - handler.$afterCompleteSetup(); -} ]]> </script> <Boolean id='showMemoryStatus' javaBean='Boolean.TRUE'/> <Boolean id='showClock' javaBean='Boolean.TRUE'/> - <!-- Deprecated, not used anywhere --> - <Boolean id='showI18n' javaBean='Boolean.FALSE'/> <Boolean id='showBusy' javaBean='Boolean.FALSE'/> <Boolean id='busy' javaBean='Boolean.FALSE'/> - <StatusMessagePanelHandler id='handler' constructorParams='this'/> - <row> <cell anchor='west' fill='both' weightx='1'> <Box constructorParams='0'> - <JProgressBar id='busyWidget' - visible='{isShowBusy()}' - enabled='{isBusy()}' - indeterminate='{isBusy()}' - stringPainted='false' - borderPainted='true'/> - <!--visible='{isBusy() && isShowBusy()}'--> - + <JProgressBar id='busyWidget' visible='{isShowBusy()}' enabled='{isBusy()}' indeterminate='{isBusy()}' + stringPainted='false' borderPainted='true'/> <JLabel id='statusLabel'/> </Box> @@ -122,17 +107,6 @@ void $afterCompleteSetup() { </cell> <cell anchor='east'> <Box id='box' constructorParams='0'> - - <!--JProgressBar id='busyWidget' - visible='{isBusy() && isShowBusy()}' - indeterminate='{isBusy()}' - stringPainted='false' - borderPainted='true'/--> - <!-- -minimumSize='{new Dimension(30,1)}' - maximumSize='{new Dimension(30,30)}' - preferredSize='{new Dimension(30,30)}' - --> <MemoryStatusWidget visible="{ isShowMemoryStatus() }"/> <ClockWidget visible="{ isShowClock() }"/> </Box> diff --git a/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/StatusMessagePanelHandler.java b/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/StatusMessagePanelHandler.java index 7699b3b..bbfbc35 100644 --- a/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/StatusMessagePanelHandler.java +++ b/jaxx-widgets-status/src/main/java/org/nuiton/jaxx/widgets/status/StatusMessagePanelHandler.java @@ -22,6 +22,8 @@ package org.nuiton.jaxx.widgets.status; +import org.nuiton.jaxx.runtime.spi.UIHandler; + import javax.swing.Timer; import java.awt.Color; import java.awt.Dimension; @@ -30,9 +32,9 @@ import java.awt.Dimension; * @author Tony Chemit - dev@tchemit.fr * @since 1.6.0 */ -public class StatusMessagePanelHandler { +public class StatusMessagePanelHandler implements UIHandler<StatusMessagePanel> { - protected final StatusMessagePanel ui; + protected StatusMessagePanel ui; protected Color statusForeground; @@ -40,14 +42,6 @@ public class StatusMessagePanelHandler { protected Timer timer; - public StatusMessagePanelHandler(StatusMessagePanel ui) { - this.ui = ui; - } - - void $afterCompleteSetup() { - init(); - } - public void init() { if (ui.isShowBusy()) { Dimension dim = new Dimension(30, 15); @@ -121,4 +115,14 @@ public class StatusMessagePanelHandler { ui.getStatusLabel().setForeground(statusForeground); } } + + @Override + public void beforeInit(StatusMessagePanel ui) { + this.ui = ui; + } + + @Override + public void afterInit(StatusMessagePanel ui) { + init(); + } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.