diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java index 3e5f4a6a1..01988bfa9 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java @@ -174,6 +174,10 @@ public class BrowserFullSessionModel extends BrowserAbstractSessionModel(sessionEntries); for (var o : all) { // Don't close busy connections gracefully @@ -240,7 +244,7 @@ public class BrowserFullSessionModel extends BrowserAbstractSessionModel extends BrowserSessionTab { protected final DataStoreEntryRef entry; + private final String name; public BrowserStoreSessionTab(BrowserAbstractSessionModel browserModel, DataStoreEntryRef entry) { super(browserModel); this.entry = entry; + this.name = DataStorage.get().getStoreEntryDisplayName(entry.get()); } @Override public ObservableValue getName() { - return new SimpleStringProperty(DataStorage.get().getStoreEntryDisplayName(entry.get())); + return new SimpleStringProperty(name); } public abstract Comp comp(); diff --git a/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java b/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java index e12bb513b..cd5ae3e05 100644 --- a/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java +++ b/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java @@ -7,19 +7,22 @@ import io.xpipe.core.store.FileNames; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.NonNull; +import lombok.Value; import java.nio.file.InvalidPathException; import java.nio.file.Path; +import java.util.Objects; import java.util.Optional; import java.util.regex.Matcher; @AllArgsConstructor(access = AccessLevel.PRIVATE) +@Value public class ContextualFileReference { private static String lastDataDir; @NonNull - private final String path; + String path; private static String getDataDir() { if (DataStorage.get() == null) { diff --git a/app/src/main/java/io/xpipe/app/util/LicensedFeature.java b/app/src/main/java/io/xpipe/app/util/LicensedFeature.java index 7252a3484..1f6c1450c 100644 --- a/app/src/main/java/io/xpipe/app/util/LicensedFeature.java +++ b/app/src/main/java/io/xpipe/app/util/LicensedFeature.java @@ -17,7 +17,7 @@ public interface LicensedFeature { } default String suffix(String s) { - return getDescriptionSuffix().map(suffix -> s + " (" + suffix + "+)").orElse(s); + return getDescriptionSuffix().map(suffix -> s + " (" + suffix + ")").orElse(s); } String getId(); diff --git a/app/src/main/java/io/xpipe/app/util/ShellStoreFormat.java b/app/src/main/java/io/xpipe/app/util/ShellStoreFormat.java index 7e8853312..ab8449de8 100644 --- a/app/src/main/java/io/xpipe/app/util/ShellStoreFormat.java +++ b/app/src/main/java/io/xpipe/app/util/ShellStoreFormat.java @@ -84,7 +84,7 @@ public class ShellStoreFormat { public String format() { var licenseReq = licensedFeature != null ? licensedFeature.getDescriptionSuffix().orElse(null) : null; - var lic = licenseReq != null ? "[" + licenseReq + "+]" : null; + var lic = licenseReq != null ? "[" + licenseReq + "]" : null; var name = this.name; var state = getStates() != null ? Arrays.stream(getStates()) diff --git a/build.gradle b/build.gradle index 2968cff04..c05667425 100644 --- a/build.gradle +++ b/build.gradle @@ -174,7 +174,7 @@ project.ext { def getWindowsSchemaCanonicalVersion() { def v = canonicalVersionString; - def last = versionReleaseNumber == 1 ? 0 : versionReleaseNumber - 1 + def last = isStage ? versionReleaseNumber : 0 if (v.split("\\.").length == 2) { v = v + ".0" } diff --git a/version b/version index b1930d3c4..4b754e413 100644 --- a/version +++ b/version @@ -1 +1 @@ -14.0-75 +14.0-76