From bc1695a16cb376322d6ee832cbfc8e33c3fd69d6 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 17 Oct 2017 16:00:57 +0200 Subject: [PATCH] [ui] uses NIO2 for home dir writability check; excludes Windows On Windows, elevated privileges are requested when necessary, so the check is not needed. --- .../updateSettings/impl/UpdateInfoDialog.java | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java index efef951a70bb..85baf3e9f1d1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.updateSettings.impl; import com.intellij.execution.CommandLineUtil; @@ -58,6 +44,8 @@ import java.awt.event.ActionEvent; import java.io.File; import java.io.IOException; import java.net.URISyntaxException; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.*; import java.util.List; @@ -88,7 +76,7 @@ class UpdateInfoDialog extends AbstractUpdateDialog { myUpdatedPlugins = updatedPlugins; myNewBuild = newBuild; myPatch = patch; - myWriteProtected = myPatch != null && !new File(PathManager.getHomePath()).canWrite(); + myWriteProtected = myPatch != null && !SystemInfo.isWindows && !Files.isWritable(Paths.get(PathManager.getHomePath())); getCancelAction().putValue(DEFAULT_ACTION, Boolean.TRUE); myLicenseInfo = initLicensingInfo(myUpdatedChannel, myNewBuild); init();