From 1f6276d8aac61bf3b4a26b1002d7a57c620ef115 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Sun, 20 Jan 2013 10:25:11 +0100 Subject: [PATCH] Platform: got rid of hardcoded platform prefixes --- .../intellij/openapi/application/ApplicationNamesInfo.java | 3 ++- .../src/com/intellij/ide/actions/NewDummyProjectAction.java | 3 ++- .../src/com/intellij/ide/plugins/PluginManager.java | 5 +++-- platform/platform-main/src/com/intellij/idea/MainImpl.java | 5 ++--- .../src/com/intellij/testFramework/PlatformTestCase.java | 3 ++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/application/ApplicationNamesInfo.java b/platform/platform-api/src/com/intellij/openapi/application/ApplicationNamesInfo.java index 9cd6853425dc..847c6817be31 100644 --- a/platform/platform-api/src/com/intellij/openapi/application/ApplicationNamesInfo.java +++ b/platform/platform-api/src/com/intellij/openapi/application/ApplicationNamesInfo.java @@ -17,6 +17,7 @@ package com.intellij.openapi.application; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.PlatformUtils; import org.jdom.Document; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -94,7 +95,7 @@ public class ApplicationNamesInfo { } public static String getComponentName() { - final String prefix = System.getProperty("idea.platform.prefix"); + final String prefix = System.getProperty(PlatformUtils.PLATFORM_PREFIX_KEY); if (prefix != null) { return prefix + COMPONENT_NAME; } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/NewDummyProjectAction.java b/platform/platform-impl/src/com/intellij/ide/actions/NewDummyProjectAction.java index 65f7862db9a3..e7c65bbaf640 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/NewDummyProjectAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/NewDummyProjectAction.java @@ -21,6 +21,7 @@ import com.intellij.openapi.application.PathManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.ex.ProjectManagerEx; +import com.intellij.util.PlatformUtils; /** * @author yole @@ -35,6 +36,6 @@ public class NewDummyProjectAction extends AnAction implements DumbAware { @Override public void update(final AnActionEvent e) { - e.getPresentation().setVisible("Platform".equals(System.getProperty("idea.platform.prefix"))); + e.getPresentation().setVisible("Platform".equals(System.getProperty(PlatformUtils.PLATFORM_PREFIX_KEY))); } } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java index 739224d9a157..4d156792a1ec 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java @@ -45,6 +45,7 @@ import com.intellij.openapi.wm.IdeFrame; import com.intellij.openapi.wm.ex.WindowManagerEx; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; +import com.intellij.util.PlatformUtils; import com.intellij.util.graph.CachingSemiGraph; import com.intellij.util.graph.DFSTBuilder; import com.intellij.util.graph.Graph; @@ -231,7 +232,7 @@ public class PluginManager { } final IdeaPluginDescriptor corePluginDescriptor = idToDescriptorMap.get(PluginId.getId(CORE_PLUGIN_ID)); - assert corePluginDescriptor != null : CORE_PLUGIN_ID + " not found; platform prefix is " + System.getProperty("idea.platform.prefix"); + assert corePluginDescriptor != null : CORE_PLUGIN_ID + " not found; platform prefix is " + System.getProperty(PlatformUtils.PLATFORM_PREFIX_KEY); for (IdeaPluginDescriptorImpl descriptor : result) { if (descriptor != corePluginDescriptor) { descriptor.insertDependency(corePluginDescriptor); @@ -631,7 +632,7 @@ public class PluginManager { private static void loadDescriptorsFromClassPath(final List result, @Nullable StartupProgress progress) { try { final Collection urls = getClassLoaderUrls(); - final String platformPrefix = System.getProperty("idea.platform.prefix"); + final String platformPrefix = System.getProperty(PlatformUtils.PLATFORM_PREFIX_KEY); int i = 0; for (URL url : urls) { i++; diff --git a/platform/platform-main/src/com/intellij/idea/MainImpl.java b/platform/platform-main/src/com/intellij/idea/MainImpl.java index 4e86563d7da5..41760d6b2d0d 100644 --- a/platform/platform-main/src/com/intellij/idea/MainImpl.java +++ b/platform/platform-main/src/com/intellij/idea/MainImpl.java @@ -22,6 +22,7 @@ import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.impl.ApplicationInfoImpl; import com.intellij.openapi.diagnostic.Logger; import com.intellij.ui.AppUIUtil; +import com.intellij.util.PlatformUtils; import com.intellij.util.text.DateFormatUtilRt; import com.intellij.util.ui.UIUtil; @@ -37,9 +38,7 @@ public class MainImpl { * Called from PluginManager via reflection. */ protected static void start(final String[] args) { - if (System.getProperty("idea.platform.prefix") == null) { - System.setProperty("idea.platform.prefix", "Idea"); - } + System.setProperty(PlatformUtils.PLATFORM_PREFIX_KEY, PlatformUtils.getPlatformPrefix(PlatformUtils.COMMUNITY_PREFIX)); StartupUtil.isHeadless = Main.isHeadless(args); if (!StartupUtil.isHeadless) { diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java index dd20c25fd090..794cd1eae27b 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java @@ -68,6 +68,7 @@ import com.intellij.psi.impl.DocumentCommitThread; import com.intellij.psi.impl.PsiManagerEx; import com.intellij.psi.impl.source.tree.injected.InjectedLanguageManagerImpl; import com.intellij.util.PatchedWeakReference; +import com.intellij.util.PlatformUtils; import com.intellij.util.indexing.IndexableSetContributor; import com.intellij.util.indexing.IndexedRootsProvider; import com.intellij.util.ui.UIUtil; @@ -813,7 +814,7 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro } private static void setPlatformPrefix(String prefix) { - System.setProperty("idea.platform.prefix", prefix); + System.setProperty(PlatformUtils.PLATFORM_PREFIX_KEY, prefix); } @Retention(RetentionPolicy.RUNTIME)