diff --git a/build/groovy/org/jetbrains/intellij/build/impl/LayoutBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/LayoutBuilder.groovy index 5f5cc7cc4324..4259b14e6fa3 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/LayoutBuilder.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/LayoutBuilder.groovy @@ -13,21 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + + + package org.jetbrains.intellij.build.impl import com.intellij.openapi.util.MultiValuesMap @@ -196,7 +184,7 @@ class LayoutBuilder { } } - def JpsModule findModule(String name) { + JpsModule findModule(String name) { def module = project.modules.find { it.name == name } if (module == null) { throw new IllegalArgumentException("Cannot find module '$name' in the project") diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/OverrideImplementTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/OverrideImplementTest.groovy index 26ac60318540..0550a65190a3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/OverrideImplementTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/OverrideImplementTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ interface B extends A { """).containingFile.virtualFile myFixture.configureFromExistingVirtualFile(file) - def Presentation presentation = new Presentation() + Presentation presentation = new Presentation() presentation.setText(ActionsBundle.message("action.ImplementMethods.text")) CommandProcessor.instance.executeCommand(project, { invokeAction(true) }, presentation.text, null) @@ -87,7 +87,7 @@ class C extends B implements A { """).containingFile.virtualFile myFixture.configureFromExistingVirtualFile(file) - def Presentation presentation = new Presentation() + Presentation presentation = new Presentation() presentation.setText(ActionsBundle.message("action.ImplementMethods.text")) CommandProcessor.instance.executeCommand(project, { invokeAction(true) }, presentation.text, null) @@ -124,7 +124,7 @@ class B implements Main1.I, Main2.I { """).containingFile.virtualFile myFixture.configureFromExistingVirtualFile(file) - def Presentation presentation = new Presentation() + Presentation presentation = new Presentation() presentation.setText(ActionsBundle.message("action.ImplementMethods.text")) CommandProcessor.instance.executeCommand(project, { invokeAction(true) }, presentation.text, null) diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/SelectionQuotingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/SelectionQuotingTest.groovy index fd7ffc5d9c79..8b49d84b2cc9 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/SelectionQuotingTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/SelectionQuotingTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ var c = "test test test";\ doTest(initial, expected, action, TestFileType.JS) } - def void doTest(initial, expected, action, fileType = TestFileType.JAVA) { + void doTest(initial, expected, action, fileType = TestFileType.JAVA) { configureFromFileText("${getTestName(false)}.$fileType.extension", initial) def settings = CodeInsightSettings.getInstance() def old = settings.SURROUND_SELECTION_ON_QUOTE_TYPED diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFolding8Test.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFolding8Test.groovy index a1959a40c17b..4e143c20e658 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFolding8Test.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFolding8Test.groovy @@ -29,8 +29,8 @@ import org.jetbrains.annotations.NotNull */ public class JavaFolding8Test extends LightCodeInsightFixtureTestCase { - def JavaCodeFoldingSettingsImpl myFoldingSettings - def JavaCodeFoldingSettingsImpl myFoldingStateToRestore + JavaCodeFoldingSettingsImpl myFoldingSettings + JavaCodeFoldingSettingsImpl myFoldingStateToRestore @NotNull @Override diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/CopySpecWalker.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/CopySpecWalker.groovy index 635b13a0df65..dee5a053bd03 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/CopySpecWalker.groovy +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/CopySpecWalker.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ class CopySpecWalker { return } - copySpec.walk({ def resolver -> + copySpec.walk({ resolver -> // def resolver -> // in Gradle v1.x - org.gradle.api.internal.file.copy.CopySpecInternal // in Gradle v2.x - org.gradle.api.internal.file.copy.CopySpecResolver @@ -73,7 +73,7 @@ class CopySpecWalker { } if (sourcePaths) { - (sourcePaths.flatten() as List).each { def path -> + (sourcePaths.flatten() as List).each { path -> if (path instanceof String) { visitor.visitSourcePath(relativePath, path) } diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy index 61c84270b301..28cceaddb145 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -868,7 +868,7 @@ class DependencyResolverImpl implements DependencyResolver { sourcePaths = mainSpec.sourcePaths } if (sourcePaths) { - (sourcePaths.flatten() as List).each { def path -> + (sourcePaths.flatten() as List).each { path -> if (path instanceof String) { def file = new File(path) if (file.isAbsolute()) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiMethodCategory.groovy b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiMethodCategory.groovy index 527eddcc6075..a3885a196289 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiMethodCategory.groovy +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiMethodCategory.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ public class PsiMethodCategory implements PsiEnhancerCategory { } static Map getParamStringVector(PsiMethod method) { - def Map result = [:] + Map result = [:] int idx = 1 for (p in method.parameterList.parameters) { result.put("value$idx", p.getType().getCanonicalText()) diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml index a8ff40a651ba..b9345ac8ca0d 100644 --- a/plugins/groovy/src/META-INF/plugin.xml +++ b/plugins/groovy/src/META-INF/plugin.xml @@ -828,7 +828,7 @@ groupName="Style" enabledByDefault="false" level="WARNING" implementationClass="org.jetbrains.plugins.groovy.codeInspection.style.JavaStylePropertiesInvocationInspection"/>