mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-04-23 08:00:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes [stage]

Browse Source
This commit is contained in:
crschnick
2025-01-14 12:26:48 +00:00
parent 822e744e80
commit 3854f17352
7 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java
View File

@@ -174,6 +174,10 @@ public class BrowserFullSessionModel extends BrowserAbstractSessionModel<Browser
public void reset() {
synchronized (BrowserFullSessionModel.this) {
if (globalPinnedTab.getValue() != null) {
globalPinnedTab.setValue(null);
}
var all = new ArrayList<>(sessionEntries);
for (var o : all) {
// Don't close busy connections gracefully
@@ -240,7 +244,7 @@ public class BrowserFullSessionModel extends BrowserAbstractSessionModel<Browser
if (split != null) {
split.close();
}
previousTabs.remove(e);
super.closeSync(e);
}
}

4
app/src/main/java/io/xpipe/app/browser/BrowserStoreSessionTab.java
View File

@@ -15,15 +15,17 @@ import lombok.Getter;
public abstract class BrowserStoreSessionTab<T extends DataStore> extends BrowserSessionTab {
protected final DataStoreEntryRef<? extends T> entry;
private final String name;
public BrowserStoreSessionTab(BrowserAbstractSessionModel<?> browserModel, DataStoreEntryRef<? extends T> entry) {
super(browserModel);
this.entry = entry;
this.name = DataStorage.get().getStoreEntryDisplayName(entry.get());
}
@Override
public ObservableValue<String> getName() {
return new SimpleStringProperty(DataStorage.get().getStoreEntryDisplayName(entry.get()));
return new SimpleStringProperty(name);
}
public abstract Comp<?> comp();

5
app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java
View File

@@ -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) {

2
app/src/main/java/io/xpipe/app/util/LicensedFeature.java
View File

@@ -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();

2
app/src/main/java/io/xpipe/app/util/ShellStoreFormat.java
View File

@@ -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())

2
build.gradle
View File

@@ -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"
}

2
version
View File

@@ -1 +1 @@
14.0-75
14.0-76