Merge remote-tracking branch 'origin/master'

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<LightFieldBuilder> 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<LightFieldBuilder> 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) {

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;
   }