From d1f3e40c4fa321aab76560eb1d99e7ad0617f214 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 12 Mar 2018 11:34:09 +0100
Subject: [PATCH] remove deprecated and unused storage path macros (4 years
 passed)

---
 .../refactoring/RefactoringSettings.java      |  8 +---
 .../openapi/components/StoragePathMacros.java | 44 ++-----------------
 2 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/RefactoringSettings.java b/platform/lang-impl/src/com/intellij/refactoring/RefactoringSettings.java
index 1797138a7cc7..62db3b92d1f6 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/RefactoringSettings.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/RefactoringSettings.java
@@ -8,13 +8,7 @@ import com.intellij.openapi.components.Storage;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import org.jetbrains.annotations.NotNull;
 
-@State(
-  name = "BaseRefactoringSettings",
-  storages = {
-    @Storage("baseRefactoring.xml"),
-    @Storage(value = "other.xml", deprecated = true)
-  }
-)
+@State(name = "BaseRefactoringSettings", storages = @Storage("baseRefactoring.xml"))
 public class RefactoringSettings implements PersistentStateComponent<RefactoringSettings> {
   public static RefactoringSettings getInstance() {
     return ServiceManager.getService(RefactoringSettings.class);
diff --git a/platform/projectModel-api/src/com/intellij/openapi/components/StoragePathMacros.java b/platform/projectModel-api/src/com/intellij/openapi/components/StoragePathMacros.java
index 2e9348934998..4437ed4496ed 100644
--- a/platform/projectModel-api/src/com/intellij/openapi/components/StoragePathMacros.java
+++ b/platform/projectModel-api/src/com/intellij/openapi/components/StoragePathMacros.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 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.openapi.components;
 
 import com.intellij.openapi.project.Project;
@@ -31,36 +17,14 @@ import org.jetbrains.annotations.NotNull;
  * @since 5/2/12 12:57 PM
  */
 public class StoragePathMacros {
-  @Deprecated
-  @NotNull
-  public static final String ROOT_CONFIG = "$ROOT_CONFIG$";
-
-  /**
-   * Points to the application-level options root directory.
-   * @deprecated Not required anymore. See {@link State#storages()}. In short: specify relative path instead (without macro).
-   */
-  @Deprecated
-  public static final String APP_CONFIG = "$APP_CONFIG$";
-
-  /**
-   * @deprecated Not required anymore. See {@link State#storages()}.
-   */
-  @Deprecated
-  public static final String PROJECT_FILE = "$PROJECT_FILE$";
-
-  /**
-   * @deprecated Not required anymore. See {@link State#storages()}.
-   */
-  @Deprecated
-  public static final String PROJECT_CONFIG_DIR = "$PROJECT_CONFIG_DIR$";
-
   /**
    * {@link Project#getWorkspaceFile() Workspace} file key.
-   * <p/>
    * {@code 'Workspace file'} holds settings that are local to a particular environment and should not be shared with another
    * team members.
    */
-  @NonNls @NotNull public static final String WORKSPACE_FILE = "$WORKSPACE_FILE$";
+  @NonNls
+  @NotNull
+  public static final String WORKSPACE_FILE = "$WORKSPACE_FILE$";
 
   @NonNls @NotNull public static final String MODULE_FILE = "$MODULE_FILE$";