diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-18 20:40:22 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-18 20:40:22 +0000 |
commit | 07d35c37ce79a64bdd905b394d40fc9bbb18fa60 (patch) | |
tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /platform/projectModel-api/src/com/intellij/openapi/application/PathMacros.java | |
parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
parent | b5fb31ef6a38f19404859755dbd2e345215b97bf (diff) | |
download | idea-07d35c37ce79a64bdd905b394d40fc9bbb18fa60.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/projectModel-api/src/com/intellij/openapi/application/PathMacros.java')
-rw-r--r-- | platform/projectModel-api/src/com/intellij/openapi/application/PathMacros.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/platform/projectModel-api/src/com/intellij/openapi/application/PathMacros.java b/platform/projectModel-api/src/com/intellij/openapi/application/PathMacros.java index 160aed545b03..fac4e5e9edb1 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/application/PathMacros.java +++ b/platform/projectModel-api/src/com/intellij/openapi/application/PathMacros.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -15,15 +15,15 @@ */ package com.intellij.openapi.application; +import com.intellij.openapi.components.ServiceManager; import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.Set; public abstract class PathMacros { - public static PathMacros getInstance() { - return ApplicationManager.getApplication().getComponent(PathMacros.class); + return ServiceManager.getService(PathMacros.class); } public abstract Set<String> getAllMacroNames(); @@ -33,9 +33,7 @@ public abstract class PathMacros { public abstract void setMacro(String name, String value); /** - * Obsolete macros that are to be removed gently from the project files. They can be read, but not written again. Not persisted. - * @param name - * @param value + * Obsolete macros that are to be removed gently from the project files. They can be read, but not written again. Not persisted */ public abstract void addLegacyMacro(@NotNull String name, @NotNull String value); |