sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed redundant modifiers

Browse source 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
This commit is contained in:
Titouan Vervack 2018-03-28 17:41:41 +02:00
parent 63a0a012ea
commit 127fa42d17
25 changed files with 38 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/DocumentHighlightTest.xtend
View file

@ -39,7 +39,7 @@ import org.junit.Test
* @see DocumentHighlight
* @see IDocumentHighlightService
*/
public class DocumentHighlightTest extends AbstractTestLangLanguageServerTest {
class DocumentHighlightTest extends AbstractTestLangLanguageServerTest {
@Test
def void singleLineNoOccurrences_SelectionBeforeWriteSiteMethodName() {

8
org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/signatureHelp/SignatureHelpServiceImpl.xtend
View file

@ -40,17 +40,17 @@ import org.eclipse.xtext.util.CancelIndicator
*/
class SignatureHelpServiceImpl implements ISignatureHelpService {
private static val OPENING_CHAR = '(';
static val OPENING_CHAR = '(';
private static val CLOSING_CHAR = ')';
static val CLOSING_CHAR = ')';
private static val SEPARATOR_CHAR = ',';
static val SEPARATOR_CHAR = ',';
/**
* Shared comparator singleton to compare {@link SignatureInformation signature information} instances
* based on the number of parameters first, then the parameter labels lexicographically.
*/
private static val Comparator<SignatureInformation> SIGNATURE_INFO_ORDERING = [ left, right |
static val Comparator<SignatureInformation> SIGNATURE_INFO_ORDERING = [ left, right |
var result = left.parameters.size - right.parameters.size;
if (result === 0) {
for (var i = 0, var size = left.parameters.size; i < size; i++) {

4
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend
View file

@ -601,8 +601,8 @@ import org.eclipse.lsp4j.WorkspaceEdit
}
private Map<String, JsonRpcMethod> supportedMethods = null
private Multimap<String, Endpoint> extensionProviders = LinkedListMultimap.create
Map<String, JsonRpcMethod> supportedMethods = null
Multimap<String, Endpoint> extensionProviders = LinkedListMultimap.create
override supportedMethods() {
if (this.supportedMethods !== null) {

2
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/ProjectManager.xtend
View file

@ -106,7 +106,7 @@ class ProjectManager {
]
}
public def XtextResourceSet createNewResourceSet(ResourceDescriptionsData newIndex) {
def XtextResourceSet createNewResourceSet(ResourceDescriptionsData newIndex) {
resourceSetProvider.get => [
projectDescription.attachToEmfObject(it)
ProjectConfigAdapter.install(it, projectConfig)

2
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/WorkspaceManager.xtend
View file

@ -224,7 +224,7 @@ import org.eclipse.xtext.workspace.IWorkspaceConfig
?: new Document(1, resource.parseResult.rootNode.text)
}
public def boolean isDocumentOpen(URI uri) {
def boolean isDocumentOpen(URI uri) {
return openDocuments.containsKey(uri)
}
}

2
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/commands/ExecutableCommandRegistry.xtend
View file

@ -29,7 +29,7 @@ import org.eclipse.xtext.util.internal.Log
*/
@Log class ExecutableCommandRegistry {
private static val METHOD = 'workspace/executeCommand'
static val METHOD = 'workspace/executeCommand'
Multimap<String, IExecutableCommandService> registeredCommands

2
org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/formatting/FormattingService.java
View file

@ -64,7 +64,6 @@ public class FormattingService {
result = Boolean.TRUE;
} catch (final Throwable _t) {
if (_t instanceof NoSuchMethodException) {
final NoSuchMethodException noSuchMethodException = (NoSuchMethodException)_t;
} else {
throw Exceptions.sneakyThrow(_t);
}
@ -74,7 +73,6 @@ public class FormattingService {
}
} catch (final Throwable _t) {
if (_t instanceof Exception) {
final Exception exception = (Exception)_t;
result = Boolean.TRUE;
} else {
throw Exceptions.sneakyThrow(_t);

2
org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarComparatorTest.xtend
View file

@ -16,7 +16,7 @@ import org.junit.Test
*/
class AntlrGrammarComparatorTest {
private extension AntlrGrammarComparatorTestHelper = new AntlrGrammarComparatorTestHelper();
extension AntlrGrammarComparatorTestHelper = new AntlrGrammarComparatorTestHelper();
/**
* The pattern of "\"" is not expected to occur in ANTLR grammar,

8
org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarComparatorTestHelper.xtend
View file

@ -12,8 +12,8 @@ package org.eclipse.xtext.generator.parser
*/
class AntlrGrammarComparatorTestHelper {
private val AntlrGrammarComparator comparator = new AntlrGrammarComparator
private val TestErrorHandler errorHandler = new TestErrorHandler
val AntlrGrammarComparator comparator = new AntlrGrammarComparator
val TestErrorHandler errorHandler = new TestErrorHandler
def compare(CharSequence grammar, CharSequence grammarReference) {
comparator.compareGrammars(grammar, grammarReference, errorHandler);
@ -49,8 +49,8 @@ class AntlrGrammarComparatorTestHelper {
static class ComparisonError extends AssertionError {
private val int lineNoTestee
private val int lineNoExpected
val int lineNoTestee
val int lineNoExpected
new(String msg) {
super(msg)

2
org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/NodeModelTest.xtend
View file

@ -32,7 +32,7 @@ import org.junit.runner.RunWith
@InjectWith(IndentationAwareTestLanguageInjectorProvider)
class NodeModelTest {
def static public void assertEquals(Object expected, Object actual) {
def static void assertEquals(Object expected, Object actual) {
Assert.assertEquals(expected.toString.replaceAll("\r\n","\n"), actual.toString.replaceAll("\r\n","\n"))
}

2
org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/Formatter2Fragment2Test.xtend
View file

@ -24,7 +24,7 @@ class Formatter2Fragment2Test {
static class TestableFormatter2Fragment2 extends Formatter2Fragment2 {
override public toVarName(ENamedElement element, String... reservedNames) {
override toVarName(ENamedElement element, String... reservedNames) {
super.toVarName(element, reservedNames)
}

2
org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/AlternateJdkLoader.xtend
View file

@ -14,7 +14,7 @@ import java.net.URLClassLoader
import java.util.concurrent.ConcurrentMap
class AlternateJdkLoader extends URLClassLoader {
private final ConcurrentMap<String, Object> locks = Maps.newConcurrentMap;
final ConcurrentMap<String, Object> locks = Maps.newConcurrentMap;
new(Iterable<File> files) {
super(files.map[toURI.toURL])

2
org.eclipse.xtext.xtext.bootstrap/src/org/eclipse/xtext/xtext/bootstrap/XtextLangGeneratorModule.xtend
View file

@ -11,7 +11,7 @@ class XtextLangGeneratorModule extends DefaultGeneratorModule {
return XtextLangGeneratorNaming
}
public static class XtextLangGeneratorNaming extends XtextGeneratorNaming {
static class XtextLangGeneratorNaming extends XtextGeneratorNaming {
override getGenericIdeBasePackage(Grammar grammar) {
if (isXtext(grammar)) {

2
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorResourceSetInitializer.xtend
View file

@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EcorePackage
@Log
class XtextGeneratorResourceSetInitializer {
public def void initialize(ResourceSet resourceSet, List<String> referencedResources) {
def void initialize(ResourceSet resourceSet, List<String> referencedResources) {
val delegate = new StandaloneSetup
delegate.resourceSet = resourceSet
resourceSet.packageRegistry.put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE)

6
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend
View file

@ -176,7 +176,7 @@ class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment {
/**
* Sets the target EMF runtime version to generate for to the specified value.
*/
public def void setEmfRuntimeVersion(String emfRuntimeVersion) {
def void setEmfRuntimeVersion(String emfRuntimeVersion) {
this.emfRuntimeVersion = GenRuntimeVersion.get(emfRuntimeVersion)
if (this.emfRuntimeVersion === null)
LOG.warn('Illegal EMF runtime version: ' + emfRuntimeVersion)
@ -193,7 +193,7 @@ class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment {
* </ul>
* The default level is "JDK60".
*/
public def void setJdkLevel(String jdkLevel) {
def void setJdkLevel(String jdkLevel) {
this.jdkLevel = GenJDKLevel.getByName(jdkLevel)
if (this.jdkLevel === null)
LOG.warn('Illegal JDK level: ' + jdkLevel)
@ -205,7 +205,7 @@ class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment {
* If set generated {@link EPackage} and {@link EFactory} interfaces are bound to their <code>eINSTANCE</code> instance.
* @since 2.11
*/
public def void setBindEPackageAndEFactory (boolean bindEPackageAndEFactory) {
def void setBindEPackageAndEFactory (boolean bindEPackageAndEFactory) {
this.bindEPackageAndEFactory = bindEPackageAndEFactory
}

4
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/labeling/LabelProviderFragment2.xtend
View file

@ -25,10 +25,10 @@ import static extension org.eclipse.xtext.GrammarUtil.*
*/
class LabelProviderFragment2 extends AbstractStubGeneratingFragment {
private static val XBASE_LABEL_PROVIDER =
static val XBASE_LABEL_PROVIDER =
"org.eclipse.xtext.xbase.ui.labeling.XbaseLabelProvider"
private static val XBASE_DESCRIPTION_LABEL_PROVIDER =
static val XBASE_DESCRIPTION_LABEL_PROVIDER =
"org.eclipse.xtext.xbase.ui.labeling.XbaseDescriptionLabelProvider"
@Inject

4
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/projectWizard/SimpleProjectWizardFragment2.xtend
View file

@ -32,9 +32,9 @@ class SimpleProjectWizardFragment2 extends AbstractXtextGeneratorFragment {
FileAccessFactory fileAccessFactory
@Accessors
private boolean generate = false;
boolean generate = false;
@Accessors
private boolean pluginProject = true;
boolean pluginProject = true;
override generate() {
if (!generate)

4
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/projectWizard/TemplateProjectWizardFragment.xtend
View file

@ -45,9 +45,9 @@ class TemplateProjectWizardFragment extends AbstractXtextGeneratorFragment {
FileAccessFactory fileAccessFactory
@Accessors
private boolean generate = false;
boolean generate = false;
@Accessors
private boolean pluginProject = true;
boolean pluginProject = true;
override generate() {
if (!generate)

2
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/templates/CodetemplatesGeneratorFragment2.xtend
View file

@ -33,7 +33,7 @@ import org.eclipse.xtext.xtext.generator.AbstractXtextGeneratorFragment
*/
class CodetemplatesGeneratorFragment2 extends AbstractXtextGeneratorFragment {
public static class Disabled extends CodetemplatesGeneratorFragment2 {
static class Disabled extends CodetemplatesGeneratorFragment2 {
override void generate() {
// no nothing

2
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorNaming.xtend
View file

@ -26,7 +26,7 @@ class ValidatorNaming {
@Inject
extension XtextGeneratorNaming
public def TypeReference getValidatorClass(Grammar grammar) {
def TypeReference getValidatorClass(Grammar grammar) {
new TypeReference(grammar.runtimeBasePackage + '.validation.' + grammar.simpleName + 'Validator')
}

2
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ProjectDescriptor.xtend
View file

@ -165,7 +165,7 @@ abstract class ProjectDescriptor {
new PomFile(this)
}
public def sourceFolder(Outlet outlet) {
def sourceFolder(Outlet outlet) {
config.sourceLayout.getPathFor(outlet);
}

2
org.eclipse.xtext/src/org/eclipse/xtext/generator/URIBasedFileSystemAccess.xtend
View file

@ -57,7 +57,7 @@ class URIBasedFileSystemAccess extends AbstractFileSystemAccess2 {
@Accessors BeforeWrite beforeWrite = [$2]
@Accessors BeforeRead beforeRead = [$1]
public override void setPostProcessor(IFilePostProcessor filePostProcessor) {
override void setPostProcessor(IFilePostProcessor filePostProcessor) {
super.postProcessor = filePostProcessor
}

4
org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend
View file

@ -22,9 +22,9 @@ import com.google.inject.Singleton
@Singleton
class ResourceServiceProviderServiceLoader implements Provider<IResourceServiceProvider.Registry> {
private ServiceLoader<ISetup> setupLoader = ServiceLoader.load(ISetup)
ServiceLoader<ISetup> setupLoader = ServiceLoader.load(ISetup)
private IResourceServiceProvider.Registry registry = loadRegistry
IResourceServiceProvider.Registry registry = loadRegistry
private def IResourceServiceProvider.Registry loadRegistry() {
val registry = new ResourceServiceProviderRegistryImpl()

2
org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/ProjectDescriptionBasedContainerManager.xtend
View file

@ -25,7 +25,7 @@ import org.eclipse.xtext.resource.impl.ResourceDescriptionsData
@Beta
class ProjectDescriptionBasedContainerManager implements IContainer.Manager {
public def boolean shouldUseProjectDescriptionBasedContainers(IResourceDescriptions resourceDescriptions) {
def boolean shouldUseProjectDescriptionBasedContainers(IResourceDescriptions resourceDescriptions) {
val chunkedResourceDescriptions = resourceDescriptions.chunkedResourceDescriptions
return chunkedResourceDescriptions !== null
&& chunkedResourceDescriptions.resourceSet !== null

4
org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/PortableURIs.xtend
View file

@ -178,7 +178,7 @@ class PortableURIs {
*
* @see #getEObject(EObject,String)
*/
public def String getFragment(EObject fromContainer, EObject toChild) {
def String getFragment(EObject fromContainer, EObject toChild) {
if (fromContainer == toChild)
return null
var lastChild = toChild as InternalEObject
@ -203,7 +203,7 @@ class PortableURIs {
*
* @return the resolved EObject based. If the given fragment is <code>null</null>, the given EObject itself will be returned.
*/
public def EObject getEObject(EObject from, String toFragment) {
def EObject getEObject(EObject from, String toFragment) {
if (toFragment === null)
return from
val splitted = Splitter.on("/").split(toFragment)