MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

gradle specific models moved from external system api to gradle tooling api

Browse Source
This commit is contained in:
Vladislav.Soroka
2015-08-03 12:43:48 +03:00
parent 501f287e6f
commit f25eb40fb0
19 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java
+4 -4
View File
@@ -23,10 +23,10 @@ import com.intellij.openapi.compiler.CompileContext;
import com.intellij.openapi.compiler.CompilerMessageCategory;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.externalSystem.model.ExternalFilter;
import com.intellij.openapi.externalSystem.model.ExternalProject;
import com.intellij.openapi.externalSystem.model.ExternalSourceDirectorySet;
import com.intellij.openapi.externalSystem.model.ExternalSourceSet;
import org.jetbrains.plugins.gradle.model.ExternalFilter;
import org.jetbrains.plugins.gradle.model.ExternalProject;
import org.jetbrains.plugins.gradle.model.ExternalSourceDirectorySet;
import org.jetbrains.plugins.gradle.model.ExternalSourceSet;
import com.intellij.openapi.externalSystem.model.project.ExternalSystemSourceType;
import com.intellij.openapi.externalSystem.service.project.manage.ProjectDataManager;
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java
+3 -3
View File
@@ -19,9 +19,9 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.ApplicationEx;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.externalSystem.model.ExternalProject;
import com.intellij.openapi.externalSystem.model.ExternalSourceDirectorySet;
import com.intellij.openapi.externalSystem.model.ExternalSourceSet;
import org.jetbrains.plugins.gradle.model.ExternalProject;
import org.jetbrains.plugins.gradle.model.ExternalSourceDirectorySet;
import org.jetbrains.plugins.gradle.model.ExternalSourceSet;
import com.intellij.openapi.externalSystem.model.project.ExternalSystemSourceType;
import com.intellij.openapi.externalSystem.service.project.manage.ProjectDataManager;
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectDataService.java
+2
View File
@@ -30,6 +30,8 @@ import com.intellij.util.containers.ConcurrentFactoryMap;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.gradle.model.DefaultExternalProject;
import org.jetbrains.plugins.gradle.model.ExternalProject;
import java.io.File;
import java.util.Collection;
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectSerializer.java
+1
View File
@@ -35,6 +35,7 @@ import gnu.trove.THashMap;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.gradle.model.*;
import org.objenesis.strategy.StdInstantiatorStrategy;
import java.io.File;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalFilter.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalFilter.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import org.jetbrains.annotations.NotNull;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalPlugin.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalPlugin.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import org.jetbrains.annotations.NotNull;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalProject.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalSourceDirectorySet.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceDirectorySet.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import org.jetbrains.annotations.NotNull;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalSourceSet.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import com.intellij.openapi.externalSystem.model.project.ExternalSystemSourceType;
import com.intellij.openapi.externalSystem.model.project.IExternalSystemSourceType;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalTask.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalTask.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalFilter.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalFilter.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalPlugin.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalPlugin.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalProject.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalProject.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalSourceDirectorySet.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalSourceDirectorySet.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import org.jetbrains.annotations.NotNull;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalSourceSet.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalSourceSet.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import com.intellij.openapi.externalSystem.model.project.IExternalSystemSourceType;
import org.jetbrains.annotations.NotNull;
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalTask.java → plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalTask.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.externalSystem.model;
package org.jetbrains.plugins.gradle.model;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ModuleExtendedModel.java
+1 -1
View File
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.Set;
/**
* @deprecated Use {@link com.intellij.openapi.externalSystem.model.ExternalProject} model instead.
* @deprecated Use {@link ExternalProject} model instead.
*
* @author Vladislav.Soroka
* @since 11/5/13
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy
+12 -1
View File
@@ -16,7 +16,6 @@
package org.jetbrains.plugins.gradle.tooling.builder
import com.google.gson.GsonBuilder
import com.intellij.openapi.externalSystem.model.*
import com.intellij.openapi.externalSystem.model.project.ExternalSystemSourceType
import org.gradle.api.Action
import org.gradle.api.Project
@@ -29,6 +28,18 @@ import org.gradle.api.tasks.util.PatternFilterable
import org.gradle.plugins.ide.idea.IdeaPlugin
import org.jetbrains.annotations.NotNull
import org.jetbrains.annotations.Nullable
import org.jetbrains.plugins.gradle.model.DefaultExternalFilter
import org.jetbrains.plugins.gradle.model.DefaultExternalPlugin
import org.jetbrains.plugins.gradle.model.DefaultExternalProject
import org.jetbrains.plugins.gradle.model.DefaultExternalSourceDirectorySet
import org.jetbrains.plugins.gradle.model.DefaultExternalSourceSet
import org.jetbrains.plugins.gradle.model.DefaultExternalTask
import org.jetbrains.plugins.gradle.model.ExternalFilter
import org.jetbrains.plugins.gradle.model.ExternalPlugin
import org.jetbrains.plugins.gradle.model.ExternalProject
import org.jetbrains.plugins.gradle.model.ExternalSourceDirectorySet
import org.jetbrains.plugins.gradle.model.ExternalSourceSet
import org.jetbrains.plugins.gradle.model.ExternalTask
import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
+1 -1
View File
@@ -15,7 +15,7 @@
*/
package org.jetbrains.plugins.gradle.tooling.builder;
import com.intellij.openapi.externalSystem.model.ExternalProject;
import org.jetbrains.plugins.gradle.model.ExternalProject;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.testFramework.IdeaTestUtil;