This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 3929f3d892 Move NbProjectInfo out of Gradle API package 3929f3d892 is described below commit 3929f3d89229baa9ca7aa3941f10254f490225b1 Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com> AuthorDate: Thu Mar 31 07:00:25 2022 -0700 Move NbProjectInfo out of Gradle API package --- .../nbproject/org-netbeans-modules-gradle.sig | 26 ---------------------- .../org/netbeans/modules/gradle/DebugTooling.java | 2 +- .../gradle/tooling/NbProjectInfoBuilder.java | 2 +- .../modules/gradle/tooling/NbProjectInfoModel.java | 2 +- .../gradle/tooling/NetBeansToolingPlugin.java | 2 +- .../{api => tooling/internal}/ModelFetcher.java | 2 +- .../{api => tooling/internal}/NbProjectInfo.java | 2 +- .../modules/gradle/cache/ProjectInfoDiskCache.java | 4 ++-- .../gradle/loaders/AbstractProjectLoader.java | 2 +- .../gradle/loaders/BundleProjectLoader.java | 3 +-- .../gradle/loaders/LegacyProjectLoader.java | 4 ++-- .../modules/gradle/loaders/ModelCache.java | 2 +- .../loaders/NbProjectInfoCachingDescriptor.java | 2 +- 13 files changed, 14 insertions(+), 41 deletions(-) diff --git a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig index c95a1b7659..a1d7b34833 100644 --- a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig +++ b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig @@ -230,23 +230,6 @@ meth public java.lang.String getPath() supr java.lang.Object hfds CAMLE_CASE_SPLITTER,description,group,name,path -CLSS public final org.netbeans.modules.gradle.api.ModelFetcher -cons public init() -cons public init(java.util.concurrent.ExecutorService) -meth public <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.concurrent.Future<{%%0}> requestModel(java.lang.Class<{%%0}>,java.lang.Class<{%%1}>,org.gradle.api.Action<? super {%%1}>) -meth public <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.concurrent.Future<{%%0}> requestModel(java.lang.String,java.lang.Class<{%%0}>,java.lang.Class<{%%1}>,org.gradle.api.Action<? super {%%1}>) -meth public <%0 extends java.lang.Object, %1 extends java.lang.Object> void modelAction(java.lang.String,java.lang.Class<{%%0}>,java.lang.Class<{%%1}>,org.gradle.api.Action<? super {%%1}>,org.gradle.api.Action<{%%0}>,org.gradle.api.Action<java.lang.Exception>) -meth public <%0 extends java.lang.Object, %1 extends java.lang.Object> void modelAction(java.lang.String,java.lang.Class<{%%0}>,org.gradle.api.Action<{%%0}>) -meth public <%0 extends java.lang.Object, %1 extends java.lang.Object> void modelAction(java.lang.String,java.lang.Class<{%%0}>,org.gradle.api.Action<{%%0}>,org.gradle.api.Action<java.lang.Exception>) -meth public <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> requestModel(java.lang.Class<{%%0}>) -meth public <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> requestModel(java.lang.String,java.lang.Class<{%%0}>) -meth public boolean awaitTermination(long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException -meth public boolean isAcceptingRequests() -meth public void fetchModels(org.gradle.tooling.ProjectConnection,org.gradle.api.Action<? super org.gradle.tooling.BuildActionExecuter>) -supr java.lang.Object -hfds REQUEST_SEQUENCER,action,executor,lock,modelResults -hcls ModelRequest,ModelResult,MultiModelAction - CLSS public abstract interface org.netbeans.modules.gradle.api.ModuleSearchSupport meth public abstract java.util.Set<org.netbeans.modules.gradle.api.GradleDependency$ModuleDependency> findModules(java.lang.String) meth public abstract java.util.Set<org.netbeans.modules.gradle.api.GradleDependency$ModuleDependency> findModules(java.lang.String,java.lang.String,java.lang.String) @@ -297,15 +280,6 @@ meth public static org.netbeans.modules.gradle.api.NbGradleProject$Quality value meth public static org.netbeans.modules.gradle.api.NbGradleProject$Quality[] values() supr java.lang.Enum<org.netbeans.modules.gradle.api.NbGradleProject$Quality> -CLSS public abstract interface org.netbeans.modules.gradle.api.NbProjectInfo -intf org.gradle.tooling.model.Model -intf org.netbeans.modules.gradle.tooling.Model -meth public abstract boolean getMiscOnly() -meth public abstract java.util.Map<java.lang.String,java.lang.Object> getExt() -meth public abstract java.util.Map<java.lang.String,java.lang.Object> getInfo() -meth public abstract java.util.Set<java.lang.String> getProblems() -meth public abstract java.util.Set<org.netbeans.modules.gradle.api.NbProjectInfo.Report> getReports() - CLSS public abstract interface org.netbeans.modules.gradle.api.execute.ActionMapping fld public final static java.lang.String CUSTOM_PREFIX = "custom-" innr public final static !enum ReloadRule diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/DebugTooling.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/DebugTooling.java index 8b2866bf00..859fd0ed4e 100644 --- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/DebugTooling.java +++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/DebugTooling.java @@ -19,7 +19,7 @@ package org.netbeans.modules.gradle; -import org.netbeans.modules.gradle.api.NbProjectInfo; +import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo; import java.io.File; import java.io.Serializable; import java.util.ArrayList; diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java index ff6c30571d..346fe53226 100644 --- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java +++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java @@ -69,7 +69,7 @@ import org.gradle.jvm.JvmLibrary; import org.gradle.language.base.artifact.SourcesArtifact; import org.gradle.language.java.artifact.JavadocArtifact; import org.gradle.util.VersionNumber; -import org.netbeans.modules.gradle.api.NbProjectInfo; +import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo; /** * diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoModel.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoModel.java index 422fa59599..b634992ea1 100644 --- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoModel.java +++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoModel.java @@ -20,7 +20,7 @@ package org.netbeans.modules.gradle.tooling; import java.io.Serializable; -import org.netbeans.modules.gradle.api.NbProjectInfo; +import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansToolingPlugin.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansToolingPlugin.java index 84a0c32023..0fe4a15333 100644 --- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansToolingPlugin.java +++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansToolingPlugin.java @@ -19,7 +19,7 @@ package org.netbeans.modules.gradle.tooling; -import org.netbeans.modules.gradle.api.NbProjectInfo; +import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.NotSerializableException; diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/api/ModelFetcher.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/internal/ModelFetcher.java similarity index 99% rename from extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/api/ModelFetcher.java rename to extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/internal/ModelFetcher.java index 4457bd030b..c4c9f23bb0 100644 --- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/api/ModelFetcher.java +++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/internal/ModelFetcher.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.netbeans.modules.gradle.api; +package org.netbeans.modules.gradle.tooling.internal; import java.io.Serializable; import java.util.HashMap; diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/api/NbProjectInfo.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/internal/NbProjectInfo.java similarity index 96% rename from extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/api/NbProjectInfo.java rename to extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/internal/NbProjectInfo.java index ead7c1ebc6..54016b47e7 100644 --- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/api/NbProjectInfo.java +++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/internal/NbProjectInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.netbeans.modules.gradle.api; +package org.netbeans.modules.gradle.tooling.internal; import org.netbeans.modules.gradle.tooling.Model; import java.util.Map; diff --git a/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java b/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java index 74757cdb6f..127130c78d 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java @@ -34,8 +34,8 @@ import org.netbeans.api.annotations.common.NonNull; import org.netbeans.modules.gradle.NbGradleProjectImpl; import org.netbeans.modules.gradle.cache.ProjectInfoDiskCache.QualifiedProjectInfo; import org.netbeans.modules.gradle.api.NbGradleProject.Quality; -import org.netbeans.modules.gradle.api.NbProjectInfo; -import org.netbeans.modules.gradle.api.NbProjectInfo.Report; +import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo; +import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo.Report; import org.netbeans.modules.gradle.spi.GradleFiles; /** diff --git a/extide/gradle/src/org/netbeans/modules/gradle/loaders/AbstractProjectLoader.java b/extide/gradle/src/org/netbeans/modules/gradle/loaders/AbstractProjectLoader.java index 898fa3aed0..6847754a59 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/loaders/AbstractProjectLoader.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/loaders/AbstractProjectLoader.java @@ -31,7 +31,7 @@ import org.netbeans.modules.gradle.api.GradleBaseProject; import org.netbeans.modules.gradle.api.NbGradleProject; import static org.netbeans.modules.gradle.api.NbGradleProject.Quality.EVALUATED; import static org.netbeans.modules.gradle.api.NbGradleProject.Quality.FALLBACK; -import org.netbeans.modules.gradle.api.NbProjectInfo.Report; +import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo.Report; import org.netbeans.modules.gradle.api.execute.GradleCommandLine; import org.netbeans.modules.gradle.cache.ProjectInfoDiskCache; import org.netbeans.modules.gradle.cache.SubProjectDiskCache; diff --git a/extide/gradle/src/org/netbeans/modules/gradle/loaders/BundleProjectLoader.java b/extide/gradle/src/org/netbeans/modules/gradle/loaders/BundleProjectLoader.java index f513009e8e..f6036c42fe 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/loaders/BundleProjectLoader.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/loaders/BundleProjectLoader.java @@ -22,8 +22,7 @@ import java.io.File; import java.util.logging.Logger; import org.netbeans.modules.gradle.GradleProject; import org.netbeans.modules.gradle.api.NbGradleProject; -import org.netbeans.modules.gradle.api.NbProjectInfo; -import org.netbeans.modules.gradle.cache.AbstractDiskCache; +import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo; import org.netbeans.modules.gradle.cache.SubProjectDiskCache; import org.netbeans.modules.gradle.cache.SubProjectDiskCache.SubProjectInfo; import org.netbeans.modules.gradle.options.GradleExperimentalSettings; diff --git a/extide/gradle/src/org/netbeans/modules/gradle/loaders/LegacyProjectLoader.java b/extide/gradle/src/org/netbeans/modules/gradle/loaders/LegacyProjectLoader.java index 2b9ba3d779..31c7d4641a 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/loaders/LegacyProjectLoader.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/loaders/LegacyProjectLoader.java @@ -67,8 +67,8 @@ import org.netbeans.modules.gradle.api.NbGradleProject.Quality; import static org.netbeans.modules.gradle.api.NbGradleProject.Quality.EVALUATED; import static org.netbeans.modules.gradle.api.NbGradleProject.Quality.FULL_ONLINE; import static org.netbeans.modules.gradle.api.NbGradleProject.Quality.SIMPLE; -import org.netbeans.modules.gradle.api.NbProjectInfo; -import org.netbeans.modules.gradle.api.NbProjectInfo.Report; +import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo; +import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo.Report; import org.netbeans.modules.gradle.api.execute.GradleCommandLine; import org.netbeans.modules.gradle.api.execute.RunUtils; import org.netbeans.modules.gradle.cache.ProjectInfoDiskCache; diff --git a/extide/gradle/src/org/netbeans/modules/gradle/loaders/ModelCache.java b/extide/gradle/src/org/netbeans/modules/gradle/loaders/ModelCache.java index 1b659dd000..5bfa003563 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/loaders/ModelCache.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/loaders/ModelCache.java @@ -26,9 +26,9 @@ import java.util.stream.Collectors; import org.gradle.tooling.ProjectConnection; import org.gradle.tooling.model.Model; import org.netbeans.api.project.Project; -import org.netbeans.modules.gradle.api.ModelFetcher; import org.netbeans.modules.gradle.api.execute.GradleCommandLine; import org.netbeans.modules.gradle.api.execute.RunUtils; +import org.netbeans.modules.gradle.tooling.internal.ModelFetcher; import static org.netbeans.modules.gradle.loaders.ModelCache.State.*; import org.netbeans.modules.gradle.spi.GradleSettings; import org.openide.util.RequestProcessor; diff --git a/extide/gradle/src/org/netbeans/modules/gradle/loaders/NbProjectInfoCachingDescriptor.java b/extide/gradle/src/org/netbeans/modules/gradle/loaders/NbProjectInfoCachingDescriptor.java index 6bb4eba489..b7fe294024 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/loaders/NbProjectInfoCachingDescriptor.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/loaders/NbProjectInfoCachingDescriptor.java @@ -21,7 +21,7 @@ package org.netbeans.modules.gradle.loaders; import java.util.Set; import org.netbeans.modules.gradle.GradleProjectStructure; import org.netbeans.modules.gradle.api.NbGradleProject.Quality; -import org.netbeans.modules.gradle.api.NbProjectInfo; +import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo; import org.netbeans.modules.gradle.api.execute.GradleCommandLine; import org.netbeans.modules.gradle.cache.ProjectInfoDiskCache; import org.netbeans.modules.gradle.spi.GradleFiles; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists