From 8d74d5af53b9969546bb619bdbee81e3d8b9650e Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 20 Oct 2016 11:33:03 -0700 Subject: [PATCH] vscode-manifest-yaml package renames Bring package names in line with project names --- vscode-extensions/vscode-manifest-yaml/lib/Main.ts | 2 +- .../manifest/editor => manifest/yaml}/Main.java | 2 +- .../yaml}/ManifestYamlLanguageServer.java | 2 +- .../editor => manifest/yaml}/ManifestYmlSchema.java | 2 +- .../editor => manifest/yaml}/ManifestYmlValueParsers.java | 2 +- .../manifest/editor => manifest/yaml}/SortKeys.java | 2 +- .../editor => manifest/yaml}/VscodeCompletionEngine.java | 2 +- .../yaml}/VscodeCompletionEngineAdapter.java | 2 +- .../{ => manifest}/yaml/ManifestYamlEditorTest.java | 4 ++-- .../yaml/ManifestYamlLanguageServerTest.java | 4 ++-- .../vscode/{ => manifest}/yaml/ManifestYmlSchemaTest.java | 4 ++-- .../src/test/resources/workspace/manifest.yml | 8 +++++--- 12 files changed, 19 insertions(+), 17 deletions(-) rename vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/{cloudfoundry/manifest/editor => manifest/yaml}/Main.java (97%) rename vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/{cloudfoundry/manifest/editor => manifest/yaml}/ManifestYamlLanguageServer.java (98%) rename vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/{cloudfoundry/manifest/editor => manifest/yaml}/ManifestYmlSchema.java (98%) rename vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/{cloudfoundry/manifest/editor => manifest/yaml}/ManifestYmlValueParsers.java (97%) rename vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/{cloudfoundry/manifest/editor => manifest/yaml}/SortKeys.java (89%) rename vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/{cloudfoundry/manifest/editor => manifest/yaml}/VscodeCompletionEngine.java (88%) rename vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/{cloudfoundry/manifest/editor => manifest/yaml}/VscodeCompletionEngineAdapter.java (98%) rename vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/{ => manifest}/yaml/ManifestYamlEditorTest.java (98%) rename vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/{ => manifest}/yaml/ManifestYamlLanguageServerTest.java (94%) rename vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/{ => manifest}/yaml/ManifestYmlSchemaTest.java (96%) diff --git a/vscode-extensions/vscode-manifest-yaml/lib/Main.ts b/vscode-extensions/vscode-manifest-yaml/lib/Main.ts index 17e2bafb9..d83227beb 100644 --- a/vscode-extensions/vscode-manifest-yaml/lib/Main.ts +++ b/vscode-extensions/vscode-manifest-yaml/lib/Main.ts @@ -104,7 +104,7 @@ export function activate(context: VSCode.ExtensionContext) { let args = [ '-Dserver.port=' + port, '-cp', classpath, - 'org.springframework.ide.vscode.cloudfoundry.manifest.editor.Main' + 'org.springframework.ide.vscode.manifest.yaml.Main' ]; if (DEBUG) { args.unshift(DEBUG_ARG); diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/Main.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java similarity index 97% rename from vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/Main.java rename to vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java index 85ba3ea23..0af7ee6f2 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/Main.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.cloudfoundry.manifest.editor; +package org.springframework.ide.vscode.manifest.yaml; import java.io.IOException; import java.io.InputStream; diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYamlLanguageServer.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java similarity index 98% rename from vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYamlLanguageServer.java rename to vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java index 25cf580ec..26c4e0845 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYamlLanguageServer.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.cloudfoundry.manifest.editor; +package org.springframework.ide.vscode.manifest.yaml; import java.util.Collection; diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java similarity index 98% rename from vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java rename to vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java index 7b04e9bfc..a86a8d1c7 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.cloudfoundry.manifest.editor; +package org.springframework.ide.vscode.manifest.yaml; import java.util.Collection; import java.util.Set; diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlValueParsers.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlValueParsers.java similarity index 97% rename from vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlValueParsers.java rename to vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlValueParsers.java index e4bd4c2bb..a1dae8b28 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlValueParsers.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlValueParsers.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.cloudfoundry.manifest.editor; +package org.springframework.ide.vscode.manifest.yaml; import java.util.Set; diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/SortKeys.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/SortKeys.java similarity index 89% rename from vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/SortKeys.java rename to vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/SortKeys.java index 2ec260197..80c3e782d 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/SortKeys.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/SortKeys.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.cloudfoundry.manifest.editor; +package org.springframework.ide.vscode.manifest.yaml; import java.util.Iterator; diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngine.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/VscodeCompletionEngine.java similarity index 88% rename from vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngine.java rename to vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/VscodeCompletionEngine.java index a66e99701..eca70ff84 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngine.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/VscodeCompletionEngine.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.cloudfoundry.manifest.editor; +package org.springframework.ide.vscode.manifest.yaml; import java.util.concurrent.CompletableFuture; diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/VscodeCompletionEngineAdapter.java similarity index 98% rename from vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java rename to vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/VscodeCompletionEngineAdapter.java index b3a553c71..c8cf4e7ca 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/VscodeCompletionEngineAdapter.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.cloudfoundry.manifest.editor; +package org.springframework.ide.vscode.manifest.yaml; import java.util.ArrayList; import java.util.Collections; diff --git a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYamlEditorTest.java b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java similarity index 98% rename from vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYamlEditorTest.java rename to vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java index b020b6e20..ed15d4f96 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYamlEditorTest.java +++ b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java @@ -8,14 +8,14 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml; +package org.springframework.ide.vscode.manifest.yaml; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.springframework.ide.vscode.cloudfoundry.manifest.editor.ManifestYamlLanguageServer; import org.springframework.ide.vscode.languageserver.testharness.Editor; import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness; +import org.springframework.ide.vscode.manifest.yaml.ManifestYamlLanguageServer; public class ManifestYamlEditorTest { diff --git a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYamlLanguageServerTest.java b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServerTest.java similarity index 94% rename from vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYamlLanguageServerTest.java rename to vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServerTest.java index c450fac77..56daeb2f6 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYamlLanguageServerTest.java +++ b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServerTest.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.yaml; +package org.springframework.ide.vscode.manifest.yaml; import static org.assertj.core.api.Assertions.assertThat; @@ -7,8 +7,8 @@ import java.net.URISyntaxException; import java.nio.file.Paths; import org.junit.Test; -import org.springframework.ide.vscode.cloudfoundry.manifest.editor.ManifestYamlLanguageServer; import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness; +import org.springframework.ide.vscode.manifest.yaml.ManifestYamlLanguageServer; import io.typefox.lsapi.InitializeResult; import io.typefox.lsapi.TextDocumentSyncKind; diff --git a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchemaTest.java similarity index 96% rename from vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java rename to vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchemaTest.java index 34ff652e7..e3fb7662d 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java +++ b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchemaTest.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.yaml; +package org.springframework.ide.vscode.manifest.yaml; /******************************************************************************* * Copyright (c) 2015, 2016 Pivotal, Inc. * All rights reserved. This program and the accompanying materials @@ -19,12 +19,12 @@ import java.util.List; import java.util.Map; import org.junit.Test; -import org.springframework.ide.vscode.cloudfoundry.manifest.editor.ManifestYmlSchema; import org.springframework.ide.vscode.commons.util.StringUtil; import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty; import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YBeanType; import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YSeqType; import org.springframework.ide.vscode.commons.yaml.util.DescriptionProviders; +import org.springframework.ide.vscode.manifest.yaml.ManifestYmlSchema; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; diff --git a/vscode-extensions/vscode-manifest-yaml/src/test/resources/workspace/manifest.yml b/vscode-extensions/vscode-manifest-yaml/src/test/resources/workspace/manifest.yml index d76572420..7160866ac 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/test/resources/workspace/manifest.yml +++ b/vscode-extensions/vscode-manifest-yaml/src/test/resources/workspace/manifest.yml @@ -1,3 +1,5 @@ -#There's a syntax error in this file -abc: foo -- foo +#Comment +applications: +- name: foo + buildpack: something + \ No newline at end of file