From 7c21154cb5b9e1ae65e822a70edcfda81cd82641 Mon Sep 17 00:00:00 2001 From: Stephen Gold Date: Fri, 3 Mar 2023 00:17:55 -0800 Subject: [PATCH] test JMonkeyEngine v3.6.0-beta3 --- common.gradle | 6 +++--- .../java/jme3utilities/nifty/dialog/DisplaySizeDialog.java | 4 ++-- .../java/jme3utilities/nifty/displaysettings/DsScreen.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common.gradle b/common.gradle index 62f2b47f..57ae7ebf 100644 --- a/common.gradle +++ b/common.gradle @@ -8,13 +8,13 @@ ext { websiteUrl = 'https://github.com/stephengold/jme3-utilities' // module coordinates of dependencies: - acorusCoordinates = 'com.github.stephengold:Acorus:0.9.17' - heartCoordinates = 'com.github.stephengold:Heart:8.3.0+for36' + acorusCoordinates = 'com.github.stephengold:Acorus:0.9.18+for36' + heartCoordinates = 'com.github.stephengold:Heart:8.3.1+for36' // current versions of libraries: jme3utilitiesniftyVersion = '0.9.34-SNAPSHOT' jme3utilitiesxVersion = '0.3.2-SNAPSHOT' - jme3Version = '3.6.0-beta2' + jme3Version = '3.6.0-beta3' } sourceCompatibility = JavaVersion.VERSION_1_7 diff --git a/nifty/src/main/java/jme3utilities/nifty/dialog/DisplaySizeDialog.java b/nifty/src/main/java/jme3utilities/nifty/dialog/DisplaySizeDialog.java index e93cd0d9..14ec3804 100644 --- a/nifty/src/main/java/jme3utilities/nifty/dialog/DisplaySizeDialog.java +++ b/nifty/src/main/java/jme3utilities/nifty/dialog/DisplaySizeDialog.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2018-2022, Stephen Gold + Copyright (c) 2018-2023, Stephen Gold All rights reserved. Redistribution and use in source and binary forms, with or without @@ -86,7 +86,7 @@ protected String feedback(String input) { if ("min".equals(lcInput) || "max".equals(lcInput)) { msg = ""; } else { - int[] size = DsUtils.parseDisplaySize(lcInput); + int[] size = DsUtils.parseDimensions(lcInput); if (size == null) { msg = "improperly formatted display dimensions"; } else { diff --git a/nifty/src/main/java/jme3utilities/nifty/displaysettings/DsScreen.java b/nifty/src/main/java/jme3utilities/nifty/displaysettings/DsScreen.java index 0635acdd..e2a248d0 100644 --- a/nifty/src/main/java/jme3utilities/nifty/displaysettings/DsScreen.java +++ b/nifty/src/main/java/jme3utilities/nifty/displaysettings/DsScreen.java @@ -554,7 +554,7 @@ private boolean setAction(String actionString) { } else if ("max".equals(lcArg)) { displaySettings.setMaxSize(); } else { - int[] wh = DsUtils.parseDisplaySize(lcArg); + int[] wh = DsUtils.parseDimensions(lcArg); if (wh == null) { handled = false; } else {