浏览代码

renamed lookupDatabaseUserPermission to askedForLookupDatabasePermission

Jan-Peter Klein 1 年之前
父节点
当前提交
27f3d85ae2
共有 2 个文件被更改,包括 9 次插入9 次删除
  1. 7 7
      src/main/java/org/cryptomator/ui/error/ErrorController.java
  2. 2 2
      src/main/resources/fxml/error.fxml

+ 7 - 7
src/main/java/org/cryptomator/ui/error/ErrorController.java

@@ -71,7 +71,7 @@ public class ErrorController implements FxController {
 	private final ObjectProperty<ErrorDiscussion> matchingErrorDiscussion = new SimpleObjectProperty<>();
 	private final BooleanExpression errorSolutionFound = matchingErrorDiscussion.isNotNull();
 	private final BooleanProperty isLoadingHttpResponse = new SimpleBooleanProperty();
-	private final BooleanProperty lookupDatabaseUserPermission = new SimpleBooleanProperty();
+	private final BooleanProperty askedForLookupDatabasePermission = new SimpleBooleanProperty();
 
 	@Inject
 	ErrorController(Application application, @Named("stackTrace") String stackTrace, ErrorCode errorCode, @Nullable Scene previousScene, Stage window, Environment environment, ExecutorService executorService) {
@@ -136,13 +136,13 @@ public class ErrorController implements FxController {
 
 	@FXML
 	public void dismiss() {
-		lookupDatabaseUserPermission.set(true);
+		askedForLookupDatabasePermission.set(true);
 	}
 
 	@FXML
 	public void lookUpSolution() {
 		isLoadingHttpResponse.set(true);
-		lookupDatabaseUserPermission.set(true);
+		askedForLookupDatabasePermission.set(true);
 		HttpClient httpClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_1_1).build();
 		HttpRequest httpRequest = HttpRequest.newBuilder()//
 				.uri(URI.create(ERROR_CODES_URL))//
@@ -305,12 +305,12 @@ public class ErrorController implements FxController {
 		return isLoadingHttpResponse.get();
 	}
 
-	public BooleanProperty lookupDatabaseUserPermissionProperty() {
-		return lookupDatabaseUserPermission;
+	public BooleanProperty askedForLookupDatabasePermissionProperty() {
+		return askedForLookupDatabasePermission;
 	}
 
-	public boolean isLookupDatabaseUserPermission() {
-		return lookupDatabaseUserPermission.get();
+	public boolean getAskedForLookupDatabasePermission() {
+		return askedForLookupDatabasePermission.get();
 	}
 
 }

+ 2 - 2
src/main/resources/fxml/error.fxml

@@ -34,7 +34,7 @@
 			</StackPane>
 			<VBox spacing="6" HBox.hgrow="ALWAYS">
 				<FormattedLabel styleClass="label-extra-large" format="%error.message" arg1="${controller.errorCode}"/>
-				<VBox visible="${!controller.lookupDatabaseUserPermission}" managed="${!controller.lookupDatabaseUserPermission}">
+				<VBox visible="${!controller.askedForLookupDatabasePermission}" managed="${!controller.askedForLookupDatabasePermission}">
 					<Label text="%error.lookupPermissionMessage" wrapText="true"/>
 					<Region VBox.vgrow="ALWAYS" minHeight="18"/>
 					<ButtonBar buttonMinWidth="120" buttonOrder="+NY">
@@ -44,7 +44,7 @@
 						</buttons>
 					</ButtonBar>
 				</VBox>
-				<VBox visible="${controller.lookupDatabaseUserPermission}" managed="${controller.lookupDatabaseUserPermission}">
+				<VBox visible="${controller.askedForLookupDatabasePermission}" managed="${controller.askedForLookupDatabasePermission}">
 					<FontAwesome5Spinner glyphSize="24" visible="${controller.isLoadingHttpResponse}" managed="${controller.isLoadingHttpResponse}"/>
 					<VBox visible="${!controller.isLoadingHttpResponse}" managed="${!controller.isLoadingHttpResponse}">
 						<Label text="%error.existingSolutionDescription" wrapText="true" visible="${controller.errorSolutionFound}" managed="${controller.errorSolutionFound}"/>