diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java index 4e8b6431eb9d..053ca2dfbd4c 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java @@ -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; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java index 38fd08bc062e..6363e73b3693 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java @@ -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; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectDataService.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectDataService.java index 71a0c9e03bd6..57117db67897 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectDataService.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectDataService.java @@ -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; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectSerializer.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectSerializer.java index 3effbaed5ee1..a92ee45be08e 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectSerializer.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectSerializer.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalFilter.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalFilter.java similarity index 96% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalFilter.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalFilter.java index 6bc9cf9aed94..d0d06c0d5a89 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalFilter.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalFilter.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalPlugin.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalPlugin.java similarity index 95% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalPlugin.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalPlugin.java index 8b7991b1d88c..fc63c162b884 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalPlugin.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalPlugin.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalProject.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java similarity index 99% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalProject.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java index cecb9ad33c12..00f8774272c2 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalProject.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalSourceDirectorySet.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceDirectorySet.java similarity index 98% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalSourceDirectorySet.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceDirectorySet.java index 8121c0ccaa8a..dae70764af32 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalSourceDirectorySet.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceDirectorySet.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalSourceSet.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java similarity index 97% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalSourceSet.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java index 19d692dd1985..0cf6714b7a19 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalSourceSet.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalTask.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalTask.java similarity index 97% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalTask.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalTask.java index e9392eb52e84..5cefc8d65d85 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalTask.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/DefaultExternalTask.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalFilter.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalFilter.java similarity index 94% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalFilter.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalFilter.java index 98fc003cb645..2ab9de862a59 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalFilter.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalFilter.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalPlugin.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalPlugin.java similarity index 94% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalPlugin.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalPlugin.java index edd3db771b3f..8777b5b72daf 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalPlugin.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalPlugin.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalProject.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalProject.java similarity index 97% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalProject.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalProject.java index 6df2d413d0fd..5979724d4650 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalProject.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalProject.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalSourceDirectorySet.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalSourceDirectorySet.java similarity index 96% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalSourceDirectorySet.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalSourceDirectorySet.java index 530d4d4c0695..1b875276720d 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalSourceDirectorySet.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalSourceDirectorySet.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalSourceSet.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalSourceSet.java similarity index 95% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalSourceSet.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalSourceSet.java index b23c07bbafa6..7759588986a3 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalSourceSet.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalSourceSet.java @@ -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; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalTask.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalTask.java similarity index 94% rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalTask.java rename to plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalTask.java index b4c61c662acc..13831bfc1d4b 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalTask.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalTask.java @@ -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; diff --git a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ModuleExtendedModel.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ModuleExtendedModel.java index 54b088b0a2bd..b5f72c6b7080 100644 --- a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ModuleExtendedModel.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ModuleExtendedModel.java @@ -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 diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy index b768a522fddd..c301cb14afe5 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy @@ -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 diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java index c71869c385d1..fb9fccc22cee 100644 --- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java +++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java @@ -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;