branch develop-2.x updated (bebb6915 -> 779a56a4)
This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from bebb6915 #1907 : Fix jdk11+ compilation new 779a56a4 fixes #1907: Fix compilation for jdk11+ The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 779a56a4143b2f54368b229d48b3d6f667b25a9b Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Apr 22 11:01:32 2020 +0200 fixes #1907: Fix compilation for jdk11+ Summary of changes: jaxx-demo/pom.xml | 2 +- .../java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx | 14 +++++++------- .../main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx | 2 +- .../demo/component/swing/JRadioButtonMenuItemDemo.jaxx | 2 +- .../java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx | 2 +- .../java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx | 2 +- jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jcss | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 779a56a4143b2f54368b229d48b3d6f667b25a9b Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Apr 22 11:01:32 2020 +0200 fixes #1907: Fix compilation for jdk11+ --- jaxx-demo/pom.xml | 2 +- .../java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx | 14 +++++++------- .../main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx | 2 +- .../demo/component/swing/JRadioButtonMenuItemDemo.jaxx | 2 +- .../java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx | 2 +- .../java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx | 2 +- jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jcss | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 223489bd..64bcb087 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.44</version> + <version>2.45-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx index 61582a52..fa63efdc 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx @@ -40,7 +40,7 @@ private static final long serialVersionUID = 1L; @Override public void actionPerformed(ActionEvent e) { - accept(e, "from icon of layer"); + acceptAction(e, "from icon of layer"); } }}'/> <BlockingLayerUI2 id='layerUI2' @@ -48,7 +48,7 @@ private static final long serialVersionUID = 1L; @Override public void actionPerformed(ActionEvent e) { - accept(e, "from icon of layer"); + acceptAction(e, "from icon of layer"); } }}'/> <script><![CDATA[ @@ -81,7 +81,7 @@ public void setLayer(boolean active) { } } -protected void accept(ActionEvent e, String suffix) { +protected void acceptAction(ActionEvent e, String suffix) { JButton source = (JButton) e.getSource(); String clickedMessage = (String) source.getClientProperty("clickedText"); String msg = "'" + source.getText() + "' clicked - " + suffix + " : " + clickedMessage; @@ -101,13 +101,13 @@ protected void accept(ActionEvent e, String suffix) { <JPanel id='buttonPane'> <JButton id='buttonA' decorator='boxed' _clickedText='"button A was clicked"' - onActionPerformed='accept(event, "from button (no layer)")'/> + onActionPerformed='acceptAction(event, "from button (no layer)")'/> <JButton id='buttonB' decorator='boxed' - onActionPerformed='accept(event, "from button (no layer)")'/> + onActionPerformed='acceptAction(event, "from button (no layer)")'/> <JButton id='buttonC' decorator='boxed' - onActionPerformed='accept(event, "from button (no layer)");'/> + onActionPerformed='acceptAction(event, "from button (no layer)");'/> <JButton id='buttonD' decorator='boxed' - onActionPerformed='accept(event, "from button (no layer)");'/> + onActionPerformed='acceptAction(event, "from button (no layer)");'/> </JPanel> </cell> </row> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx index 4da75f27..bb2d39be 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx @@ -41,7 +41,7 @@ <JPanel id='framePanel'> <JLabel text='JMenu demo' id='demoMessage' - horizontalAlignment='center'/> + horizontalAlignment='{javax.swing.SwingConstants.CENTER}'/> </JPanel> </JInternalFrame> </JDesktopPane> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx index cc9afaa5..3d725956 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx @@ -49,6 +49,6 @@ protected Font updateFont(Object selectedValue) { </JMenuBar> <JLabel id='demoMessage' text='Font size: {fontSize.getSelectedValue()}' - horizontalAlignment='center' + horizontalAlignment='{javax.swing.SwingConstants.CENTER}' font='{updateFont(fontSize.getSelectedValue())}'/> </JMenuItemDemo> diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx b/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx index ac51d2bd..0b5d3349 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx @@ -47,7 +47,7 @@ verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}' minimumSize='{SwingUtil.newMinDimension()}'> - <JLabel horizontalAlignment='center' + <JLabel horizontalAlignment='{javax.swing.SwingConstants.CENTER}' icon='{getHandler().getImage(getData())}'/> </JScrollPane> diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx b/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx index 6a62da76..4eaa937b 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx @@ -48,7 +48,7 @@ verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}' minimumSize='{SwingUtil.newMinDimension()}'> - <JLabel horizontalAlignment='center' + <JLabel horizontalAlignment='{javax.swing.SwingConstants.CENTER}' icon='{getHandler().getImage(getData())}'/> </JScrollPane> diff --git a/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jcss b/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jcss index e2694636..dae773bc 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jcss +++ b/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jcss @@ -27,7 +27,7 @@ #display { background: #BCE5AD; opaque: true; - horizontalAlignment: right; + horizontalAlignment: {javax.swing.SwingConstants.RIGHT}; border: {BorderFactory.createBevelBorder(BevelBorder.LOWERED)}; font-size:22; font-weight: bold; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm