mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-22 18:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

ui adjustments & code cleanup

Browse Source
This commit is contained in:
Armin Schrenk
2021-07-14 17:25:33 +02:00
parent 21946ae6aa
commit a71e344036
5 changed files with 37 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/cryptomator/ui/health/CheckDetailController.java
View File

@@ -37,7 +37,6 @@ public class CheckDetailController implements FxController {
private final Binding<Boolean> warnOrCritsExist;
private final ResultListCellFactory resultListCellFactory;
public CheckStateIconView checkStateIconView;
public ListView<Result> resultsListView;
private Subscription resultSubscription;

78
src/main/java/org/cryptomator/ui/health/StartFailController.java
View File

@@ -1,15 +1,11 @@
package org.cryptomator.ui.health;
import com.google.common.base.Preconditions;
import com.tobiasdiez.easybind.EasyBind;
import org.cryptomator.cryptofs.VaultConfigLoadException;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.controls.FontAwesome5Icon;
import javax.inject.Inject;
import javafx.beans.binding.Binding;
import javafx.beans.binding.Bindings;
import javafx.beans.binding.BooleanBinding;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.value.ObservableValue;
@@ -23,15 +19,18 @@ import java.nio.charset.StandardCharsets;
@HealthCheckScoped
public class StartFailController implements FxController {
private final Stage window;
private final ObjectProperty<Throwable> loadError;
private final ObjectProperty<FontAwesome5Icon> moreInfoIcon;
/* FXML */
public TitledPane moreInfoPane;
@Inject
public StartFailController(@HealthCheckWindow Stage window, HealthCheckComponent.LoadUnverifiedConfigResult configLoadResult) {
Preconditions.checkNotNull(configLoadResult.error());
this.window = window;
this.loadError = new SimpleObjectProperty<>(configLoadResult.error());
this.localizedErrorMessage = EasyBind.map(loadError, Throwable::getLocalizedMessage);
this.parseException = Bindings.createBooleanBinding(() -> loadError.get() instanceof VaultConfigLoadException);
this.ioException = parseException.not();
this.stackTrace = EasyBind.map(loadError, this::createPrintableStacktrace);
this.moreInfoIcon = new SimpleObjectProperty<>(FontAwesome5Icon.CARET_RIGHT);
}
@@ -43,48 +42,12 @@ public class StartFailController implements FxController {
moreInfoIcon.set(willExpand ? FontAwesome5Icon.CARET_DOWN : FontAwesome5Icon.CARET_RIGHT);
}
private String createPrintableStacktrace(Throwable t) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
t.printStackTrace(new PrintStream(baos));
return baos.toString(StandardCharsets.UTF_8);
}
@FXML
public void close() {
window.close();
}
public Binding<String> stackTraceProperty() {
return stackTrace;
}
public String getStackTrace() {
return stackTrace.getValue();
}
public Binding<String> localizedErrorMessageProperty() {
return localizedErrorMessage;
}
public String getLocalizedErrorMessage() {
return localizedErrorMessage.getValue();
}
public BooleanBinding parseExceptionProperty() {
return parseException;
}
public boolean isParseException() {
return parseException.getValue();
}
public BooleanBinding ioExceptionProperty() {
return ioException;
}
public boolean isIoException() {
return ioException.getValue();
}
/* Getter & Setter */
public ObjectProperty<FontAwesome5Icon> moreInfoIconProperty() {
return moreInfoIcon;
@@ -94,15 +57,22 @@ public class StartFailController implements FxController {
return moreInfoIcon.getValue();
}
private final Stage window;
private final ObjectProperty<Throwable> loadError;
private final Binding<String> stackTrace;
private final Binding<String> localizedErrorMessage;
private final BooleanBinding ioException;
private final BooleanBinding parseException;
private final ObjectProperty<FontAwesome5Icon> moreInfoIcon;
public String getStackTrace() {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
loadError.get().printStackTrace(new PrintStream(baos));
return baos.toString(StandardCharsets.UTF_8);
}
/* FXML */
public TitledPane moreInfoPane;
public String getLocalizedErrorMessage() {
return loadError.get().getLocalizedMessage();
}
public boolean isParseException() {
return loadError.get() instanceof VaultConfigLoadException;
}
public boolean isIoException() {
return !isParseException();
}
}