dangling javadocs removed

java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Jan 3, 2002
- * @author Jeka
- */
 package com.intellij.compiler;
 
 import com.intellij.CommonBundle;

java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java

@@ -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.
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author: Eugene Zhuravlev
- * Date: Jan 17, 2003
- * Time: 1:42:26 PM
- */
 package com.intellij.compiler.impl;
 
 import com.intellij.CommonBundle;

java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/IgnoredFileFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.compiler.impl.packagingCompiler;
 
 import com.intellij.openapi.fileTypes.FileTypeManager;

java/compiler/impl/src/com/intellij/openapi/projectRoots/impl/MockJdkWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.openapi.projectRoots.impl;
 
 import com.intellij.openapi.projectRoots.Sdk;

java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileAction.java

@@ -1,5 +1,17 @@
-/**
- * @author cdr
+/*
+ * 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 com.intellij.packaging.impl.ui.actions;
 

java/compiler/openapi/src/com/intellij/openapi/compiler/options/ExcludeEntryDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Jan 3, 2002
- * @author Jeka
- */
 package com.intellij.openapi.compiler.options;
 
 import com.intellij.openapi.Disposable;

java/debugger/impl/src/com/intellij/debugger/actions/ExportThreadsAction.java

@@ -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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * class ExportThreadsAction
- * @author Jeka
- */
 package com.intellij.debugger.actions;
 
 import com.intellij.debugger.DebuggerManagerEx;

java/debugger/impl/src/com/intellij/debugger/actions/ThreadDumpAction.java

@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * class ExportThreadsAction
- * @author Eugene Zhuravlev
- * @author Sascha Weinreuter
- */
 package com.intellij.debugger.actions;
 
 import com.intellij.debugger.DebuggerBundle;

java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java

@@ -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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * class ToggleMethodBreakpointAction
- * @author Jeka
- */
 package com.intellij.debugger.actions;
 
 import com.intellij.debugger.DebuggerManagerEx;

java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ArrayInitializerEvaluator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,17 +14,10 @@
  * limitations under the License.
  */
 
-/**
- * class ArrayInitializerEvaluator
- * created Jun 28, 2001
- * @author Jeka
- */
 package com.intellij.debugger.engine.evaluation.expression;
 
-import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
 import com.intellij.debugger.engine.evaluation.EvaluateException;
 import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
-import com.intellij.debugger.engine.evaluation.EvaluateException;
 
 class ArrayInitializerEvaluator implements Evaluator{
   private final Evaluator[] myValueEvaluators;

java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewArrayInstanceEvaluator.java

@@ -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.
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * class NewArrayInstanceEvaluator
- * created Jun 27, 2001
- * @author Jeka
- */
 package com.intellij.debugger.engine.evaluation.expression;
 
 import com.intellij.debugger.DebuggerBundle;

java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewClassInstanceEvaluator.java

@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * class NewArrayInstanceEvaluator
- * created Jun 27, 2001
- * @author Jeka
- */
 package com.intellij.debugger.engine.evaluation.expression;
 
 import com.intellij.debugger.DebuggerBundle;

java/debugger/impl/src/com/intellij/debugger/jdi/Bytecodes.java

@@ -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.
@@ -226,8 +226,8 @@ class Bytecodes {
      */
     static final int BSM = 33;
 
-  /**
-     * Computes the instruction types of JVM opcodes.
+  /*
+      Computes the instruction types of JVM opcodes.
      */
     static {
         int i;

java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * class FieldBreakpointPropertiesPanel
- * @author Jeka
- */
 package com.intellij.debugger.ui.breakpoints;
 
 import com.intellij.debugger.DebuggerBundle;

java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FilteredRequestorImpl.java

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * class FilteredRequestorImpl
- * @author Jeka
- */
 package com.intellij.debugger.ui.breakpoints;
 
 import com.intellij.debugger.InstanceFilter;

java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * class MethodBreakpointPropertiesPanel
- * @author Jeka
- */
 package com.intellij.debugger.ui.breakpoints;
 
 import com.intellij.debugger.DebuggerBundle;

java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SourceRootFinder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 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.
@@ -21,10 +21,6 @@ import com.intellij.openapi.util.Pair;
 import java.io.File;
 import java.util.List;
 
-/**
- * @author Maxim.Medvedev
- */
-
 /**
  * @deprecated use {@link com.intellij.ide.util.projectWizard.importSources.JavaSourceRootDetector} instead
  */

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CastMethodArgumentFix.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 13, 2002
- * Time: 3:26:50 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.QuickFixBundle;

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConstructorParametersFixer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-/**
- * Propose to cast one argument to corresponding type
- *  in the constructor invocation
- * E.g.
- *
- * User: cdr
- * Date: Nov 13, 2002
+/*
+  Propose to cast one argument to corresponding type
+   in the constructor invocation
+  E.g.
+
+  User: cdr
+  Date: Nov 13, 2002
  */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.infos.CandidateInfo;
-import com.intellij.openapi.util.TextRange;
 import org.jetbrains.annotations.NotNull;
 
 public class ConstructorParametersFixer {

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifySuperArgumentFix.java

@@ -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.
@@ -14,28 +14,14 @@
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 13, 2002
- * Time: 3:26:50 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
-import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
-import com.intellij.psi.infos.CandidateInfo;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtil;
-import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.refactoring.util.RefactoringChangeUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public class QualifySuperArgumentFix extends QualifyThisOrSuperArgumentFix {
   public QualifySuperArgumentFix(@NotNull PsiExpression expression, @NotNull PsiClass psiClass) {
     super(expression, psiClass);

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisArgumentFix.java

@@ -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.
@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 13, 2002
- * Time: 3:26:50 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java

@@ -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.
@@ -14,33 +14,19 @@
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 13, 2002
- * Time: 3:26:50 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
-import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.*;
-import com.intellij.psi.infos.CandidateInfo;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtil;
-import com.intellij.psi.util.TypeConversionUtil;
-import com.intellij.refactoring.util.RefactoringChangeUtil;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiExpression;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public abstract class QualifyThisOrSuperArgumentFix implements IntentionAction {
   protected static final Logger LOG = Logger.getInstance("#" + QualifyThisOrSuperArgumentFix.class.getName());
   protected final PsiExpression myExpression;

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.FileModificationService;

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -160,8 +160,8 @@ public class VariableArrayTypeFix extends LocalQuickFixOnPsiElement {
     final PsiArrayInitializerExpression myInitializer = (PsiArrayInitializerExpression)startElement;
     final PsiVariable myVariable = getVariableLocal(myInitializer);
     if (myVariable == null) return;
-    /**
-     * only for the case when in same statement with initialization
+    /*
+      only for the case when in same statement with initialization
      */
     final PsiNewExpression myNewExpression = getNewExpressionLocal(myInitializer);
 

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeExtendsToImplementsFix.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.QuickFixBundle;

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeParameterClassFix.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 13, 2002
- * Time: 3:26:50 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.CodeInsightUtil;

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 19, 2002
- * Time: 12:03:39 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.FileModificationService;

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.FileModificationService;

java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,19 +14,16 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.generation.actions;
 
 import com.intellij.codeInsight.CodeInsightActionHandler;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.CodeInsightUtilCore;
 import com.intellij.codeInsight.generation.OverrideImplementUtil;
-import com.intellij.openapi.project.Project;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ScrollType;
-import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;

java/java-impl/src/com/intellij/codeInsight/intention/impl/SimplifyBooleanExpressionAction.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.intention.impl;
 
 import com.intellij.codeInsight.FileModificationService;

java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java

@@ -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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.ide.projectView.impl;
 
 import com.intellij.history.LocalHistory;
@@ -28,7 +25,10 @@ import com.intellij.ide.SelectInTarget;
 import com.intellij.ide.impl.PackagesPaneSelectInTarget;
 import com.intellij.ide.projectView.ProjectView;
 import com.intellij.ide.projectView.ViewSettings;
-import com.intellij.ide.projectView.impl.nodes.*;
+import com.intellij.ide.projectView.impl.nodes.PackageElement;
+import com.intellij.ide.projectView.impl.nodes.PackageElementNode;
+import com.intellij.ide.projectView.impl.nodes.PackageUtil;
+import com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode;
 import com.intellij.ide.util.DeleteHandler;
 import com.intellij.ide.util.treeView.AbstractTreeBuilder;
 import com.intellij.ide.util.treeView.AbstractTreeNode;

java/java-impl/src/com/intellij/internal/statistic/libraryJar/LibraryJarDescriptors.java

@@ -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.
@@ -15,10 +15,6 @@
  */
 package com.intellij.internal.statistic.libraryJar;
 
-/**
- * @author Ivan Chirkov
- */
-
 import com.intellij.util.xmlb.annotations.AbstractCollection;
 import com.intellij.util.xmlb.annotations.Property;
 

java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/JDComment.java

@@ -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.
@@ -21,10 +21,6 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-/**
- * @author max
- */
-
 /**
  * @author Dmitry Skavish
  */

java/java-impl/src/com/intellij/refactoring/anonymousToInner/VariableInfo.java

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Sep 7, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.anonymousToInner;
 
 import com.intellij.psi.PsiVariable;

java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureViewDescriptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Sep 17, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.changeSignature;
 
 import com.intellij.openapi.util.text.StringUtil;

java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java

@@ -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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Sep 17, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.changeSignature;
 
 import com.intellij.openapi.diagnostic.Logger;

java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java

@@ -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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Oct 25, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.extractSuperclass;
 
 import com.intellij.history.LocalHistory;

java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableSettings.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: dsl
- * Date: Nov 15, 2002
- * Time: 4:12:48 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.refactoring.introduceVariable;
 
 import com.intellij.psi.PsiType;

java/java-impl/src/com/intellij/refactoring/migration/MigrationUsagesViewDescriptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,16 +14,12 @@
  * limitations under the License.
  */
 
-/**
- * created at Nov 24, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.migration;
 
 import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.RefactoringBundle;
-import com.intellij.usageView.UsageViewDescriptor;
 import com.intellij.usageView.UsageViewBundle;
+import com.intellij.usageView.UsageViewDescriptor;
 import org.jetbrains.annotations.NotNull;
 
 class MigrationUsagesViewDescriptor implements UsageViewDescriptor {

java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java

@@ -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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Nov 27, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.move.moveClassesOrPackages;
 
 import com.intellij.history.LocalHistory;

java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerDialog.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Sep 24, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.move.moveInner;
 
 import com.intellij.openapi.application.ApplicationManager;

java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerImpl.java

@@ -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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Nov 12, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.move.moveInner;
 
 import com.intellij.ide.util.PackageChooserDialog;

java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerViewDescriptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Sep 11, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.move.moveInner;
 
 import com.intellij.psi.PsiClass;

java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Nov 21, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.move.moveMembers;
 
 import com.intellij.openapi.project.Project;

java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticUsageRenamer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -88,10 +88,10 @@ public abstract class AutomaticUsageRenamer<T> {
     return myElements;
   }
 
-  @Nullable
   /**
    * Element source, path. For example, package. Taken into account while sorting.
    */
+  @Nullable
   public String getSourceName(T element) {
     return null;
   }

java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,15 +14,10 @@
  * limitations under the License.
  */
 
-/**
- * created at Oct 25, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.turnRefsToSuper;
 
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ScrollType;
 import com.intellij.openapi.project.Project;

java/java-impl/src/com/intellij/refactoring/ui/YesNoPreviewUsagesDialog.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-/**
- * created at Oct 8, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.ui;
 
 import com.intellij.openapi.help.HelpManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.ui.MultiLineLabelUI;
 import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.ui.MultiLineLabelUI;
 import com.intellij.refactoring.RefactoringBundle;
 import org.jetbrains.annotations.NotNull;
 

java/java-impl/src/com/intellij/refactoring/util/ConflictsUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Oct 8, 2001
- * @author Jeka
- */
 package com.intellij.refactoring.util;
 
 import com.intellij.lang.findUsages.DescriptiveNameUtil;

java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java

@@ -147,11 +147,11 @@ public class ClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass, Clas
                                              psiClass -> ApplicationManager.getApplication().runReadAction((Computable<SmartPsiElementPointer<PsiClass>>)() -> SmartPointerManager.getInstance(psiClass.getProject()).createSmartPsiElementPointer(psiClass)));
   }
 
-  @NotNull
-  @Deprecated //todo to be removed in IDEA 17
   /**
    * @deprecated use {@link #search(PsiClass, SearchScope, boolean)} instead
    */
+  @NotNull
+  @Deprecated //todo to be removed in IDEA 17
   public static Query<PsiClass> search(@NotNull final PsiClass aClass, @NotNull SearchScope scope, final boolean checkDeep, final boolean checkInheritance) {
     return search(aClass, scope, checkDeep, checkInheritance, true);
   }

java/java-psi-api/src/com/intellij/codeInsight/ClassUtil.java

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author Alexey
- */
 package com.intellij.codeInsight;
 
 import com.intellij.psi.*;

java/java-tests/testSrc/com/intellij/codeInspection/UnknownGuardInspectionTest.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-/**
- * (c) 2016 Silent Forest AB
- * created: 18 March 2016
+/*
+  (c) 2016 Silent Forest AB
+  created: 18 March 2016
  */
 package com.intellij.codeInspection;
 

java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java

@@ -1,5 +1,17 @@
-/**
- * @author ven
+/*
+ * 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 com.intellij.refactoring;
 

java/java-tests/testSrc/com/intellij/refactoring/MoveClassAndFileTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 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.
@@ -15,11 +15,6 @@
  */
 package com.intellij.refactoring;
 
-/**
- * User: anna
- * Date: Aug 31, 2010
- */
-
 import com.intellij.JavaTestUtil;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.vfs.LocalFileSystem;

platform/analysis-api/src/com/intellij/codeInspection/InspectionManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -93,42 +93,42 @@ public abstract class InspectionManager {
                                                             @NotNull ProblemHighlightType highlightType,
                                                             boolean onTheFly,
                                                             final LocalQuickFix... fixes);
+  /**
+   * use {@link #createProblemDescriptor(PsiElement, String, boolean, LocalQuickFix[], ProblemHighlightType)} instead
+   */
   @Deprecated
   @NotNull
-  /**
-   * use {@link #createProblemDescriptor(PsiElement, String, boolean, LocalQuickFix, ProblemHighlightType)} instead
-   */
   public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement,
                                                             @NotNull String descriptionTemplate,
                                                             LocalQuickFix fix,
                                                             @NotNull ProblemHighlightType highlightType);
 
-  @Deprecated
-  @NotNull
   /**
    * use {@link #createProblemDescriptor(PsiElement, String, boolean, LocalQuickFix[], ProblemHighlightType)} instead
    */
+  @Deprecated
+  @NotNull
   public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement,
                                                             @NotNull String descriptionTemplate,
                                                             LocalQuickFix[] fixes,
                                                             @NotNull ProblemHighlightType highlightType);
 
-  @Deprecated
-  @NotNull
   /**
    * use {@link #createProblemDescriptor(PsiElement, String, LocalQuickFix[], ProblemHighlightType, boolean, boolean)} instead
    */
+  @Deprecated
+  @NotNull
   public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement,
                                                             @NotNull String descriptionTemplate,
                                                             LocalQuickFix[] fixes,
                                                             @NotNull ProblemHighlightType highlightType,
                                                             boolean isAfterEndOfLine);
 
-  @Deprecated
-  @NotNull
   /**
    * use {@link #createProblemDescriptor(PsiElement, PsiElement, String, ProblemHighlightType, boolean, LocalQuickFix...)} instead
    */
+  @Deprecated
+  @NotNull
   public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement startElement,
                                                             @NotNull PsiElement endElement,
                                                             @NotNull String descriptionTemplate,
@@ -136,22 +136,22 @@ public abstract class InspectionManager {
                                                             LocalQuickFix... fixes);
 
 
-  @Deprecated
-  @NotNull
   /**
    * use {@link #createProblemDescriptor(PsiElement, TextRange, String, ProblemHighlightType, boolean, LocalQuickFix...)} instead
    */
+  @Deprecated
+  @NotNull
   public abstract ProblemDescriptor createProblemDescriptor(@NotNull final PsiElement psiElement,
                                                             final TextRange rangeInElement,
                                                             @NotNull final String descriptionTemplate,
                                                             @NotNull ProblemHighlightType highlightType,
                                                             final LocalQuickFix... fixes);
 
-  @Deprecated
-  @NotNull
   /**
    * use {@link #createProblemDescriptor(PsiElement, String, boolean, ProblemHighlightType, boolean, LocalQuickFix...)} instead
    */
+  @Deprecated
+  @NotNull
   public abstract ProblemDescriptor createProblemDescriptor(@NotNull final PsiElement psiElement,
                                                             @NotNull final String descriptionTemplate,
                                                             final boolean showTooltip,

platform/analysis-api/src/com/intellij/codeInspection/ProblemHighlightType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -33,9 +33,9 @@ public enum ProblemHighlightType {
   /** The same as {@link #GENERIC_ERROR_OR_WARNING} with enforced {@link com.intellij.codeHighlighting.HighlightDisplayLevel#ERROR} severity level */
   GENERIC_ERROR,
 
-  @Deprecated
   /** Enforces {@link com.intellij.codeHighlighting.HighlightDisplayLevel#INFO} severity level
    * use #WEAK_WARNING instead*/
+  @Deprecated
   INFO,
 
   /** Enforces {@link com.intellij.codeHighlighting.HighlightDisplayLevel#WEAK_WARNING} severity level */

platform/analysis-api/src/com/intellij/profile/Profile.java

@@ -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.
@@ -28,10 +28,10 @@ public interface Profile extends Comparable, Scheme {
 
   void setLocal(boolean isLocal);
 
-  @Deprecated
   /**
    * @deprecated Use !{@link #isProjectLevel()}
    */
+  @Deprecated
   boolean isLocal();
 
   boolean isProjectLevel();

platform/boot/src/com/intellij/lang/properties/charset/Native2AsciiCharsetDecoder.java

@@ -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.
@@ -16,10 +16,6 @@
 
 package com.intellij.lang.properties.charset;
 
-/**
- * @author Alexey
- */
-
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;

platform/boot/src/com/intellij/lang/properties/charset/Native2AsciiCharsetEncoder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 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.
@@ -16,17 +16,13 @@
 
 package com.intellij.lang.properties.charset;
 
-/**
- * @author Alexey
- */
-
+import java.nio.BufferOverflowException;
+import java.nio.BufferUnderflowException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CoderResult;
-import java.nio.charset.Charset;
-import java.nio.CharBuffer;
-import java.nio.ByteBuffer;
-import java.nio.BufferUnderflowException;
-import java.nio.BufferOverflowException;
 
 class Native2AsciiCharsetEncoder extends CharsetEncoder {
 

platform/built-in-server-api/src/org/jetbrains/ide/BinaryRequestHandler.java

@@ -25,10 +25,10 @@ import java.util.UUID;
 public abstract class BinaryRequestHandler {
   public static final ExtensionPointName<BinaryRequestHandler> EP_NAME = ExtensionPointName.create("org.jetbrains.binaryRequestHandler");
 
-  @NotNull
   /**
    * uuidgen on Mac OS X could be used to generate UUID
    */
+  @NotNull
   public abstract UUID getId();
 
   @NotNull

platform/built-in-server/src/org/jetbrains/ide/RestService.java

@@ -104,10 +104,10 @@ public abstract class RestService extends HttpRequestHandler {
     return false;
   }
 
-  @NotNull
   /**
    * Use human-readable name or UUID if it is an internal service.
    */
+  @NotNull
   protected abstract String getServiceName();
 
   protected abstract boolean isMethodSupported(@NotNull HttpMethod method);
@@ -144,10 +144,10 @@ public abstract class RestService extends HttpRequestHandler {
     }
   }
 
-  @Nullable("error text or null if successful")
   /**
    * Return error or send response using {@link #sendOk(FullHttpRequest, ChannelHandlerContext)}, {@link #send(BufferExposingByteArrayOutputStream, FullHttpRequest, ChannelHandlerContext)}
    */
+  @Nullable("error text or null if successful")
   public abstract String execute(@NotNull QueryStringDecoder urlDecoder, @NotNull FullHttpRequest request, @NotNull ChannelHandlerContext context) throws IOException;
 
   @NotNull

platform/core-api/src/com/intellij/ide/util/PropertiesComponent.java

@@ -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.
@@ -106,12 +106,12 @@ public abstract class PropertiesComponent {
     return ObjectUtils.notNull(getValue(name), defaultValue);
   }
 
-  @SuppressWarnings("unused")
-  @Deprecated
   /**
    * @deprecated Use {@link #getInt(String, int)}
    * Init was never performed and in any case is not recommended.
    */
+  @SuppressWarnings("unused")
+  @Deprecated
   public final int getOrInitInt(@NotNull String name, int defaultValue) {
     return getInt(name, defaultValue);
   }
@@ -130,10 +130,10 @@ public abstract class PropertiesComponent {
     }
   }
 
-  @Deprecated
   /**
    * @deprecated Use {@link #getValue(String, String)}
    */
+  @Deprecated
   public String getOrInit(@NonNls String name, String defaultValue) {
     if (!isValueSet(name)) {
       setValue(name, defaultValue);

platform/core-api/src/com/intellij/openapi/components/RoamingType.java

@@ -31,15 +31,15 @@ public enum RoamingType {
    */
   DEFAULT,
 
-  @Deprecated
   /**
    * Use {@link #DEFAULT} instead
    */
+  @Deprecated
   PER_USER,
 
-  @Deprecated
   /**
    * Use {@link #PER_OS} instead
    */
+  @Deprecated
   PER_PLATFORM,
 }

platform/core-api/src/com/intellij/openapi/options/SchemeProcessor.java

@@ -47,11 +47,11 @@ public abstract class SchemeProcessor<T extends ExternalizableScheme> {
     throw new AbstractMethodError();
   }
 
-  @Nullable
   /**
    * @param duringLoad If occurred during {@link SchemesManager#loadSchemes()} call
    * Returns null if element is not valid.
    */
+  @Nullable
   public T readScheme(@NotNull Element element, boolean duringLoad) throws Exception {
     return readScheme(element);
   }

platform/core-api/src/com/intellij/openapi/util/ActionCallback.java

@@ -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.
@@ -277,12 +277,12 @@ public class ActionCallback implements Disposable {
     };
   }
 
-  @SuppressWarnings("UnusedDeclaration")
-  @NotNull
-  @Deprecated
   /**
    * @deprecated use {@link #notifyWhenRejected(ActionCallback)}
    */
+  @SuppressWarnings("UnusedDeclaration")
+  @NotNull
+  @Deprecated
   public Runnable createSetRejectedRunnable() {
     return new Runnable() {
       @Override

platform/core-api/src/com/intellij/openapi/util/AsyncResult.java

@@ -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.
@@ -65,23 +65,23 @@ public class AsyncResult<T> extends ActionCallback {
     return subResult;
   }
 
-  @SuppressWarnings("unused")
-  @NotNull
-  @Deprecated
   /**
    * @deprecated Don't use AsyncResult - use Promise instead.
    */
+  @SuppressWarnings("unused")
+  @NotNull
+  @Deprecated
   public ActionCallback subCallback(@NotNull Consumer<T> doneHandler) {
     ActionCallback subCallback = new ActionCallback();
     doWhenDone(new SubCallbackDoneCallback<T>(subCallback, doneHandler)).notifyWhenRejected(subCallback);
     return subCallback;
   }
 
-  @NotNull
-  @Deprecated
   /**
    * @deprecated Use {@link #doWhenDone(com.intellij.util.Consumer)} (to remove in IDEA 16)
    */
+  @NotNull
+  @Deprecated
   public AsyncResult<T> doWhenDone(@SuppressWarnings("deprecation") @NotNull final Handler<T> handler) {
     doWhenDone(new Runnable() {
       @Override
@@ -147,28 +147,28 @@ public class AsyncResult<T> extends ActionCallback {
     return this;
   }
 
-  @Deprecated
   /**
    * @deprecated Use {@link com.intellij.util.Consumer} (to remove in IDEA 16)
    */
+  @Deprecated
   public interface Handler<T> {
     void run(T t);
   }
 
-  @Deprecated
   /**
    * @deprecated Don't use AsyncResult - use Promise instead.
    */
+  @Deprecated
   public static class Done<T> extends AsyncResult<T> {
     public Done(T value) {
       setDone(value);
     }
   }
 
-  @Deprecated
   /**
    * @deprecated Don't use AsyncResult - use Promise instead.
    */
+  @Deprecated
   public static class Rejected<T> extends AsyncResult<T> {
     public Rejected() {
       setRejected();
@@ -179,21 +179,21 @@ public class AsyncResult<T> extends ActionCallback {
     }
   }
 
-  @NotNull
-  @Deprecated
   /**
    * @deprecated Don't use AsyncResult - use Promise instead.
    */
+  @NotNull
+  @Deprecated
   public static <R> AsyncResult<R> rejected() {
     //noinspection unchecked,deprecation
     return new Rejected();
   }
 
-  @NotNull
-  @Deprecated
   /**
    * @deprecated Don't use AsyncResult - use Promise instead.
    */
+  @NotNull
+  @Deprecated
   public static <R> AsyncResult<R> rejected(@NotNull String errorMessage) {
     AsyncResult<R> result = new AsyncResult<R>();
     result.reject(errorMessage);
@@ -205,11 +205,11 @@ public class AsyncResult<T> extends ActionCallback {
     return new AsyncResult<R>().setDone(result);
   }
 
-  @NotNull
-  @Deprecated
   /**
    * @deprecated Don't use AsyncResult - use Promise instead.
    */
+  @NotNull
+  @Deprecated
   public static <R extends List> AsyncResult<R> doneList() {
     //noinspection unchecked
     return done((R)Collections.emptyList());

platform/core-api/src/com/intellij/psi/PsiTreeChangeEvent.java

@@ -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.
@@ -34,10 +34,10 @@ public abstract class PsiTreeChangeEvent extends EventObject {
 
   @NonNls public static final String PROP_FILE_TYPES = "propFileTypes";
 
-  @NonNls
   /**
    * In the event with this property the {@link #getOldValue()} contains virtual file of the change
    */
+  @NonNls
   public static final String PROP_UNLOADED_PSI = "propUnloadedPsi";
 
   protected PsiElement myParent;

platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java

@@ -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.
@@ -1766,8 +1766,8 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
                             boolean forceInsertion) {
       final int start = builder.myLexStarts[startLexemeIndex];
       final int end = builder.myLexStarts[endLexemeIndex];
-      /** Corresponding code for heavy tree is located in {@link com.intellij.lang.impl.PsiBuilderImpl#insertLeaves}
-       *  and is applied only to plain lexemes */
+      /* Corresponding code for heavy tree is located in {@link com.intellij.lang.impl.PsiBuilderImpl#insertLeaves}
+         and is applied only to plain lexemes */
       if (start > end || !forceInsertion && start == end && !(type instanceof ILeafElementType)) {
         return;
       }

platform/editor-ui-api/src/com/intellij/ide/ui/UISettingsListener.java

@@ -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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author Vladimir Kondratyev
- */
 package com.intellij.ide.ui;
 
 import com.intellij.util.messages.Topic;

platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author Yura Cangea
- */
 package com.intellij.openapi.editor.colors.impl;
 
 import com.intellij.application.options.EditorFontsConstants;

platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/DefaultColorsScheme.java

@@ -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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author Yura Cangea
- */
 package com.intellij.openapi.editor.colors.impl;
 
 import com.intellij.openapi.editor.colors.ColorKey;

platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java

@@ -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.
@@ -102,10 +102,10 @@ public class SearchRequestCollector {
     return refElement.getParent();
   }
 
-  @Deprecated
   /** use {@link #searchWord(java.lang.String, com.intellij.psi.search.SearchScope, short, boolean, com.intellij.psi.PsiElement)}
    * instead
    */
+  @Deprecated
   public void searchWord(@NotNull String word,
                          @NotNull SearchScope searchScope,
                          short searchContext,

platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java

@@ -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.
@@ -50,11 +50,11 @@ public abstract class GenericProgramRunner<Settings extends RunnerSettings> exte
     return doExecute(environment.getProject(), state, environment.getContentToReuse(), environment);
   }
 
-  @Deprecated
-  @Nullable
   /**
    * @deprecated to remove in IDEA 16
    */
+  @Deprecated
+  @Nullable
   protected RunContentDescriptor doExecute(@NotNull Project project,
                                            @NotNull RunProfileState state,
                                            @Nullable RunContentDescriptor contentToReuse,

platform/lang-api/src/com/intellij/facet/FacetTypeId.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -24,10 +24,10 @@ import org.jetbrains.annotations.NonNls;
 public final class FacetTypeId<F extends Facet> {
   private final String myDebugName;
 
-  @Deprecated
   /**
    * @deprecated use {@link FacetTypeId#FacetTypeId(String)} instead
    */
+  @Deprecated
   public FacetTypeId() {
     this("unknown");
   }

platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkRole.java

@@ -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.
@@ -25,7 +25,7 @@ public class FrameworkRole {
 
   public static FrameworkRole[] UNKNOWN = new FrameworkRole[0];
 
-  /** Groovy etc. */
+  /* Groovy etc. */
 //  public static FrameworkRole JVM_LANGUAGES = new FrameworkRole();
 
   /** servlet-based frameworks like Struts, Tapestry etc. */

platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java

@@ -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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.openapi.module;
 
 import com.intellij.openapi.project.Project;

platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java

@@ -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.
@@ -88,10 +88,10 @@ public class ProjectUtil {
     return guessProjectForContentFile(file, file.getFileType());
   }
 
-  @Nullable
   /***
    * guessProjectForFile works incorrectly - even if file is config (idea config file) first opened project will be returned
    */
+  @Nullable
   public static Project guessProjectForContentFile(@NotNull VirtualFile file, @NotNull FileType fileType) {
     if (isProjectOrWorkspaceFile(file, fileType)) {
       return null;

platform/lang-api/src/com/intellij/refactoring/rename/RenameInputValidatorRegistry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author Dmitry Avdeev
- */
 package com.intellij.refactoring.rename;
 
 import com.intellij.openapi.extensions.Extensions;
@@ -27,9 +24,6 @@ import com.intellij.util.ProcessingContext;
 import com.intellij.util.containers.hash.LinkedHashMap;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class RenameInputValidatorRegistry {
   private RenameInputValidatorRegistry() {
   }

platform/lang-impl/src/com/intellij/application/options/colors/ClickNavigator.java

@@ -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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author Yura Cangea
- */
 package com.intellij.application.options.colors;
 
 import com.intellij.application.options.colors.highlighting.HighlightData;

platform/lang-impl/src/com/intellij/application/options/colors/TailPanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.application.options.colors;
 
 import javax.swing.*;

platform/lang-impl/src/com/intellij/application/options/colors/TextAttributesDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.application.options.colors;
 
 import com.intellij.openapi.editor.colors.EditorColorsScheme;

platform/lang-impl/src/com/intellij/application/options/colors/highlighting/HighlightData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author Yura Cangea
- */
 package com.intellij.application.options.colors.highlighting;
 
 import com.intellij.openapi.editor.Editor;

platform/lang-impl/src/com/intellij/application/options/colors/highlighting/HighlightsExtractor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author Yura Cangea
- */
 package com.intellij.application.options.colors.highlighting;
 
 import com.intellij.openapi.editor.colors.TextAttributesKey;

platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoComposite.java

@@ -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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.daemon.impl;
 
 import com.intellij.openapi.editor.RangeMarker;

platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/DefaultHighlightingSettingProvider.java

@@ -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.
@@ -22,10 +22,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-/**
- * @author ksafonov
- */
-
 
 /**
  * Implementation can provide default level of highlighting (one of "none", "syntax checks", "inspections") for a file.

platform/lang-impl/src/com/intellij/codeInsight/documentation/AbstractExternalFilter.java

@@ -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.
@@ -440,15 +440,15 @@ public abstract class AbstractExternalFilter {
    * Settings used for parsing of external documentation
    */
   protected static class ParseSettings {
-    @NotNull
     /**
      * Pattern defining the start of target fragment
      */
-    private final Pattern startPattern;
     @NotNull
+    private final Pattern startPattern;
     /**
      * Pattern defining the end of target fragment
      */
+    @NotNull
     private final Pattern endPattern;
     /**
      * If <code>false</code>, and line matching start pattern is not found, whole document will be processed

platform/lang-impl/src/com/intellij/codeInsight/documentation/QuickDocOnMouseOverManager.java

@@ -64,7 +64,7 @@ public class QuickDocOnMouseOverManager {
   @NotNull private final Runnable                  myHintCloseCallback   = new MyCloseDocCallback();
   @NotNull private final Map<Document, Boolean>    myMonitoredDocuments  = new WeakHashMap<Document, Boolean>();
 
-  private final Map<Editor, Reference<PsiElement> /** PSI element which is located under the current mouse position */> myActiveElements
+  private final Map<Editor, Reference<PsiElement> /* PSI element which is located under the current mouse position */> myActiveElements
     = new WeakHashMap<>();
 
   /** Holds a reference (if any) to the documentation manager used last time to show an 'auto quick doc' popup. */

platform/lang-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/MoveStatementHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.editorActions.moveUpDown;
 
 import com.intellij.openapi.editor.Editor;

platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java

@@ -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.
@@ -655,9 +655,9 @@ public class CommentByBlockCommentHandler extends MultiCaretCodeInsightActionHan
 
 
     if (commenter instanceof CustomUncommenter) {
-      /**
-       * In case of custom uncommenter, we need to ask it for list of [commentOpen-start,commentOpen-end], [commentClose-start,commentClose-end]
-       * and shift if according to current offset
+      /*
+        In case of custom uncommenter, we need to ask it for list of [commentOpen-start,commentOpen-end], [commentClose-start,commentClose-end]
+        and shift if according to current offset
        */
       CustomUncommenter customUncommenter = (CustomUncommenter)commenter;
       for (Couple<TextRange> coupleFromCommenter : customUncommenter.getCommentRangesToDelete(text)) {

platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesHandler.java

@@ -411,12 +411,12 @@ public class HighlightUsagesHandler extends HighlightHandlerBase {
     highlightRanges(highlightManager, editor, attributes, clearHighlights, textRanges);
   }
 
-  @SuppressWarnings("unused")
-  @NotNull
-  @Deprecated
   /**
    * @deprecated Use {@link #collectRangesToHighlight}
    */
+  @SuppressWarnings("unused")
+  @NotNull
+  @Deprecated
   public static List<TextRange> getRangesToHighlight(@NotNull PsiReference ref) {
     return collectRangesToHighlight(ref, new ArrayList<TextRange>());
   }

platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionActionMetaData.java

@@ -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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.intention.impl.config;
 
 import com.intellij.codeInsight.intention.IntentionAction;

platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java

@@ -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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.intention.impl.config;
 
 import com.intellij.codeInsight.CodeInsightBundle;

platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsTree.java

@@ -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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.intention.impl.config;
 
 import com.intellij.codeInsight.intention.IntentionManager;

platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionUsagePanel.java

@@ -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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.intention.impl.config;
 
 class IntentionUsagePanel extends ActionUsagePanel {

platform/lang-impl/src/com/intellij/codeInsight/template/impl/TableMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -16,16 +16,16 @@
 
 package com.intellij.codeInsight.template.impl;
 
-/**
- * In a chain of data manipulators some behaviour is common. TableMap
- * provides most of this behavour and can be subclassed by filters
- * that only need to override a handful of specific methods. TableMap 
- * implements TableModel by routing all requests to its model, and
- * TableModelListener by routing all events to its listeners. Inserting 
- * a TableMap which has not been subclassed into a chain of table filters 
- * should have no effect.
- *
- * @version 1.4 12/17/97
+/*
+  In a chain of data manipulators some behaviour is common. TableMap
+  provides most of this behavour and can be subclassed by filters
+  that only need to override a handful of specific methods. TableMap
+  implements TableModel by routing all requests to its model, and
+  TableModelListener by routing all events to its listeners. Inserting
+  a TableMap which has not been subclassed into a chain of table filters
+  should have no effect.
+
+  @version 1.4 12/17/97
  * @author Philip Milne */
 
 import javax.swing.event.TableModelEvent;

platform/lang-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplatesCompletionProvider.java

@@ -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.
@@ -37,8 +37,8 @@ class PostfixTemplatesCompletionProvider extends CompletionProvider<CompletionPa
     Editor editor = parameters.getEditor();
     if (!isCompletionEnabled(parameters) || LiveTemplateCompletionContributor.shouldShowAllTemplates() ||
         editor.getCaretModel().getCaretCount() != 1) {
-      /**
-       * disabled or covered with {@link com.intellij.codeInsight.template.impl.LiveTemplateCompletionContributor}
+      /*
+        disabled or covered with {@link com.intellij.codeInsight.template.impl.LiveTemplateCompletionContributor}
        */
       return;
     }

platform/lang-impl/src/com/intellij/diagnostic/logging/DebuggerLogConsoleManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -17,9 +17,5 @@
 package com.intellij.diagnostic.logging;
 
 @Deprecated
-/**
- * User: anna
- * Date: 01-Feb-2006
- */
 public interface DebuggerLogConsoleManager extends LogConsoleManager {
 }

platform/lang-impl/src/com/intellij/execution/TerminateRemoteProcessDialog.java

@@ -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.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * created at Dec 14, 2001
- * @author Jeka
- */
 package com.intellij.execution;
 
 import com.intellij.CommonBundle;

platform/lang-impl/src/com/intellij/execution/impl/MyDiffContainer.java

@@ -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.
@@ -75,8 +75,8 @@ class MyDiffContainer extends JBLayeredPane implements Disposable {
   private class MyOverlayLayout extends AbstractLayoutManager {
     @Override
     public void layoutContainer(Container parent) {
-      /**
-       * Propogate bound to all children
+      /*
+        Propogate bound to all children
        */
       for(int i = 0; i< getComponentCount(); i++) {
         getComponent(i).setBounds(0, 0, getWidth(), getHeight());

platform/lang-impl/src/com/intellij/ide/actions/TogglePopupHintsAction.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author Vladimir Kondratyev
- */
 package com.intellij.ide.actions;
 
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
@@ -25,7 +22,6 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;

platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateManager.java

@@ -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.
@@ -93,8 +93,9 @@ public abstract class FileTemplateManager{
   @NotNull 
   public abstract Properties getDefaultProperties();
 
-  @Deprecated /** Use {@link #getDefaultProperties()} instead */
+  /** Use {@link #getDefaultProperties()} instead */
   @NotNull
+  @Deprecated
   public Properties getDefaultProperties(@NotNull Project project) {
     Properties properties = getDefaultProperties();
     properties.setProperty(PROJECT_NAME_VARIABLE, project.getName());