CPP-434 Rename [python-configure] to [python-community-configure] and associative...
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 30 Dec 2015 11:52:26 +0000 (14:52 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 30 Dec 2015 11:52:26 +0000 (14:52 +0300)
28 files changed:
python/build/pycharm_community_build.gant
python/edu/build/pycharm_edu_build.gant
python/edu/interactive-learning-python/interactive-learning-python.iml
python/ide/python-ide-community.iml
python/ide/src/META-INF/pycharm-core.xml
python/python-community-configure/python-community-configure.iml [moved from python/python-configure/python-configure.iml with 100% similarity]
python/python-community-configure/resources/META-INF/python-community-configure-common.xml [moved from python/python-configure/resources/META-INF/python-configure-core.xml with 76% similarity]
python/python-community-configure/resources/META-INF/python-community-configure-ide.xml [moved from python/python-configure/resources/META-INF/python-configure.xml with 92% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form [moved from python/python-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java [moved from python/python-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/EditSdkDialog.form [moved from python/python-configure/src/com/jetbrains/python/configuration/EditSdkDialog.form with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/EditSdkDialog.java [moved from python/python-configure/src/com/jetbrains/python/configuration/EditSdkDialog.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java with 96% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java with 95% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form [moved from python/python-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PythonPathDialog.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PythonPathDialog.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PythonPathEditor.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PythonPathEditor.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java [moved from python/python-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java with 100% similarity]
python/python-community-configure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java [moved from python/python-configure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java with 100% similarity]

index d7af0aae5932ab9da38693607873036c431308df..d5d6f2a84f61d673411a062cf54507f9b89d61bd 100644 (file)
@@ -29,7 +29,7 @@ private List<String> pycharmPlatformApiModules() {
 
 private List pycharmImplementationModules() {   //modules to put into pycharm.jar
   return [platformImplementationModules, "dom-impl", "python-community", "python-community-ide-resources",
-    "python-ide-community", "python-configure", "python-openapi", "python-psi-api", "platform-main"].flatten()
+    "python-ide-community", "python-community-configure", "python-openapi", "python-psi-api", "platform-main"].flatten()
 }
 
 private List modules() {
index ec4dd5eeefd3cacea8309fe9f94655f391baebea..4b1158acb42361c2460e261c299deb539cc601e7 100644 (file)
@@ -49,7 +49,7 @@ private List<String> pycharmPlatformApiModules() {
 
 private List pycharmImplementationModules() {   //modules to put into pycharm.jar
   return [platformImplementationModules, "dom-impl", "python-community", "python-community-ide-resources", 
-    "python-ide-community", "python-configure", "python-educational", "python-openapi", "python-psi-api", "platform-main"].flatten()
+    "python-ide-community", "python-community-configure", "python-educational", "python-openapi", "python-psi-api", "platform-main"].flatten()
 }
 
 private List modules() {
index ab3167ef0388f3864477e16bbdd658a588a04ad8..7af754a59191b32fce61d6c110027468ffd06e1a 100644 (file)
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="python-community-ide-resources" />
     <orderEntry type="module" module-name="python-community" />
+    <orderEntry type="module" module-name="python-community-configure" />
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="module" module-name="python-ide-community" />
     <orderEntry type="library" name="gson" level="project" />
@@ -20,6 +21,5 @@
     <orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
     <orderEntry type="module" module-name="educational" />
     <orderEntry type="module" module-name="python-educational" />
-    <orderEntry type="module" module-name="python-configure" />
   </component>
 </module>
\ No newline at end of file
index ef008ae11559c215c067b421e6a32fbe96c45252..14e0fc138805d2d0e36b6bc1ea223c96bff9c3f7 100644 (file)
@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="module" module-name="python-community-ide-resources" />
     <orderEntry type="module" module-name="python-community" />
-    <orderEntry type="module" module-name="python-configure" />
+    <orderEntry type="module" module-name="python-community-configure" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="library" name="Guava" level="project" />
index 98471c75b9d29b4cb4d3fd8cb71e2abe00492b66..612c27aaded92bdcb68b49599971a654cd62e245 100644 (file)
@@ -14,7 +14,7 @@
   <xi:include href="/META-INF/RemoteServers.xml" xpointer="xpointer(/idea-plugin/*)">
     <xi:fallback/>
   </xi:include>
-  <xi:include href="/META-INF/python-configure.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/python-community-configure-ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <application-components>
     <component>
similarity index 76%
rename from python/python-configure/resources/META-INF/python-configure-core.xml
rename to python/python-community-configure/resources/META-INF/python-community-configure-common.xml
index fcf209f60c7ab6c041c6895d635093482ac2f166..4c5ca9ea7ac051fcfc48909172afd26a49f82ea6 100644 (file)
@@ -1,9 +1,7 @@
 <idea-plugin version="2" url="https://confluence.jetbrains.com/display/PYH/">
-  <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
+  <!-- Components and extensions declared in this file work ONLY in PyCharm and CLion Python plugin, not in Standard Python plugin.
        Both Community and Professional editions. -->
 
-  <!-- Components and extensions declared in this file work in CLion Python Plugin to configure Python toolchain -->
-
   <extensions defaultExtensionNs="com.intellij">
     <projectService serviceInterface="com.jetbrains.python.configuration.PyConfigurableInterpreterList"
                     serviceImplementation="com.jetbrains.python.configuration.PyConfigurableInterpreterList"/>
similarity index 92%
rename from python/python-configure/resources/META-INF/python-configure.xml
rename to python/python-community-configure/resources/META-INF/python-community-configure-ide.xml
index 9467c46e181e9709c85c91e4d3bde04e6d32c0cb..ed54098266fd070e8f7e646342a14b8e3ef7dca4 100644 (file)
@@ -2,7 +2,7 @@
   <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
        Both Community and Professional editions. -->
 
-  <xi:include href="/META-INF/python-configure-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/python-community-configure-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <extensions defaultExtensionNs="com.intellij">
     <projectConfigurable groupId="project"
                          id="com.jetbrains.python.configuration.PythonContentEntriesConfigurable"
similarity index 96%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
index 383fb92c4b7c85e27e80815a16937983cacabd47..6d025d44fb0dc6326f3753b5ba50896f13510053 100644 (file)
@@ -19,7 +19,6 @@ import com.intellij.ide.DataManager;
 import com.intellij.openapi.options.ex.Settings;
 import com.intellij.ui.ClickListener;
 import com.intellij.ui.components.JBLabel;
-import com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
similarity index 95%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
index ed969cb00bff1fdb78a092b77ba24999265b66cf..1af2dec2dc31783c6d2b1a0b0d6b20eba9d874df 100644 (file)
@@ -19,7 +19,6 @@ import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurableProvider;
 import com.intellij.openapi.project.Project;
-import com.jetbrains.python.configuration.PyDependenciesConfigurable;
 
 /**
  * @author Sergey.Malenkov