From 51ee5ae0a940a6d8bcd24d84f6c5bdbcb4fd5853 Mon Sep 17 00:00:00 2001 From: riverwanderer <58135975+riverwanderer@users.noreply.github.com> Date: Wed, 6 Sep 2023 18:47:14 +0100 Subject: [PATCH 01/11] Translate side names in change sides messaging. --- vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java b/vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java index 5f5ebeff72..4d43017b52 100644 --- a/vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java +++ b/vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java @@ -280,7 +280,7 @@ protected void launch() { newSide ); - Command c = new Chatter.DisplayText(gm.getChatter(), Resources.getString(GlobalOptions.getInstance().chatterHTMLSupport() ? "PlayerRoster.changed_sides_2" : "PlayerRoster.changed_sides", GameModule.getGameModule().getPrefs().getValue(GameModule.REAL_NAME), mySide, newSide)); + Command c = new Chatter.DisplayText(gm.getChatter(), Resources.getString(GlobalOptions.getInstance().chatterHTMLSupport() ? "PlayerRoster.changed_sides_2" : "PlayerRoster.changed_sides", GameModule.getGameModule().getPrefs().getValue(GameModule.REAL_NAME), translateSide(mySide), translateSide(newSide))); c.execute(); final Remove r = new Remove(this, GameModule.getActiveUserId()); From d0b85643e95ca287a6cb5a2b17c86d5656e6d226 Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Fri, 8 Sep 2023 14:53:56 +0100 Subject: [PATCH 02/11] Updated for 3.7.1 development. --- Makefile | 6 +++--- pom.xml | 2 +- release-prepare/pom.xml | 2 +- vassal-agent/pom.xml | 2 +- vassal-app/pom.xml | 2 +- vassal-deprecation/pom.xml | 2 +- vassal-doc/pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index c30ea0b54e..2091da057f 100644 --- a/Makefile +++ b/Makefile @@ -47,13 +47,13 @@ JDKDIR:=$(DISTDIR)/jdks JDOCDIR:=jdoc # numeric part of the version only -VNUM:=3.7.0 +VNUM:=3.7.1 # major-minor part of the version V_MAJ_MIN:=$(shell echo "$(VNUM)" | cut -f1,2 -d'.') -#MAVEN_VERSION:=$(VNUM)-SNAPSHOT +MAVEN_VERSION:=$(VNUM)-SNAPSHOT #MAVEN_VERSION:=$(VNUM)-beta5 -MAVEN_VERSION:=$(VNUM) +#MAVEN_VERSION:=$(VNUM) JARNAME:=vassal-app-$(MAVEN_VERSION) diff --git a/pom.xml b/pom.xml index c7feb1f7ec..83b3de3752 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.vassalengine vassal-parent - 3.7.0 + 3.7.1-SNAPSHOT pom Vassal Engine diff --git a/release-prepare/pom.xml b/release-prepare/pom.xml index 1626e977ba..8cb6ecb833 100644 --- a/release-prepare/pom.xml +++ b/release-prepare/pom.xml @@ -5,7 +5,7 @@ org.vassalengine vassal-parent - 3.7.0 + 3.7.1-SNAPSHOT release-prepare diff --git a/vassal-agent/pom.xml b/vassal-agent/pom.xml index 12fb2f783a..e09e78a3a4 100644 --- a/vassal-agent/pom.xml +++ b/vassal-agent/pom.xml @@ -5,7 +5,7 @@ org.vassalengine vassal-parent - 3.7.0 + 3.7.1-SNAPSHOT vassal-agent diff --git a/vassal-app/pom.xml b/vassal-app/pom.xml index 40521bbfb8..0a18ca7048 100644 --- a/vassal-app/pom.xml +++ b/vassal-app/pom.xml @@ -6,7 +6,7 @@ org.vassalengine vassal-parent - 3.7.0 + 3.7.1-SNAPSHOT vassal-app diff --git a/vassal-deprecation/pom.xml b/vassal-deprecation/pom.xml index 37a363960b..0bc52c5dc2 100644 --- a/vassal-deprecation/pom.xml +++ b/vassal-deprecation/pom.xml @@ -5,7 +5,7 @@ org.vassalengine vassal-parent - 3.7.0 + 3.7.1-SNAPSHOT vassal-deprecation diff --git a/vassal-doc/pom.xml b/vassal-doc/pom.xml index c9ebeb9c42..2c4b40cf0b 100644 --- a/vassal-doc/pom.xml +++ b/vassal-doc/pom.xml @@ -5,7 +5,7 @@ org.vassalengine vassal-parent - 3.7.0 + 3.7.1-SNAPSHOT vassal-doc From 00150ee6f71bfb72eca05dd69516ec2f97408325 Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Fri, 8 Sep 2023 14:56:13 +0100 Subject: [PATCH 03/11] Updated change log for 3.7.1. --- CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index 91c4f78187..38b7d4ca84 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +3.7.1 - ??? + 3.7.0 - 7 September 2023 * 12644: Prevent NPE when Editing Deck count expressions From 1233cc1581af7c9c16067b01a840c41e82f1a7ef Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Fri, 8 Sep 2023 15:03:17 +0100 Subject: [PATCH 04/11] Updated version in README.md. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c5882c0cf..529316018a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ VASSAL is a game engine for building and playing online adaptations of board gam ### Minimum Requirements -VASSAL 3.6 requires Java 11 or later. +VASSAL 3.7 requires Java 11 or later. The Windows and Mac packages have an appropriate version of Java bundled with them, so there is no need to install Java separately on those operating From e00dbd4361708e178006b05fc083bd62b2582496 Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Fri, 8 Sep 2023 15:50:35 +0100 Subject: [PATCH 05/11] Edited out two reverted changes which never appeared outside a beta release. --- dist/notes/data.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dist/notes/data.json b/dist/notes/data.json index 14ec84b71d..8b8d56093e 100644 --- a/dist/notes/data.json +++ b/dist/notes/data.json @@ -35,7 +35,6 @@ { "num": 12153, "desc": "Layer traits allow a show-only-if-this-property-true filter" }, { "num": 12149, "desc": "BorderOutline trait now accepts two fields" }, { "num": 12129, "desc": "PlaceMarker and ReplaceWithOther can use expression for X/Y offset" }, - { "num": 12127, "desc": "Toolbar buttons disableable by a property (e.g., GKC, ActionButton, etc.) can be set to hide when disabled" }, { "num": 12100, "desc": "Text Labels support tags" }, { "num": 12067, "desc": "Import/export of groups of items from Editor as XML files (e.g., to transfer between modules)" }, @@ -74,7 +73,6 @@ { "num": 12529, "desc": "Allow Piece UIDs to be compared properly in expressions" }, { "num": 12528, "desc": "Close InputStreams opened for reading SVG" }, { "num": 12482, "desc": "Map Shader now able to add button to Map Toolbar" }, - { "num": 12478, "desc": "Revert 12077 - Do not return a default value for ObscuredToOthers" }, { "num": 12470, "desc": "Place Marker X Offset should default to 0, not null" }, { "num": 12439, "desc": "Uniformly handle addition of standard and imported Configurables" }, { "num": 12434, "desc": "FastMatch by Location now respects Deck limits" }, @@ -97,7 +95,6 @@ { "num": 12261, "desc": "Report error if more than one grid added to a Zone" }, { "num": 12220, "desc": "Add BorderOutline's property names to the searchable target list" }, { "num": 12215, "desc": "New MarkMoved commands shouldn't default to being displayed if no key commands entered" }, - { "num": 12208, "desc": "Hiding disabled toolbar buttons feature removed (reverts 12127)" }, { "num": 12205, "desc": "Area of Effect trait was eating other traits' visibility info in some cases" }, { "num": 12203, "desc": "Properly extract outlines from SVG for NonRectangular" }, { "num": 12175, "desc": "Fix stretchy images in chat" }, @@ -136,7 +133,6 @@ { "num": 12133, "desc": "Rollovers automatically shrink scale if the pieces are too wide to fit the screen width" }, { "num": 12084, "desc": "Help menu shows module-specific help items before generic Vassal ones" }, { "num": 12080, "desc": "Zooming in and out no longer loses track of player's preferred center point for map" }, - { "num": 12077, "desc": "ObscuredToOthers can be counted on to be 'false' for pieces that don't even have a Mask property" }, { "num": 11919, "desc": "Allow DEL/BACKSPACE to be mapped as a hotkey" }, { "num": 11506, "desc": "Predefined Setup \"menus\" with blank names will not be shown" }, { "num": 11104, "desc": "Refresh Can Rotate trait by Rotator Name match option for Game Refreshers" } From a0a331e8ded0f9f56b3afa7f4297f3dfc1c83ac4 Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Fri, 8 Sep 2023 15:52:50 +0100 Subject: [PATCH 06/11] Updated for 3.7.1 development. --- dist/notes/data.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dist/notes/data.json b/dist/notes/data.json index 8b8d56093e..5a0efbfeab 100644 --- a/dist/notes/data.json +++ b/dist/notes/data.json @@ -15,6 +15,16 @@ { "display_name": "Other", "suffix": "other.zip" } ], "changes": [ + { + "in": "3.7.1", + "since": "3.7.0", + "new_features": [ + ], + "bug_fixes": [ + ], + "other_improvements": [ + ] + }, { "in": "3.7.0", "since": "3.6.19", @@ -58,8 +68,6 @@ { "num": 10820, "desc": "Make Action Button available on all windows where other similar buttons (e.g., GKC, Multi-Action, etc) are available" }, { "num": 4454, "desc": "Save chat text to file" }, { "num": 4446, "desc": "Dynamic button labels (can use expressions and $...$ in certain toolbar buttons)" } - - ], "bug_fixes": [ { "num": 12644, "desc": "Prevent NPE when Editing Deck count expressions" }, From 87333ac31592c329a000bcba8be8aa568ef12eb3 Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Sun, 10 Sep 2023 00:12:08 +0100 Subject: [PATCH 07/11] IncrementPropertly: Corrected bad wrap-around calculation when increment is negative. --- .../VASSAL/build/module/properties/IncrementProperty.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vassal-app/src/main/java/VASSAL/build/module/properties/IncrementProperty.java b/vassal-app/src/main/java/VASSAL/build/module/properties/IncrementProperty.java index aef4213887..d012bcc974 100644 --- a/vassal-app/src/main/java/VASSAL/build/module/properties/IncrementProperty.java +++ b/vassal-app/src/main/java/VASSAL/build/module/properties/IncrementProperty.java @@ -82,7 +82,11 @@ public String getNewValue(String oldValue) { else if (constraints.isWrap()) { final int min = constraints.getMinimumValue(); final int max = constraints.getMaximumValue(); - value = min + ((value - min + incr) % (max - min + incr)); + final int range = max - min + 1; + // NB: value - min + incr could be < 0 (but > -range), which is + // why we add range and mod a second time to ensure that the + // result is in [0,range). + value = min + ((value - min + incr) % range + range) % range; } else { value += incr; From 109cbd705f0e7a75f5d3572f64df014951c04ec7 Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Sun, 10 Sep 2023 12:36:59 +0100 Subject: [PATCH 08/11] Updated clirr for 3.7 release. --- vassal-app/pom.xml | 2 +- .../resources/clirr-ignored-differences.xml | 210 +----------------- 2 files changed, 2 insertions(+), 210 deletions(-) diff --git a/vassal-app/pom.xml b/vassal-app/pom.xml index 0a18ca7048..01746d1934 100644 --- a/vassal-app/pom.xml +++ b/vassal-app/pom.xml @@ -18,7 +18,7 @@ ${project.basedir}${file.separator}.. ${project.build.sourceEncoding} 1.17 - 3.6.19 + 3.7.0 diff --git a/vassal-app/src/test/resources/clirr-ignored-differences.xml b/vassal-app/src/test/resources/clirr-ignored-differences.xml index 0e58cd1bcb..0d5e3faf42 100644 --- a/vassal-app/src/test/resources/clirr-ignored-differences.xml +++ b/vassal-app/src/test/resources/clirr-ignored-differences.xml @@ -22,214 +22,6 @@ * - - - - VASSAL/build/module/Chatter - 6001 - scroll2 - Accidentally added; nothing should use this. - - - - VASSAL/build/module/AttachmentManager - 7002 - * - New class added in 3.7 beta. - - - - - VASSAL/script/ExpressionInterpreter - 7005 - * - * - No one should be using this externally - - - - VASSAL/script/ExpressionInterpreter - 7004 - java.lang.Object sumZone(java.lang.String, java.lang.String, VASSAL.build.module.properties.PropertySource) - No one should be using this externally - - - - VASSAL/script/ExpressionInterpreter - 7002 - * - Only called from Beanshell interface script which has been revamped. - - - - VASSAL/script/ExpressionInterpreter - 7006 - ** - ** - No one should be using this externally, Internal changes only - - - - VASSAL/script/AbstractInterpreter - 7005 - * - * - No one should be using this externally - - - - VASSAL/configure/BeanShellFunctionMenu - 7005 - * - * - Internal use only - - - - VASSAL/configure/BeanShellFunctionMenu - 7002 - * - Internal use only. - - - - VASSAL/counters/SetAttachmentProperty - 8001 - Class added in beta, then removed - - - - VASSAL/counters/SetAttachmentProperty$Ed - 8001 - Class added in beta, then removed - - - - VASSAL/counters/SetAttachmentProperty$SetAttachmentPropertySource - 8001 - Class added in beta, then removed - - - - - - VASSAL/build/module/map/MoveCameraButton - 6006 - MOVE_CAMERA_MODE - String constants should be final - - - VASSAL/build/module/map/MoveCameraButton - 6006 - ZOOM - String constants should be final - - - VASSAL/build/module/map/MoveCameraButton - 6006 - BOARD_NAME - String constants should be final - - - VASSAL/build/module/map/MoveCameraButton - 6006 - X_POS - String constants should be final - - - VASSAL/build/module/map/MoveCameraButton - 6006 - Y_POS - String constants should be final - - - VASSAL/build/module/map/MoveCameraButton - 6006 - ZONE_NAME - String constants should be final - - - VASSAL/build/module/map/MoveCameraButton - 6006 - GRID_LOCATION - String constants should be final - - - VASSAL/build/module/map/MoveCameraButton - 6006 - REGION_NAME - String constants should be final - - - VASSAL/build/module/map/MoveCameraButton - 6006 - PROPERTY_FILTER - String constants should be final - - - VASSAL/build/module/map/MoveCameraButton - 6006 - X_OFFSET - String constants should be final - - - VASSAL/build/module/map/MoveCameraButton - 6006 - Y_OFFSET - String constants should be final - - - VASSAL/tools/NamedKeyManager - 6006 - instance - Singletons should be final - - - - - - VASSAL/launch/TilingHandler - 7006 - void runSlicer(java.util.List, int, int) - VASSAL.tools.lang.Pair - No one should be using this externally - - - VASSAL/launch/TilingHandler - 7005 - void runSlicer(java.util.List, int, int) - * - No one should be using this externally - - - VASSAL/tools/image/tilecache/FileArchiveImageTiler - 7004 - void run(VASSAL.tools.io.FileArchive, java.lang.String, int, int, java.lang.Iterable, java.util.concurrent.ExecutorService, VASSAL.tools.image.ImageLoader, VASSAL.tools.image.tilecache.TileSlicer, VASSAL.tools.lang.Callback, VASSAL.tools.lang.Callback, VASSAL.tools.lang.Callback) - No one should be using this externally - - - - - - VASSAL/launch/DebugClassLoader - 8001 - Never released - - - - - - VASSAL/launch/TilingHandler - 7002 - TilingHandler(java.lang.String, java.io.File, java.awt.Dimension, int, int) - Kept for VASL 6.6.2 compatibility; no longer needed. - - - - VASSAL/launch/TilingHandler - 6011 - pid - Kept for VASL 6.6.2 compatibility; no longer needed. - + From 0362fb79e3991eff9728f52885641a1a9acc1b27 Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Sun, 10 Sep 2023 13:08:39 +0100 Subject: [PATCH 09/11] Updated change log. --- CHANGES | 3 +++ dist/notes/data.json | 1 + 2 files changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 38b7d4ca84..216b208e1c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ 3.7.1 - ??? +* 12676: IncrementPropertly: Corrected bad wrap-around calculation when + increment is negative + 3.7.0 - 7 September 2023 * 12644: Prevent NPE when Editing Deck count expressions diff --git a/dist/notes/data.json b/dist/notes/data.json index 5a0efbfeab..cc7c68a30d 100644 --- a/dist/notes/data.json +++ b/dist/notes/data.json @@ -21,6 +21,7 @@ "new_features": [ ], "bug_fixes": [ + { "num": 12676, "desc": "IncrementPropertly: Corrected bad wrap-around calculation when increment is negative" } ], "other_improvements": [ ] From 7fd33ab3304ebdabcbea0be43340f7021feddd7e Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Sun, 10 Sep 2023 13:17:54 +0100 Subject: [PATCH 10/11] Fixed typo. --- CHANGES | 2 +- dist/notes/data.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 216b208e1c..51c730ebc0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,6 @@ 3.7.1 - ??? -* 12676: IncrementPropertly: Corrected bad wrap-around calculation when +* 12676: IncrementProperty: Corrected bad wrap-around calculation when increment is negative 3.7.0 - 7 September 2023 diff --git a/dist/notes/data.json b/dist/notes/data.json index cc7c68a30d..b621c139e1 100644 --- a/dist/notes/data.json +++ b/dist/notes/data.json @@ -21,7 +21,7 @@ "new_features": [ ], "bug_fixes": [ - { "num": 12676, "desc": "IncrementPropertly: Corrected bad wrap-around calculation when increment is negative" } + { "num": 12676, "desc": "IncrementProperty: Corrected bad wrap-around calculation when increment is negative" } ], "other_improvements": [ ] From a7bd57314b0f03ed9dd6efeddc887a78bf9b7e9b Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Sun, 10 Sep 2023 15:17:30 +0100 Subject: [PATCH 11/11] Updated change log. --- CHANGES | 1 + dist/notes/data.json | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index 51c730ebc0..92c6e6c2ed 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,7 @@ * 12676: IncrementProperty: Corrected bad wrap-around calculation when increment is negative +* 12661: Translate side names in change sides message 3.7.0 - 7 September 2023 diff --git a/dist/notes/data.json b/dist/notes/data.json index b621c139e1..0a9f504a6f 100644 --- a/dist/notes/data.json +++ b/dist/notes/data.json @@ -24,6 +24,7 @@ { "num": 12676, "desc": "IncrementProperty: Corrected bad wrap-around calculation when increment is negative" } ], "other_improvements": [ + { "num": 12661, "desc": "Translate side names in change sides message" } ] }, {