From 67eb11fae1197095e3d6f1edf1a5d3f5abc1a4a0 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 20 Oct 2016 09:57:41 -0700 Subject: [PATCH] commons-java project Bring package names in line with project name --- .../properties/metadata/ValueProviderRegistry.java | 2 +- .../properties/metadata/types/StsValueHint.java | 6 +++--- .../properties/metadata/types/Type.java | 4 ++-- .../properties/metadata/types/TypeUtil.java | 14 +++++++------- .../properties/metadata/util/DeprecationUtil.java | 8 ++++---- .../{ => commons}/java/ClassFileConstants.java | 2 +- .../ide/vscode/{ => commons}/java/Flags.java | 2 +- .../vscode/{ => commons}/java/IAnnotatable.java | 2 +- .../ide/vscode/{ => commons}/java/IAnnotation.java | 2 +- .../ide/vscode/{ => commons}/java/IField.java | 2 +- .../vscode/{ => commons}/java/IJavaElement.java | 2 +- .../vscode/{ => commons}/java/IJavaProject.java | 2 +- .../ide/vscode/{ => commons}/java/IMember.java | 2 +- .../{ => commons}/java/IMemberValuePair.java | 2 +- .../ide/vscode/{ => commons}/java/IMethod.java | 4 +--- .../ide/vscode/{ => commons}/java/IType.java | 2 +- .../metadata/types => commons/java}/Signature.java | 2 +- .../java/DefaultJavaProjectFinder.java | 4 ++-- .../languageserver/java/JavaProjectFinder.java | 2 +- .../ide/vscode/testharness/TestProjectHarness.java | 4 ++-- .../yaml/DefaultSpringPropertyIndexProvider.java | 2 +- .../ide/vscode/yaml/AbstractPropsEditorTest.java | 2 +- .../ide/vscode/yaml/ApplicationYamlEditorTest.java | 2 +- .../ide/vscode/yaml/PropertyIndexHarness.java | 2 +- 24 files changed, 38 insertions(+), 40 deletions(-) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{ => commons}/java/ClassFileConstants.java (99%) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{ => commons}/java/Flags.java (99%) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{ => commons}/java/IAnnotatable.java (63%) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{ => commons}/java/IAnnotation.java (89%) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{ => commons}/java/IField.java (57%) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{ => commons}/java/IJavaElement.java (75%) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{ => commons}/java/IJavaProject.java (71%) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{ => commons}/java/IMember.java (96%) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{ => commons}/java/IMemberValuePair.java (94%) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{ => commons}/java/IMethod.java (93%) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{ => commons}/java/IType.java (98%) rename vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/{boot/properties/metadata/types => commons/java}/Signature.java (98%) diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/ValueProviderRegistry.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/ValueProviderRegistry.java index b5956c2b4..0ab3b9f07 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/ValueProviderRegistry.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/ValueProviderRegistry.java @@ -18,7 +18,7 @@ import java.util.function.Function; import org.springframework.boot.configurationmetadata.ValueProvider; import org.springframework.ide.vscode.application.properties.metadata.types.StsValueHint; -import org.springframework.ide.vscode.java.IJavaProject; +import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.util.CollectionUtil; import reactor.core.publisher.Flux; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/StsValueHint.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/StsValueHint.java index 2be186ff5..7f5bf2085 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/StsValueHint.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/StsValueHint.java @@ -7,9 +7,9 @@ import javax.inject.Provider; import org.springframework.boot.configurationmetadata.Deprecation; import org.springframework.boot.configurationmetadata.ValueHint; import org.springframework.ide.vscode.application.properties.metadata.util.DeprecationUtil; -import org.springframework.ide.vscode.java.IJavaElement; -import org.springframework.ide.vscode.java.IJavaProject; -import org.springframework.ide.vscode.java.IType; +import org.springframework.ide.vscode.commons.java.IJavaElement; +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.java.IType; import org.springframework.ide.vscode.util.Assert; import org.springframework.ide.vscode.util.HtmlSnippet; import org.springframework.ide.vscode.util.Log; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java index 12eb077c0..f7bee9770 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java @@ -14,8 +14,8 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.springframework.ide.vscode.boot.properties.metadata.types.Signature; -import org.springframework.ide.vscode.java.IType; +import org.springframework.ide.vscode.commons.java.IType; +import org.springframework.ide.vscode.commons.java.Signature; import org.springframework.ide.vscode.util.ArrayUtils; import org.springframework.ide.vscode.util.Assert; import org.springframework.ide.vscode.util.Log; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeUtil.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeUtil.java index f570974de..2b371d24d 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeUtil.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeUtil.java @@ -26,13 +26,13 @@ import javax.inject.Provider; import org.springframework.boot.configurationmetadata.Deprecation; import org.springframework.ide.vscode.application.properties.metadata.ValueProviderRegistry.ValueProviderStrategy; import org.springframework.ide.vscode.application.properties.metadata.util.DeprecationUtil; -import org.springframework.ide.vscode.boot.properties.metadata.types.Signature; -import org.springframework.ide.vscode.java.Flags; -import org.springframework.ide.vscode.java.IField; -import org.springframework.ide.vscode.java.IJavaElement; -import org.springframework.ide.vscode.java.IJavaProject; -import org.springframework.ide.vscode.java.IMethod; -import org.springframework.ide.vscode.java.IType; +import org.springframework.ide.vscode.commons.java.Flags; +import org.springframework.ide.vscode.commons.java.IField; +import org.springframework.ide.vscode.commons.java.IJavaElement; +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.java.IMethod; +import org.springframework.ide.vscode.commons.java.IType; +import org.springframework.ide.vscode.commons.java.Signature; import org.springframework.ide.vscode.util.AlwaysFailingParser; import org.springframework.ide.vscode.util.ArrayUtils; import org.springframework.ide.vscode.util.Assert; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/DeprecationUtil.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/DeprecationUtil.java index 69e4a4de9..a92e77317 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/DeprecationUtil.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/DeprecationUtil.java @@ -11,10 +11,10 @@ package org.springframework.ide.vscode.application.properties.metadata.util; import org.springframework.boot.configurationmetadata.Deprecation; -import org.springframework.ide.vscode.java.IAnnotatable; -import org.springframework.ide.vscode.java.IAnnotation; -import org.springframework.ide.vscode.java.IJavaElement; -import org.springframework.ide.vscode.java.IMemberValuePair; +import org.springframework.ide.vscode.commons.java.IAnnotatable; +import org.springframework.ide.vscode.commons.java.IAnnotation; +import org.springframework.ide.vscode.commons.java.IJavaElement; +import org.springframework.ide.vscode.commons.java.IMemberValuePair; import org.springframework.ide.vscode.util.Log; import com.google.common.collect.ImmutableSet; diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/ClassFileConstants.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ClassFileConstants.java similarity index 99% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/ClassFileConstants.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ClassFileConstants.java index 78412793e..c887531fd 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/ClassFileConstants.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ClassFileConstants.java @@ -13,7 +13,7 @@ * Andy Clement (GoPivotal, Inc) aclement@gopivotal.com - Contributions for * Bug 405104 - [1.8][compiler][codegen] Implement support for serializeable lambdas *******************************************************************************/ -package org.springframework.ide.vscode.java; +package org.springframework.ide.vscode.commons.java; public interface ClassFileConstants { diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/Flags.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Flags.java similarity index 99% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/Flags.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Flags.java index 486e59f3e..cf0f04071 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/Flags.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Flags.java @@ -10,7 +10,7 @@ * IBM Corporation - added constant AccDefault * IBM Corporation - added constants AccBridge and AccVarargs for J2SE 1.5 *******************************************************************************/ -package org.springframework.ide.vscode.java; +package org.springframework.ide.vscode.commons.java; /** * Utility class for decoding modifier flags in Java elements. diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IAnnotatable.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotatable.java similarity index 63% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IAnnotatable.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotatable.java index 23d21283d..d25caf3a6 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IAnnotatable.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotatable.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.java; +package org.springframework.ide.vscode.commons.java; public interface IAnnotatable extends IJavaElement { diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IAnnotation.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotation.java similarity index 89% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IAnnotation.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotation.java index 60bdbb772..8164f25eb 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IAnnotation.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotation.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.java; +package org.springframework.ide.vscode.commons.java; public interface IAnnotation extends IJavaElement { diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IField.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IField.java similarity index 57% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IField.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IField.java index 84b6110f3..0aab1f6e3 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IField.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IField.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.java; +package org.springframework.ide.vscode.commons.java; public interface IField extends IMember { boolean isEnumConstant(); diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IJavaElement.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaElement.java similarity index 75% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IJavaElement.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaElement.java index 04aec7bf2..9e10a21b6 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IJavaElement.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaElement.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.java; +package org.springframework.ide.vscode.commons.java; import org.springframework.ide.vscode.util.HtmlSnippet; diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IJavaProject.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaProject.java similarity index 71% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IJavaProject.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaProject.java index fd02c0b71..13dfb5dcf 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IJavaProject.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaProject.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.java; +package org.springframework.ide.vscode.commons.java; import java.nio.file.Path; diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IMember.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMember.java similarity index 96% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IMember.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMember.java index dd0860515..c8fa03a45 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IMember.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMember.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.java; +package org.springframework.ide.vscode.commons.java; public interface IMember extends IJavaElement, IAnnotatable { diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IMemberValuePair.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMemberValuePair.java similarity index 94% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IMemberValuePair.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMemberValuePair.java index fdd7b4030..0aa41945a 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IMemberValuePair.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMemberValuePair.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.java; +package org.springframework.ide.vscode.commons.java; public interface IMemberValuePair { diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IMethod.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMethod.java similarity index 93% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IMethod.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMethod.java index 758898feb..89487e95b 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IMethod.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMethod.java @@ -1,6 +1,4 @@ -package org.springframework.ide.vscode.java; - -import org.springframework.ide.vscode.boot.properties.metadata.types.Signature; +package org.springframework.ide.vscode.commons.java; public interface IMethod extends IMember { diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IType.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IType.java similarity index 98% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IType.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IType.java index a1c821262..c4e4a59cc 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/java/IType.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IType.java @@ -11,7 +11,7 @@ * Stephan Herrmann - Contribution for * Bug 463533 - Signature.getSignatureSimpleName() returns different results for resolved and unresolved extends *******************************************************************************/ -package org.springframework.ide.vscode.java; +package org.springframework.ide.vscode.commons.java; /** * Replaces eclipse JDT IType. diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/Signature.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Signature.java similarity index 98% rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/Signature.java rename to vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Signature.java index e5959cfc2..84e282b6d 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/Signature.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Signature.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.boot.properties.metadata.types; +package org.springframework.ide.vscode.commons.java; public class Signature { diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java index e8e7339aa..82e7dd221 100644 --- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java +++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java @@ -5,9 +5,9 @@ import java.net.URI; import java.net.URISyntaxException; import java.nio.file.Path; +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.java.IType; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; -import org.springframework.ide.vscode.java.IJavaProject; -import org.springframework.ide.vscode.java.IType; import org.springframework.ide.vscode.util.HtmlSnippet; import org.springframework.ide.vscode.util.StringUtil; diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/JavaProjectFinder.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/JavaProjectFinder.java index 40e27e65a..621dcd8e1 100644 --- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/JavaProjectFinder.java +++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/JavaProjectFinder.java @@ -1,7 +1,7 @@ package org.springframework.ide.vscode.commons.languageserver.java; +import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; -import org.springframework.ide.vscode.java.IJavaProject; @FunctionalInterface public interface JavaProjectFinder { diff --git a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/testharness/TestProjectHarness.java b/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/testharness/TestProjectHarness.java index 4593ca46f..dd23c26d5 100644 --- a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/testharness/TestProjectHarness.java +++ b/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/testharness/TestProjectHarness.java @@ -6,8 +6,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.springframework.ide.vscode.java.IJavaProject; -import org.springframework.ide.vscode.java.IType; +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.java.IType; import org.springframework.ide.vscode.util.ExternalCommand; import org.springframework.ide.vscode.util.ExternalProcess; import org.springframework.ide.vscode.util.HtmlSnippet; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/DefaultSpringPropertyIndexProvider.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/DefaultSpringPropertyIndexProvider.java index 3a44eedf3..acdfb9d50 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/DefaultSpringPropertyIndexProvider.java +++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/DefaultSpringPropertyIndexProvider.java @@ -7,9 +7,9 @@ import org.springframework.ide.vscode.application.properties.metadata.SpringProp import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.application.properties.metadata.ValueProviderRegistry; import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; +import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; -import org.springframework.ide.vscode.java.IJavaProject; public class DefaultSpringPropertyIndexProvider implements SpringPropertyIndexProvider { diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/AbstractPropsEditorTest.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/AbstractPropsEditorTest.java index e7fb4fa3e..128524486 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/AbstractPropsEditorTest.java +++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/AbstractPropsEditorTest.java @@ -13,9 +13,9 @@ import org.junit.Before; import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil; import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; +import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; -import org.springframework.ide.vscode.java.IJavaProject; import org.springframework.ide.vscode.testharness.Editor; import org.springframework.ide.vscode.testharness.LanguageServerHarness; import org.springframework.ide.vscode.yaml.PropertyIndexHarness.ItemConfigurer; diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlEditorTest.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlEditorTest.java index 716506204..c5ffd6675 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlEditorTest.java +++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlEditorTest.java @@ -20,7 +20,7 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.ide.vscode.application.properties.metadata.CachingValueProvider; import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; -import org.springframework.ide.vscode.java.IJavaProject; +import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.testharness.Editor; import org.springframework.ide.vscode.util.StringUtil; diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/PropertyIndexHarness.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/PropertyIndexHarness.java index f599431a7..c3a7e0124 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/PropertyIndexHarness.java +++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/PropertyIndexHarness.java @@ -14,8 +14,8 @@ import org.springframework.ide.vscode.application.properties.metadata.SpringProp import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.application.properties.metadata.ValueProviderRegistry; import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; +import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; -import org.springframework.ide.vscode.java.IJavaProject; /** * Provides some convenience apis for test code to create / use test data for a SpringPropertyIndex.