From 15188465a4d5dbb01f68c3f2db847b19c052b111 Mon Sep 17 00:00:00 2001 From: iobyte Date: Mon, 19 Feb 2024 19:30:31 +0000 Subject: [PATCH] trackeditor: fix exception from empty comment git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9327 30fe4595-0a0c-4342-8851-515496e4dcbd --- .../gui/properties/GraphicObjectProperties.java | 10 ++++++---- src/tools/trackeditor/utils/Properties.java | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/tools/trackeditor/gui/properties/GraphicObjectProperties.java b/src/tools/trackeditor/gui/properties/GraphicObjectProperties.java index 2eccdfd75..1d65ff0a2 100644 --- a/src/tools/trackeditor/gui/properties/GraphicObjectProperties.java +++ b/src/tools/trackeditor/gui/properties/GraphicObjectProperties.java @@ -31,6 +31,7 @@ import javax.swing.table.TableColumn; import gui.EditorFrame; import gui.TrackObjectDialog; +import utils.MutableString; import utils.circuit.GraphicObject; public class GraphicObjectProperties extends PropertyPanel @@ -469,6 +470,7 @@ public class GraphicObjectProperties extends PropertyPanel public void exit() { int minDataCount = Math.min(data.size(), graphicObjects.size()); + MutableString stringResult = new MutableString(); if (data.size() != graphicObjects.size()) { @@ -479,15 +481,15 @@ public class GraphicObjectProperties extends PropertyPanel GraphicObjectData datum = data.get(j); GraphicObject object = graphicObjects.get(j); - if (!datum.name.equals(object.getName())) + if (isDifferent(object.getName(), datum.name, stringResult)) { - object.setName(datum.name); + object.setName(stringResult.getValue()); getEditorFrame().documentIsModified = true; } - if (!datum.comment.equals(object.getComment())) + if (isDifferent(object.getComment(), datum.comment, stringResult)) { - object.setComment(datum.comment); + object.setComment(stringResult.getValue()); getEditorFrame().documentIsModified = true; } diff --git a/src/tools/trackeditor/utils/Properties.java b/src/tools/trackeditor/utils/Properties.java index 51bfb1ca2..36624cdd3 100644 --- a/src/tools/trackeditor/utils/Properties.java +++ b/src/tools/trackeditor/utils/Properties.java @@ -34,7 +34,7 @@ public class Properties private static Properties instance = new Properties(); private Vector propertiesListeners = new Vector(); public final String title = "sd2-trackeditor"; - public final String version = "1.4.46"; + public final String version = "1.4.47"; private String path; private double imageScale = 1;