diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/NamePathComponent.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/NamePathComponent.java index 2475bf10c235..6a10c67fab9a 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/NamePathComponent.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/NamePathComponent.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-2018 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.ide.util.projectWizard; import com.intellij.ide.IdeBundle; @@ -199,14 +185,14 @@ public class NamePathComponent extends JPanel{ public String getPath() { String text = myTfPath.getText().trim(); - return FileUtil.expandUserHome(FileUtil.toSystemIndependentName(text)); + return FileUtil.toCanonicalPath(FileUtil.expandUserHome(text)); } public void setPath(String path) { - final boolean isPathChangedByUser = myIsPathChangedByUser; + boolean isPathChangedByUser = myIsPathChangedByUser; setPathNameSyncEnabled(false); try { - myTfPath.setText(FileUtil.getLocationRelativeToUserHome(FileUtil.toSystemDependentName(path))); + myTfPath.setText(FileUtil.getLocationRelativeToUserHome(FileUtil.toSystemDependentName(FileUtil.toCanonicalPath(path)))); } finally { myIsPathChangedByUser = isPathChangedByUser;