From 3ae8ca26b4700d354e40e349ac700030bc5f1d25 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 19 Nov 2013 20:24:56 +0100 Subject: [PATCH 1/2] Classes moved Requested by Kotlin team https://github.com/JetBrains/intellij-community/pull/129 --- .../com/intellij/psi/impl/light/LightField.java | 0 .../impl/light/LightParameterListBuilder.java | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/light/LightField.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/light/LightParameterListBuilder.java (71%) diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightField.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightField.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/light/LightField.java rename to java/java-psi-impl/src/com/intellij/psi/impl/light/LightField.java diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightParameterListBuilder.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightParameterListBuilder.java similarity index 71% rename from java/java-impl/src/com/intellij/psi/impl/light/LightParameterListBuilder.java rename to java/java-psi-impl/src/com/intellij/psi/impl/light/LightParameterListBuilder.java index 9f468c4e2886..44a7c4a07457 100644 --- a/java/java-impl/src/com/intellij/psi/impl/light/LightParameterListBuilder.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightParameterListBuilder.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2013 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 com.intellij.psi.impl.light; import com.intellij.lang.Language; @@ -39,7 +54,7 @@ public class LightParameterListBuilder extends LightElement implements PsiParame myCachedParameters = myParameters.toArray(new PsiParameter[myParameters.size()]); } } - + return myCachedParameters; } From 5083045bab7a76c69f9fb96c5ea733dbf6acdda4 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 19 Nov 2013 20:25:49 +0100 Subject: [PATCH 2/2] Cleanup (field visibility; deprecated API) --- .../com/intellij/psi/impl/light/LightFieldBuilder.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightFieldBuilder.java b/java/java-impl/src/com/intellij/psi/impl/light/LightFieldBuilder.java index fb45938f5a31..c7a31173bab3 100644 --- a/java/java-impl/src/com/intellij/psi/impl/light/LightFieldBuilder.java +++ b/java/java-impl/src/com/intellij/psi/impl/light/LightFieldBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2013 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. @@ -15,7 +15,7 @@ */ package com.intellij.psi.impl.light; -import com.intellij.lang.StdLanguages; +import com.intellij.lang.java.JavaLanguage; import com.intellij.psi.*; import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.util.IncorrectOperationException; @@ -26,8 +26,8 @@ import org.jetbrains.annotations.Nullable; * @author Maxim.Medvedev */ public class LightFieldBuilder extends LightVariableBuilder implements PsiField { - PsiClass myContainingClass = null; - PsiExpression myInitializer = null; + private PsiClass myContainingClass = null; + private PsiExpression myInitializer = null; private PsiDocComment myDocComment = null; private boolean myIsDeprecated = false; @@ -41,7 +41,7 @@ public class LightFieldBuilder extends LightVariableBuilder i } public LightFieldBuilder(PsiManager manager, @NotNull String name, @NotNull PsiType type) { - super(manager, name, type, StdLanguages.JAVA); + super(manager, name, type, JavaLanguage.INSTANCE); } public LightFieldBuilder setContainingClass(PsiClass psiClass) {