From f00b43f06662da57d478c36ffca736e2a3668545 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 11 Jun 2015 15:49:07 +0300
Subject: [PATCH] cleanup

---
 .../src/com/intellij/slicer/SliceUtil.java    | 30 ++++++++++---------
 .../org/intellij/lang/annotations/Flow.java   |  6 ++--
 .../progress/impl/CoreProgressManager.java    |  2 +-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/java/java-impl/src/com/intellij/slicer/SliceUtil.java b/java/java-impl/src/com/intellij/slicer/SliceUtil.java
index 91dde1c7efaf..2b047f95aa71 100644
--- a/java/java-impl/src/com/intellij/slicer/SliceUtil.java
+++ b/java/java-impl/src/com/intellij/slicer/SliceUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -49,13 +49,13 @@ import java.util.Set;
 /**
  * @author cdr
  */
-public class SliceUtil {
-  public static boolean processUsagesFlownDownTo(@NotNull PsiElement expression,
-                                                 @NotNull Processor<SliceUsage> processor,
-                                                 @NotNull SliceUsage parent,
-                                                 @NotNull PsiSubstitutor parentSubstitutor,
-                                                 int indexNesting,
-                                                 @NotNull String syntheticField) {
+class SliceUtil {
+  static boolean processUsagesFlownDownTo(@NotNull PsiElement expression,
+                                          @NotNull Processor<SliceUsage> processor,
+                                          @NotNull SliceUsage parent,
+                                          @NotNull PsiSubstitutor parentSubstitutor,
+                                          int indexNesting,
+                                          @NotNull String syntheticField) {
     assert indexNesting >= 0 : indexNesting;
     expression = simplify(expression);
     PsiElement original = expression;
@@ -337,16 +337,18 @@ public class SliceUtil {
   }
 
   @NotNull
-  public static SliceUsage createSliceUsage(@NotNull PsiElement element,
-                                            @NotNull SliceUsage parent,
-                                            @NotNull PsiSubstitutor substitutor,
-                                            int indexNesting,
-                                            @NotNull String syntheticField) {
+  static SliceUsage createSliceUsage(@NotNull PsiElement element,
+                                     @NotNull SliceUsage parent,
+                                     @NotNull PsiSubstitutor substitutor,
+                                     int indexNesting,
+                                     @NotNull String syntheticField) {
     return new SliceUsage(simplify(element), parent, substitutor,indexNesting, syntheticField);
   }
 
   @NotNull
-  public static SliceUsage createTooComplexDFAUsage(@NotNull PsiElement element, @NotNull SliceUsage parent, @NotNull PsiSubstitutor substitutor) {
+  private static SliceUsage createTooComplexDFAUsage(@NotNull PsiElement element,
+                                                     @NotNull SliceUsage parent,
+                                                     @NotNull PsiSubstitutor substitutor) {
     return new SliceTooComplexDFAUsage(simplify(element), parent, substitutor);
   }
 
diff --git a/platform/annotations/common/src/org/intellij/lang/annotations/Flow.java b/platform/annotations/common/src/org/intellij/lang/annotations/Flow.java
index 1854d4c2297e..537a3cb3287a 100644
--- a/platform/annotations/common/src/org/intellij/lang/annotations/Flow.java
+++ b/platform/annotations/common/src/org/intellij/lang/annotations/Flow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -60,7 +60,7 @@ public @interface Flow {
    * </li>
    * </ul>
    */
-  String source() default org.intellij.lang.annotations.Flow.DEFAULT_SOURCE;
+  String source() default Flow.DEFAULT_SOURCE;
   String DEFAULT_SOURCE = "The method argument (if parameter was annotated) or this container (if instance method was annotated)";
   String THIS_SOURCE = "this";
 
@@ -109,7 +109,7 @@ public @interface Flow {
    * </li>
    * </ul>
    */
-  String target() default org.intellij.lang.annotations.Flow.DEFAULT_TARGET;
+  String target() default Flow.DEFAULT_TARGET;
   String DEFAULT_TARGET = "This container (if the parameter was annotated) or the return value (if instance method was annotated)";
   String RETURN_METHOD_TARGET = "The return value of this method";
   String THIS_TARGET = "this";
diff --git a/platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java b/platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java
index f32466655ba6..969b9dc7d360 100644
--- a/platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java
+++ b/platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java
@@ -64,7 +64,7 @@ public class CoreProgressManager extends ProgressManager implements Disposable {
   private static volatile boolean thereIsProcessUnderCanceledIndicator;
 
   // active (i.e. which have executeProcessUnderProgress() method running) indicators which are not inherited from StandardProgressIndicator.
-  // for them an extra processing thread (see myCheckCancelledFuture) has to be run to call their non-standard checkCanceled() method
+  // for them an extra processing thread (see myCheckCancelledFuture) has to be run to call their non-standard checkCanceled() method periodically.
   private static final Collection<ProgressIndicator> nonStandardIndicators = ConcurrentHashMultiset.create();
 
   public CoreProgressManager() {