diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/AntlrParser.java b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/AntlrParser.java similarity index 89% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/AntlrParser.java rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/AntlrParser.java index 77e4a6f5c..d157a2e54 100644 --- a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/AntlrParser.java +++ b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/AntlrParser.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.properties.antlr.parser; +package org.springframework.ide.vscode.java.properties.antlr.parser; import java.util.ArrayList; import java.util.BitSet; @@ -22,15 +22,15 @@ import org.antlr.v4.runtime.Recognizer; import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.atn.ATNConfigSet; import org.antlr.v4.runtime.dfa.DFA; -import org.springframework.ide.vscode.properties.antlr.parser.JavaPropertiesParser.CommentLineContext; -import org.springframework.ide.vscode.properties.antlr.parser.JavaPropertiesParser.KeyContext; -import org.springframework.ide.vscode.properties.antlr.parser.JavaPropertiesParser.PropertyLineContext; -import org.springframework.ide.vscode.properties.antlr.parser.JavaPropertiesParser.SeparatorAndValueContext; -import org.springframework.ide.vscode.properties.parser.ParseResults; -import org.springframework.ide.vscode.properties.parser.Parser; -import org.springframework.ide.vscode.properties.parser.Problem; -import org.springframework.ide.vscode.properties.parser.ProblemCodes; -import org.springframework.ide.vscode.properties.parser.PropertiesAst; +import org.springframework.ide.vscode.java.properties.antlr.parser.JavaPropertiesParser.CommentLineContext; +import org.springframework.ide.vscode.java.properties.antlr.parser.JavaPropertiesParser.KeyContext; +import org.springframework.ide.vscode.java.properties.antlr.parser.JavaPropertiesParser.PropertyLineContext; +import org.springframework.ide.vscode.java.properties.antlr.parser.JavaPropertiesParser.SeparatorAndValueContext; +import org.springframework.ide.vscode.java.properties.parser.ParseResults; +import org.springframework.ide.vscode.java.properties.parser.Parser; +import org.springframework.ide.vscode.java.properties.parser.Problem; +import org.springframework.ide.vscode.java.properties.parser.ProblemCodes; +import org.springframework.ide.vscode.java.properties.parser.PropertiesAst; import com.google.common.collect.ImmutableList; diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaProperties.tokens b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaProperties.tokens similarity index 100% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaProperties.tokens rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaProperties.tokens diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesBaseListener.java b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesBaseListener.java similarity index 98% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesBaseListener.java rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesBaseListener.java index d859c9f2f..7a91475fd 100644 --- a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesBaseListener.java +++ b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesBaseListener.java @@ -1,5 +1,5 @@ // Generated from JavaProperties.g4 by ANTLR 4.5.3 -package org.springframework.ide.vscode.properties.antlr.parser; +package org.springframework.ide.vscode.java.properties.antlr.parser; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.tree.ErrorNode; diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesLexer.java b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.java similarity index 98% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesLexer.java rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.java index cac94e6bb..018a1478d 100644 --- a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesLexer.java +++ b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.java @@ -1,5 +1,5 @@ // Generated from JavaProperties.g4 by ANTLR 4.5.3 -package org.springframework.ide.vscode.properties.antlr.parser; +package org.springframework.ide.vscode.java.properties.antlr.parser; import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.Token; diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesLexer.tokens b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.tokens similarity index 100% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesLexer.tokens rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.tokens diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesListener.java b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesListener.java similarity index 98% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesListener.java rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesListener.java index 1227cdb6b..35e5b2cf8 100644 --- a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesListener.java +++ b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesListener.java @@ -1,5 +1,5 @@ // Generated from JavaProperties.g4 by ANTLR 4.5.3 -package org.springframework.ide.vscode.properties.antlr.parser; +package org.springframework.ide.vscode.java.properties.antlr.parser; import org.antlr.v4.runtime.tree.ParseTreeListener; /** diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesParser.java b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesParser.java similarity index 99% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesParser.java rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesParser.java index c6a97a7a4..a33436b6f 100644 --- a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/JavaPropertiesParser.java +++ b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesParser.java @@ -1,5 +1,5 @@ // Generated from JavaProperties.g4 by ANTLR 4.5.3 -package org.springframework.ide.vscode.properties.antlr.parser; +package org.springframework.ide.vscode.java.properties.antlr.parser; import org.antlr.v4.runtime.atn.*; import org.antlr.v4.runtime.dfa.DFA; import org.antlr.v4.runtime.*; diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/ParseResults.java b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ParseResults.java similarity index 95% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/ParseResults.java rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ParseResults.java index 23fbc4dd6..65134f2e6 100644 --- a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/ParseResults.java +++ b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ParseResults.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.properties.parser; +package org.springframework.ide.vscode.java.properties.parser; import java.util.List; diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/Parser.java b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Parser.java similarity index 92% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/Parser.java rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Parser.java index 375224c7b..ebf61d52a 100644 --- a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/Parser.java +++ b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Parser.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.properties.parser; +package org.springframework.ide.vscode.java.properties.parser; /** * Basic Parser interface diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/Problem.java b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Problem.java similarity index 94% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/Problem.java rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Problem.java index c6f2abe1f..b42902911 100644 --- a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/Problem.java +++ b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Problem.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.properties.parser; +package org.springframework.ide.vscode.java.properties.parser; /** * Parsing problem interface diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/ProblemCodes.java b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ProblemCodes.java similarity index 93% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/ProblemCodes.java rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ProblemCodes.java index 0c641b0d5..1c1b5442d 100644 --- a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/ProblemCodes.java +++ b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ProblemCodes.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.properties.parser; +package org.springframework.ide.vscode.java.properties.parser; /** * Parsing error codes diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/PropertiesAst.java b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/PropertiesAst.java similarity index 97% rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/PropertiesAst.java rename to vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/PropertiesAst.java index c5692e5fc..0f8f7830e 100644 --- a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/parser/PropertiesAst.java +++ b/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/PropertiesAst.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.properties.parser; +package org.springframework.ide.vscode.java.properties.parser; import java.util.List; import java.util.stream.Collectors; diff --git a/vscode-extensions/commons/java-properties/src/test/java/org/springframework/ide/vscode/properties/parser/test/PropertiesAntlrParserTest.java b/vscode-extensions/commons/java-properties/src/test/java/org/springframework/ide/vscode/java/properties/parser/test/PropertiesAntlrParserTest.java similarity index 93% rename from vscode-extensions/commons/java-properties/src/test/java/org/springframework/ide/vscode/properties/parser/test/PropertiesAntlrParserTest.java rename to vscode-extensions/commons/java-properties/src/test/java/org/springframework/ide/vscode/java/properties/parser/test/PropertiesAntlrParserTest.java index 5c523c66f..6ff520b69 100644 --- a/vscode-extensions/commons/java-properties/src/test/java/org/springframework/ide/vscode/properties/parser/test/PropertiesAntlrParserTest.java +++ b/vscode-extensions/commons/java-properties/src/test/java/org/springframework/ide/vscode/java/properties/parser/test/PropertiesAntlrParserTest.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.properties.parser.test; +package org.springframework.ide.vscode.java.properties.parser.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -17,12 +17,12 @@ import static org.junit.Assert.assertTrue; import java.util.List; import org.junit.Test; -import org.springframework.ide.vscode.properties.antlr.parser.AntlrParser; -import org.springframework.ide.vscode.properties.parser.ParseResults; -import org.springframework.ide.vscode.properties.parser.Parser; -import org.springframework.ide.vscode.properties.parser.Problem; -import org.springframework.ide.vscode.properties.parser.PropertiesAst.Comment; -import org.springframework.ide.vscode.properties.parser.PropertiesAst.KeyValuePair; +import org.springframework.ide.vscode.java.properties.antlr.parser.AntlrParser; +import org.springframework.ide.vscode.java.properties.parser.ParseResults; +import org.springframework.ide.vscode.java.properties.parser.Parser; +import org.springframework.ide.vscode.java.properties.parser.Problem; +import org.springframework.ide.vscode.java.properties.parser.PropertiesAst.Comment; +import org.springframework.ide.vscode.java.properties.parser.PropertiesAst.KeyValuePair; public class PropertiesAntlrParserTest { diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java b/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java index dcefcbab6..620848bde 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java +++ b/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java @@ -15,9 +15,9 @@ import java.util.stream.Collectors; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.languageserver.util.TextDocument; -import org.springframework.ide.vscode.properties.antlr.parser.AntlrParser; -import org.springframework.ide.vscode.properties.parser.ParseResults; -import org.springframework.ide.vscode.properties.parser.Parser; +import org.springframework.ide.vscode.java.properties.antlr.parser.AntlrParser; +import org.springframework.ide.vscode.java.properties.parser.ParseResults; +import org.springframework.ide.vscode.java.properties.parser.Parser; import io.typefox.lsapi.Diagnostic; import io.typefox.lsapi.DiagnosticSeverity;