BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-07 12:24:58 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix version reading

Browse Source
This commit is contained in:
Bane Stojkovic
2026-10-20 14:12:04 +02:00
parent 0ded7a35aa
commit e1bb04cc42
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/main/java/org/diylc/presenter/Presenter.java
+7 -3
View File
@@ -115,7 +115,7 @@ public class Presenter implements IPlugInPort {
public static final Double[] ZOOM_LEVELS =
{0.25d, 0.3333d, 0.5d, 0.6667d, 0.75d, 1d, 1.25d, 1.5d, 2d, 2.5d, 3d};
public static VersionNumber CURRENT_VERSION = null;
private static VersionNumber CURRENT_VERSION = null;
private static List<Version> RECENT_VERSIONS = null;
public static final String DEFAULTS_KEY_PREFIX = "default.";
@@ -408,7 +408,7 @@ public class Presenter implements IPlugInPort {
public void saveProjectToFile(String fileName, boolean isBackup) {
LOG.info(String.format("saveProjectToFile(%s)", fileName));
try {
currentProject.setFileVersion(CURRENT_VERSION);
currentProject.setFileVersion(getCurrentVersion());
projectFileManager.serializeProjectToFile(currentProject, fileName, isBackup);
if (!isBackup)
addToRecentFiles(fileName);
@@ -1305,8 +1305,12 @@ public class Presenter implements IPlugInPort {
@Override
public VersionNumber getCurrentVersionNumber() {
return getCurrentVersion();
}
public static VersionNumber getCurrentVersion() {
if (CURRENT_VERSION == null) {
List<Version> recentUpdates = getRecentUpdates();
List<Version> recentUpdates = getRecentVersions();
CURRENT_VERSION = recentUpdates.stream()
.findFirst().map(v -> v.getVersionNumber())
.orElse(new VersionNumber(5, 0, 0));
diylc/diylc-core/src/main/java/org/diylc/serialization/ProjectFileManager.java
+1 -1
View File
@@ -261,7 +261,7 @@ public class ProjectFileManager {
VersionNumber fileVersion;
try {
fileVersion = readV3Version(fileName);
if (fileVersion.compareTo(Presenter.CURRENT_VERSION) > 0)
if (fileVersion.compareTo(Presenter.getCurrentVersion()) > 0)
warnings.add("The file is created with a newer version of DIYLC and may contain features that are not supported by your version of DIYLC. Please update.");
} catch (Exception e) {
warnings.add("Could not read file version number, the file may be corrupted.");