MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

merge edu-intellij into student

Browse Source
This commit is contained in:
Liana.Bakradze
2017-03-01 17:39:45 +03:00
parent a6c6f24b23
commit 2c6cf5f646
16 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/modules.xml generated
View File

@@ -256,7 +256,6 @@
<module fileurl="file://$PROJECT_DIR$/platform/structure-view-impl/structure-view-impl.iml" filepath="$PROJECT_DIR$/platform/structure-view-impl/structure-view-impl.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/python/educational-core/student/student.iml" filepath="$PROJECT_DIR$/python/educational-core/student/student.iml" group="python/educational/educational-core" />
<module fileurl="file://$PROJECT_DIR$/python/educational-python/student-python/student-python.iml" filepath="$PROJECT_DIR$/python/educational-python/student-python/student-python.iml" group="python/educational/educational-python" />
<module fileurl="file://$PROJECT_DIR$/python/educational-core/edu-intellij/edu-intellij.iml" filepath="$PROJECT_DIR$/python/educational-core/edu-intellij/edu-intellij.iml" group="plugins/python/educational/educational-core" />
<module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/svn4idea.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/svn4idea.iml" group="plugins/VCS" />
<module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/svn4idea-tests.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/svn4idea-tests.iml" group="plugins/VCS" />
<module fileurl="file://$PROJECT_DIR$/plugins/tasks/tasks-api/tasks-api.iml" filepath="$PROJECT_DIR$/plugins/tasks/tasks-api/tasks-api.iml" group="plugins/tasks" />

1
python/educational-core/build.gradle
View File

@@ -79,7 +79,6 @@ private static String getIdeaPath() {
project(':student') {
dependencies {
compile project(':edu-intellij')
compile fileTree(dir: 'lib', include: ['*.jar'])
}

15
python/educational-core/edu-intellij/edu-intellij.iml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="platform-impl" />
<orderEntry type="module" module-name="lang-api" />
<orderEntry type="module" module-name="idea-ui" />
</component>
</module>

2
python/educational-core/gradle.properties
View File

@@ -1,6 +1,6 @@
ideaVersion IC-LATEST-TRUNK-SNAPSHOT
downloadIdeaSources false
version 3.5.0
version 4.0
buildNumber 171
javaVersion 1.8
updateBuildNumber false

2
python/educational-core/settings.gradle
View File

@@ -1 +1 @@
include 'student', 'course-creator', 'edu-intellij'
include 'student', 'course-creator'

2
python/educational-core/student/resources/META-INF/android-dependencies.xml
View File

@@ -1,6 +1,6 @@
<idea-plugin>
<actions>
<action id="Edu.StartLearn" class="com.jetbrains.edu.intellij.android.EduStartLearningAction" text="Start Learning"
<action id="Edu.StartLearn" class="com.jetbrains.edu.learning.intellij.android.EduStartLearningAction" text="Start Learning"
description="Create New Educational Project">
<add-to-group group-id="WelcomeScreen.QuickStart" anchor="last"/>
<add-to-group group-id="FileMenu" anchor="last"/>

2
python/educational-core/student/resources/META-INF/edu-intellij.xml
View File

@@ -1,6 +1,6 @@
<idea-plugin>
<extensions defaultExtensionNs="com.intellij">
<projectTemplatesFactory implementation="com.jetbrains.edu.intellij.EduIntelliJTemplateFactory"/>
<projectTemplatesFactory implementation="com.jetbrains.edu.learning.intellij.EduIntelliJTemplateFactory"/>
</extensions>
</idea-plugin>

4
python/educational-core/student/resources/META-INF/plugin.xml
View File

@@ -37,9 +37,9 @@
</application-components>
<extensionPoints>
<extensionPoint qualifiedName="Edu.eduIntelliJProjectTemplate" interface="com.jetbrains.edu.intellij.EduIntelliJProjectTemplate"/>
<extensionPoint qualifiedName="Edu.eduIntelliJProjectTemplate" interface="com.jetbrains.edu.learning.intellij.EduIntelliJProjectTemplate"/>
<extensionPoint qualifiedName="Edu.courseConfigurator" beanClass="com.intellij.lang.LanguageExtensionPoint">
<with attribute="implementationClass" implements="com.jetbrains.edu.intellij.EduCourseConfigurator"/>
<with attribute="implementationClass" implements="com.jetbrains.edu.learning.intellij.EduCourseConfigurator"/>
</extensionPoint>
<extensionPoint qualifiedName="Edu.StudyExecutor" beanClass="com.intellij.lang.LanguageExtensionPoint">
<with attribute="implementationClass" implements="com.jetbrains.edu.learning.checker.StudyExecutor"/>

0
python/educational-core/edu-intellij/resources/fileTemplates/internal/EduTestRunner.java.ft → python/educational-core/student/resources/fileTemplates/internal/EduTestRunner.java.ft
View File

2
python/educational-core/edu-intellij/src/com/jetbrains/edu/intellij/EduCourseConfigurator.java → python/educational-core/student/src/com/jetbrains/edu/learning/intellij/EduCourseConfigurator.java
View File

@@ -1,4 +1,4 @@
package com.jetbrains.edu.intellij;
package com.jetbrains.edu.learning.intellij;
import com.intellij.lang.LanguageExtension;
import com.intellij.openapi.project.Project;

2
python/educational-core/edu-intellij/src/com/jetbrains/edu/intellij/EduIntelliJProjectTemplate.java → python/educational-core/student/src/com/jetbrains/edu/learning/intellij/EduIntelliJProjectTemplate.java
View File

@@ -1,4 +1,4 @@
package com.jetbrains.edu.intellij;
package com.jetbrains.edu.learning.intellij;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.platform.ProjectTemplate;

2
python/educational-core/edu-intellij/src/com/jetbrains/edu/intellij/EduIntelliJTemplateFactory.java → python/educational-core/student/src/com/jetbrains/edu/learning/intellij/EduIntelliJTemplateFactory.java
View File

@@ -1,4 +1,4 @@
package com.jetbrains.edu.intellij;
package com.jetbrains.edu.learning.intellij;
import com.intellij.icons.AllIcons;
import com.intellij.ide.util.projectWizard.WizardContext;

4
python/educational-core/edu-intellij/src/com/jetbrains/edu/intellij/android/EduSelectCourseProjectWizard.java → python/educational-core/student/src/com/jetbrains/edu/learning/intellij/android/EduSelectCourseProjectWizard.java
View File

@@ -1,4 +1,4 @@
package com.jetbrains.edu.intellij.android;
package com.jetbrains.edu.learning.intellij.android;
import com.intellij.ide.projectWizard.ProjectSettingsStep;
import com.intellij.ide.projectWizard.ProjectTemplateList;
@@ -8,7 +8,7 @@ import com.intellij.ide.util.projectWizard.ModuleWizardStep;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
import com.intellij.platform.ProjectTemplate;
import com.jetbrains.edu.intellij.EduIntelliJProjectTemplate;
import com.jetbrains.edu.learning.intellij.EduIntelliJProjectTemplate;
import javax.swing.*;
import java.util.ArrayList;

4
python/educational-core/edu-intellij/src/com/jetbrains/edu/intellij/android/EduStartLearningAction.java → python/educational-core/student/src/com/jetbrains/edu/learning/intellij/android/EduStartLearningAction.java
View File

@@ -1,11 +1,11 @@
package com.jetbrains.edu.intellij.android;
package com.jetbrains.edu.learning.intellij.android;
import com.intellij.icons.AllIcons;
import com.intellij.ide.impl.NewProjectUtil;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.application.ApplicationManager;
import com.jetbrains.edu.intellij.EduIntelliJProjectTemplate;
import com.jetbrains.edu.learning.intellij.EduIntelliJProjectTemplate;
public class EduStartLearningAction extends AnAction {

1
python/educational-core/student/student.iml
View File

@@ -36,6 +36,7 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="testFramework" scope="TEST" />
<orderEntry type="module" module-name="idea-ui" />
<orderEntry type="module" module-name="testExtensions" scope="TEST" />
</component>
</module>

4
python/educational-python/gradle.properties
View File

@@ -1,7 +1,7 @@
ideaVersion IC-171-SNAPSHOT
downloadIdeaSources false
version 3.5.0
version 4.0
buildNumber 171
javaVersion 1.8
pycharmVersion 171.3019.3
pycharmVersion 172.199
updateBuildNumber false