Merge branch 'master' of git@git.labs.intellij.net:idea/community

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index 3e62d59e1d640b4aee7066228264de1439960139..484efcc227d072520f08352dc296463863f8bb95 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -21,47 +21,79 @@
  */
 package com.intellij.compiler.impl;
 
-import com.intellij.*;
-import com.intellij.analysis.*;
+import com.intellij.CommonBundle;
+import com.intellij.analysis.AnalysisScope;
 import com.intellij.compiler.*;
-import com.intellij.compiler.make.*;
-import com.intellij.compiler.progress.*;
-import com.intellij.diagnostic.*;
-import com.intellij.openapi.application.*;
+import com.intellij.compiler.make.CacheCorruptedException;
+import com.intellij.compiler.make.CacheUtils;
+import com.intellij.compiler.make.DependencyCache;
+import com.intellij.compiler.progress.CompilerTask;
+import com.intellij.diagnostic.IdeErrorsDialog;
+import com.intellij.diagnostic.PluginException;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.compiler.*;
 import com.intellij.openapi.compiler.Compiler;
-import com.intellij.openapi.compiler.ex.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.extensions.*;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.fileTypes.*;
-import com.intellij.openapi.module.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.projectRoots.*;
+import com.intellij.openapi.compiler.ex.CompileContextEx;
+import com.intellij.openapi.compiler.ex.CompilerPathsEx;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.extensions.Extensions;
+import com.intellij.openapi.extensions.PluginId;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.fileTypes.FileTypeManager;
+import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.openapi.module.LanguageLevelUtil;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleManager;
+import com.intellij.openapi.progress.ProcessCanceledException;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.project.DumbService;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectBundle;
+import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.*;
-import com.intellij.openapi.roots.ex.*;
-import com.intellij.openapi.roots.ui.configuration.*;
-import com.intellij.openapi.ui.*;
+import com.intellij.openapi.roots.ex.ProjectRootManagerEx;
+import com.intellij.openapi.roots.ui.configuration.CommonContentEntriesEditor;
+import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService;
+import com.intellij.openapi.ui.MessageType;
+import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.*;
-import com.intellij.openapi.util.io.*;
-import com.intellij.openapi.util.registry.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.packageDependencies.*;
-import com.intellij.pom.java.*;
-import com.intellij.psi.*;
-import com.intellij.util.*;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.registry.Registry;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.ToolWindowId;
+import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.openapi.wm.WindowManager;
+import com.intellij.packageDependencies.DependenciesBuilder;
+import com.intellij.packageDependencies.ForwardDependenciesBuilder;
+import com.intellij.pom.java.LanguageLevel;
+import com.intellij.psi.PsiCompiledElement;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import com.intellij.util.Chunk;
+import com.intellij.util.LocalTimeCounter;
+import com.intellij.util.StringBuilderSpinAllocator;
+import com.intellij.util.ThrowableRunnable;
 import com.intellij.util.concurrency.Semaphore;
-import com.intellij.util.containers.*;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
-import gnu.trove.*;
-import org.jetbrains.annotations.*;
+import com.intellij.util.containers.MultiMap;
+import com.intellij.util.containers.OrderedSet;
+import gnu.trove.TObjectHashingStrategy;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
 import java.util.*;
-import java.util.HashSet;
-import java.util.concurrent.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public class CompileDriver {
   private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompileDriver");

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java
index 5d399e4410f9d82d4a17d35037e430792b8b2ad4..3b0d8e70a0a9f6965932dc3b2443dcba516f0d27 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java
@@ -15,31 +15,39 @@
  */
 package com.intellij.compiler.impl;
 
-import com.intellij.codeInsight.daemon.impl.actions.*;
-import com.intellij.compiler.*;
-import com.intellij.compiler.options.*;
+import com.intellij.codeInsight.daemon.impl.actions.SuppressFix;
+import com.intellij.codeInsight.daemon.impl.actions.SuppressForClassFix;
+import com.intellij.compiler.CompilerConfiguration;
+import com.intellij.compiler.CompilerConfigurationImpl;
+import com.intellij.compiler.CompilerWorkspaceConfiguration;
+import com.intellij.compiler.HelpID;
+import com.intellij.compiler.options.CompilerConfigurable;
 import com.intellij.ide.errorTreeView.*;
-import com.intellij.ide.util.treeView.*;
+import com.intellij.ide.util.treeView.NodeDescriptor;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.command.*;
-import com.intellij.openapi.compiler.*;
-import com.intellij.openapi.compiler.options.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.module.*;
-import com.intellij.openapi.options.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.projectRoots.*;
-import com.intellij.openapi.roots.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.vcs.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.pom.*;
-import com.intellij.pom.java.*;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.compiler.CompilerBundle;
+import com.intellij.openapi.compiler.options.ExcludeEntryDescription;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.fileEditor.OpenFileDescriptor;
+import com.intellij.openapi.module.LanguageLevelUtil;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.options.ShowSettingsUtil;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.projectRoots.JavaSdk;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.vcs.FileStatusManager;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.pom.Navigatable;
+import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 

diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactPackagingProcessingItem.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactPackagingProcessingItem.java
index 9db67e89b0e3bc46304c5c72d3aeb74a0b515f05..2054b9978af658b712dbf3e2aadcc8f4292ae27a 100644 (file)
--- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactPackagingProcessingItem.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactPackagingProcessingItem.java
@@ -16,16 +16,18 @@
 
 package com.intellij.packaging.impl.compiler;
 
-import com.intellij.compiler.impl.*;
-import com.intellij.compiler.impl.packagingCompiler.*;
-import com.intellij.openapi.compiler.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.compiler.impl.FileProcessingCompilerStateCache;
+import com.intellij.compiler.impl.packagingCompiler.DestinationInfo;
+import com.intellij.openapi.compiler.FileProcessingCompiler;
+import com.intellij.openapi.compiler.ValidityState;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.SmartList;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * @author nik

diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
index f1f5d082bf63aecfb8524ab5ac209331d6f39877..da7e9477770ba3e816e1c4f4afa5e7698c17ce11 100644 (file)
--- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
+++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
@@ -20,18 +20,18 @@ import com.intellij.execution.executors.DefaultRunExecutor;
 import com.intellij.execution.filters.Filter;
 import com.intellij.execution.filters.TextConsoleBuilder;
 import com.intellij.execution.filters.TextConsoleBuilderFactory;
-import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.execution.runners.ExecutionEnvironment;
+import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.execution.util.ExecutionErrorDialog;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiClassUtil;
 import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.util.PsiClassUtil;
+import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java
index 439d18fc172128c8fe25de6ead06bcffe524789d..a8cc13d35cc73d584b593230c56771555861f1cc 100644 (file)
--- a/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java
+++ b/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java
@@ -15,15 +15,24 @@
  */
 package com.intellij.execution.configurations;
 
-import com.intellij.execution.*;
-import com.intellij.openapi.module.*;
-import com.intellij.openapi.project.*;
-import com.intellij.psi.*;
-import com.intellij.psi.search.*;
-import gnu.trove.*;
-import org.jetbrains.annotations.*;
+import com.intellij.execution.ExecutionBundle;
+import com.intellij.execution.JavaExecutionUtil;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleManager;
+import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.JavaPsiFacade;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.search.GlobalSearchScope;
+import gnu.trove.THashSet;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author spleaner

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java
index 0b4ddd7f2a0b2817eae8a7c0b8a6ab7d384266d5..0d0c08a6e29f13806a473f78cffdf66949216bdc 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java
@@ -15,7 +15,10 @@
  */
 package com.intellij.codeInsight.completion;
 
-import com.intellij.codeInsight.*;
+import com.intellij.codeInsight.AutoPopupController;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.TailType;
+import com.intellij.codeInsight.TailTypes;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupItem;
 import com.intellij.featureStatistics.FeatureUsageTracker;

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressFix.java
index 4b84102324483bdf04569a89ac23f22f4676507d..7b4966a32663a23bd8d642a26c8dea0f5f363663 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressFix.java
@@ -15,23 +15,28 @@
  */
 package com.intellij.codeInsight.daemon.impl.actions;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.daemon.*;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
+import com.intellij.codeInsight.daemon.HighlightDisplayKey;
 import com.intellij.codeInspection.*;
-import com.intellij.lang.java.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.module.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.roots.impl.storage.*;
-import com.intellij.openapi.ui.*;
+import com.intellij.lang.java.JavaLanguage;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.impl.storage.ClasspathStorage;
+import com.intellij.openapi.ui.Messages;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.*;
-import com.intellij.psi.impl.source.jsp.jspJava.*;
-import com.intellij.psi.javadoc.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.codeStyle.JavaCodeStyleManager;
+import com.intellij.psi.impl.source.jsp.jspJava.JspHolderMethod;
+import com.intellij.psi.javadoc.PsiDocComment;
+import com.intellij.psi.javadoc.PsiDocTag;
+import com.intellij.psi.javadoc.PsiDocTagValue;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author ven

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
index f63c6fdff819bd8dd6bc3c71460c2058b968a371..e6dffbec02b89c924bb54f0cfa0e1cb0358283bc 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
@@ -34,8 +34,8 @@ import com.intellij.find.findUsages.FindUsagesHandler;
 import com.intellij.find.findUsages.FindUsagesManager;
 import com.intellij.find.findUsages.FindUsagesOptions;
 import com.intellij.find.impl.FindManagerImpl;
-import com.intellij.ide.util.SuperMethodWarningUtil;
 import com.intellij.ide.DataManager;
+import com.intellij.ide.util.SuperMethodWarningUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.undo.UndoUtil;
 import com.intellij.openapi.editor.Editor;

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantElseAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantElseAction.java
index 404cfdd98054ee9da03c1327c5a2684d09494c14..73f2dcf1f3722211df7cc9197b256b16996925db 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantElseAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantElseAction.java
@@ -15,17 +15,17 @@
  */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.daemon.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.daemon.QuickFixBundle;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.controlFlow.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author ven

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java
index f2c693530d3d842a6851cbeda2ac1955ae577503..e865e175237c9d45e5bb1fdbce2177ab8c8e50e6 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java
@@ -20,17 +20,23 @@
  */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.TargetElementUtil;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.codeStyle.JavaCodeStyleManager;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtil;
+import com.intellij.psi.util.TypeConversionUtil;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.Collection;
 
 public class SurroundWithArrayFix extends PsiElementBaseIntentionAction {
   private final PsiCall myMethodCall;

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddDeprecationAnnotationFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddDeprecationAnnotationFix.java
index 5e56e77d8dc6e22c4c50113731e2dad2a811458e..c8e21c39d88667b5525dd4757387f90905ee2d44 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddDeprecationAnnotationFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddDeprecationAnnotationFix.java
@@ -22,11 +22,11 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
+import com.intellij.codeInsight.intention.AddAnnotationFix;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.NotNull;
 
 public class AddDeprecationAnnotationFix extends AddAnnotationFix {
   public AddDeprecationAnnotationFix() {

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java
index e4d251f00d5456a0374ff6e26c9f8de3f6dd3c8d..d3a7edf01d3b879d5722c7cf1f5180fd478dd0cd 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java
@@ -22,12 +22,12 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
+import com.intellij.codeInsight.AnnotationUtil;
+import com.intellij.codeInsight.intention.AddAnnotationFix;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.NotNull;
 
 public class AddNullableNotNullAnnotationFix extends AddAnnotationFix {
   public AddNullableNotNullAnnotationFix(final String annotation, final String annotationToRemove) {

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
index 670798b00dc0bbc822a6e5a8f3a0f8c09df626dd..f06162932d0e041a8d7f9acd36c6ede75d3461d3 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
@@ -15,18 +15,22 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.highlighting.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.editor.colors.*;
-import com.intellij.openapi.project.*;
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.highlighting.HighlightManager;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.colors.EditorColors;
+import com.intellij.openapi.editor.colors.EditorColorsManager;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import gnu.trove.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtil;
+import com.intellij.util.IncorrectOperationException;
+import gnu.trove.TIntArrayList;
+import gnu.trove.TIntProcedure;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author ven

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java
index 2d36ed2489ce67923ca40281c4d9395bf52ffa17..5fc72da94f040881eb9e1512a2abe01a15b97435 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java
@@ -19,17 +19,19 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Key;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.tree.java.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.impl.source.tree.java.PsiReferenceExpressionImpl;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 
 public class AddSingleMemberStaticImportAction extends PsiElementBaseIntentionAction {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.AddSingleMemberStaticImportAction");

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ColorChooserIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ColorChooserIntentionAction.java
index 4d31a536726e12728e1d26bbaeeb61266c6f7172..606b9acef5385a2aeb5e0eea88a3547bec97f1ed 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ColorChooserIntentionAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ColorChooserIntentionAction.java
@@ -22,17 +22,18 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
-import com.intellij.patterns.*;
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
+import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.*;
-import com.intellij.psi.util.*;
-import com.intellij.ui.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.ui.ColorChooser;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 
 import java.awt.*;
 

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertAbsolutePathToRelativeIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertAbsolutePathToRelativeIntentionAction.java
index f5cde3acaf88c5997021683a7db579eb431a4251..b684ae9ac5f033feee50a621b755a6524cca7b19 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertAbsolutePathToRelativeIntentionAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertAbsolutePathToRelativeIntentionAction.java
@@ -15,14 +15,19 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
-import com.intellij.psi.*;
-import com.intellij.psi.impl.source.resolve.reference.impl.*;
-import com.intellij.psi.impl.source.resolve.reference.impl.providers.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.impl.source.resolve.reference.impl.PsiMultiReference;
+import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference;
+import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceOwner;
+import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author spleaner

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java
index ca7987aadf45ed2c66d87cf81955b07ab260513c..194190e653b726bb1367a43b251d0e838e7532b2 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java
@@ -24,24 +24,27 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.daemon.impl.analysis.*;
-import com.intellij.codeInsight.daemon.impl.quickfix.*;
-import com.intellij.codeInsight.generation.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.fileEditor.ex.*;
-import com.intellij.openapi.module.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.*;
-import com.intellij.openapi.util.*;
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.CodeInsightUtil;
+import com.intellij.codeInsight.daemon.impl.analysis.HighlightNamesUtil;
+import com.intellij.codeInsight.daemon.impl.quickfix.CreateClassKind;
+import com.intellij.codeInsight.generation.OverrideImplementUtil;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory;
+import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.impl.source.PostprocessReformattingAspect;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class CreateSubclassAction extends PsiElementBaseIntentionAction {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.ImplementAbstractClassAction");

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java
index de8a46a551a4ecda4d54a75ac0d2e3d4cd2ab767..9e98454ef5e5ef2cf3634ed5d1b952d5b781a41c 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java
@@ -24,20 +24,22 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.CodeInsightServicesUtil;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+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.codeStyle.*;
+import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.controlFlow.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.List;
 
 public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.InvertIfConditionAction");

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/MakeTypeGenericAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/MakeTypeGenericAction.java
index a93aa1027012b4f2ef77ed18ba8eb07cc7fb0d73..dc961c831338204da35ead17a17a62a6c722ae3c 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/MakeTypeGenericAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/MakeTypeGenericAction.java
@@ -15,15 +15,17 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.openapi.editor.CaretModel;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Pair;
 import com.intellij.psi.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.util.PsiUtil;
+import com.intellij.psi.util.TypeConversionUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 
 /**
  *  @author dsl

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveInitializerToConstructorAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveInitializerToConstructorAction.java
index b14c6a53f4a6a3ad19301b3579fa1858c8ee4f59..4301a17efae989fc0c0dcb5eae539c5e8e3fa61b 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveInitializerToConstructorAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveInitializerToConstructorAction.java
@@ -15,22 +15,27 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.daemon.impl.analysis.*;
-import com.intellij.codeInsight.daemon.impl.quickfix.*;
-import com.intellij.codeInsight.highlighting.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.editor.colors.*;
-import com.intellij.openapi.editor.markup.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil;
+import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil;
+import com.intellij.codeInsight.daemon.impl.quickfix.CreateFromUsageUtils;
+import com.intellij.codeInsight.highlighting.HighlightManager;
+import com.intellij.codeInsight.intention.IntentionAction;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.codeInsight.intention.QuickFixFactory;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.colors.EditorColors;
+import com.intellij.openapi.editor.colors.EditorColorsManager;
+import com.intellij.openapi.editor.markup.TextAttributes;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Ref;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.jsp.jspJava.*;
-import com.intellij.psi.javadoc.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.impl.source.jsp.jspJava.JspClass;
+import com.intellij.psi.javadoc.PsiDocComment;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java
index def977c63ca28b825f0a875dc3e43087e3aa1068..7bf2d1351267628aa20ede9a4231dea788495374 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java
@@ -15,16 +15,17 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.*;
-import com.intellij.psi.javadoc.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.javadoc.PsiDocComment;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author max

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java
index 63b6cc80aab7d9c4a4fc4e26998571b2719747aa..b62a5aebd2926b7925ef32f21b9f9a18a45710da 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java
@@ -15,16 +15,18 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.ScrollType;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author mike

diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
index 72077b1eb9ef684448d16d5b7eaf4cef513b6928..dfd3dbe844bcf305e90b5f8494e766339fe26ec5 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
@@ -32,6 +32,7 @@ import com.intellij.psi.formatter.java.wrap.JavaWrapManager;
 import com.intellij.psi.formatter.java.wrap.ReservedWrapsProvider;
 import com.intellij.psi.impl.source.SourceTreeToPsiMap;
 import com.intellij.psi.impl.source.tree.*;
+import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.impl.source.tree.java.ClassElement;
 import com.intellij.psi.jsp.JspElementType;
 import com.intellij.psi.tree.IElementType;
@@ -158,6 +159,9 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
     if (isStatement(child, child.getTreeParent())) {
       return new CodeBlockBlock(child, wrap, alignment, actualIndent, settings);
     }
+    if (child instanceof PsiComment && child instanceof PsiLanguageInjectionHost && InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)child)) {
+      return new CommentWithInjectionBlock(child, wrap, alignment, indent, settings);
+    }
     if (child instanceof LeafElement) {
       final LeafBlock block = new LeafBlock(child, wrap, alignment, actualIndent);
       block.setStartOffset(startOffset);

diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/CommentWithInjectionBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/CommentWithInjectionBlock.java
new file mode 100644 (file)
index 0000000..efc8204
--- /dev/null
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/CommentWithInjectionBlock.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2000-2010 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.formatter.java;
+
+import com.intellij.formatting.*;
+import com.intellij.lang.ASTNode;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.codeStyle.CodeStyleSettings;
+import com.intellij.psi.formatter.common.InjectedLanguageBlockBuilder;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author nik
+ */
+public class CommentWithInjectionBlock extends AbstractJavaBlock {
+  private InjectedLanguageBlockBuilder myInjectedBlockBuilder;
+
+  public CommentWithInjectionBlock(ASTNode node, Wrap wrap, Alignment alignment, Indent indent, CodeStyleSettings settings) {
+    super(node, wrap, alignment, indent, settings);
+    myInjectedBlockBuilder = new JavaCommentInjectedBlockBuilder();
+  }
+
+  @Override
+  protected List<Block> buildChildren() {
+    final List<Block> result = new ArrayList<Block>();
+    myInjectedBlockBuilder.addInjectedBlocks(result, myNode, myWrap, myAlignment, Indent.getNoneIndent());
+    return result;
+  }
+
+  @Override
+  public boolean isLeaf() {
+    return false;
+  }
+
+  @NotNull
+  @Override
+  public ChildAttributes getChildAttributes(int newChildIndex) {
+    return new ChildAttributes(Indent.getNormalIndent(), null);
+  }
+
+  @Override
+  public Spacing getSpacing(Block child1, Block child2) {
+    return null;
+  }
+
+  private class JavaCommentInjectedBlockBuilder extends InjectedLanguageBlockBuilder {
+    @Override
+    public CodeStyleSettings getSettings() {
+      return mySettings;
+    }
+
+    @Override                                      
+    public boolean canProcessFragment(String text, ASTNode injectionHost) {
+      return true;
+    }
+
+    @Override
+    public Block createBlockBeforeInjection(ASTNode node, Wrap wrap, Alignment alignment, Indent indent, final TextRange range) {
+      return new PartialCommentBlock(node, wrap, alignment, indent, range);
+    }
+
+    @Override
+    public Block createBlockAfterInjection(ASTNode node, Wrap wrap, Alignment alignment, Indent indent, TextRange range) {
+      return new PartialCommentBlock(node, wrap, alignment, Indent.getNoneIndent(), range);
+    }
+  }
+
+  private static class PartialCommentBlock extends LeafBlock {
+    private final TextRange myRange;
+
+    public PartialCommentBlock(ASTNode node, Wrap wrap, Alignment alignment, Indent indent, TextRange range) {
+      super(node, wrap, alignment, indent);
+      myRange = range;
+    }
+
+    @NotNull
+    @Override
+    public TextRange getTextRange() {
+      return myRange;
+    }
+  }
+}

diff --git a/java/java-impl/src/com/intellij/psi/impl/AllowedApiFilterExtension.java b/java/java-impl/src/com/intellij/psi/impl/AllowedApiFilterExtension.java
index 455ba396a95101b9858779280fd4f7dad0b64119..0138f7bfa0153c512f7eb2be03cdbd7f91aca0e8 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/AllowedApiFilterExtension.java
+++ b/java/java-impl/src/com/intellij/psi/impl/AllowedApiFilterExtension.java
@@ -20,9 +20,10 @@
  */
 package com.intellij.psi.impl;
 
-import com.intellij.openapi.extensions.*;
-import com.intellij.psi.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.openapi.extensions.Extensions;
+import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
 
 public abstract class AllowedApiFilterExtension {
   public static final ExtensionPointName<AllowedApiFilterExtension> EP_NAME = ExtensionPointName.create("com.intellij.allowedApiFilter");

diff --git a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
index 1ab4fe729c40423d7b5140ae27df606484a90e75..24ecdb8eb870936f723cbe996beb540b03862b7d 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
@@ -15,14 +15,18 @@
  */
 package com.intellij.refactoring.extractInterface;
 
-import com.intellij.openapi.project.*;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.refactoring.*;
-import com.intellij.refactoring.classMembers.*;
-import com.intellij.refactoring.extractSuperclass.*;
-import com.intellij.refactoring.ui.*;
-import com.intellij.refactoring.util.*;
-import com.intellij.refactoring.util.classMembers.*;
+import com.intellij.refactoring.HelpID;
+import com.intellij.refactoring.JavaRefactoringSettings;
+import com.intellij.refactoring.RefactoringBundle;
+import com.intellij.refactoring.classMembers.DelegatingMemberInfoModel;
+import com.intellij.refactoring.classMembers.MemberInfoBase;
+import com.intellij.refactoring.extractSuperclass.ExtractSuperBaseDialog;
+import com.intellij.refactoring.extractSuperclass.ExtractSuperBaseProcessor;
+import com.intellij.refactoring.ui.MemberSelectionPanel;
+import com.intellij.refactoring.util.DocCommentPolicy;
+import com.intellij.refactoring.util.classMembers.MemberInfo;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java
index 774d74e79f37618bd4c9e17d4b6cde90827794cb..d9216d9fb3f5afd87c4db5c2972778334ba70d3c 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java
@@ -15,12 +15,12 @@
  */
 package com.intellij.refactoring.extractInterface;
 
-import com.intellij.openapi.project.*;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.refactoring.extractSuperclass.*;
-import com.intellij.refactoring.util.*;
-import com.intellij.refactoring.util.classMembers.*;
-import com.intellij.util.*;
+import com.intellij.refactoring.extractSuperclass.ExtractSuperBaseProcessor;
+import com.intellij.refactoring.util.DocCommentPolicy;
+import com.intellij.refactoring.util.classMembers.MemberInfo;
+import com.intellij.util.IncorrectOperationException;
 
 /**
  * @author dsl

diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java
index 5107c82f3dc0ff6bb5d23cc3904302e0b5a90e77..81fe4bc7af1cff2c7a342dbf41d583b95342536d 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java
@@ -15,24 +15,29 @@
  */
 package com.intellij.refactoring.extractSuperclass;
 
-import com.intellij.ide.util.*;
-import com.intellij.openapi.command.*;
-import com.intellij.openapi.help.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.roots.*;
-import com.intellij.openapi.util.text.*;
-import com.intellij.openapi.vfs.*;
+import com.intellij.ide.util.PackageUtil;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.help.HelpManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ProjectFileIndex;
+import com.intellij.openapi.roots.ProjectRootManager;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
-import com.intellij.refactoring.*;
-import com.intellij.refactoring.ui.*;
-import com.intellij.refactoring.util.*;
-import com.intellij.refactoring.util.classMembers.*;
-import com.intellij.ui.*;
-import com.intellij.util.*;
+import com.intellij.refactoring.RefactoringBundle;
+import com.intellij.refactoring.ui.DocCommentPanel;
+import com.intellij.refactoring.ui.PackageNameReferenceEditorCombo;
+import com.intellij.refactoring.ui.RefactoringDialog;
+import com.intellij.refactoring.util.CommonRefactoringUtil;
+import com.intellij.refactoring.util.RefactoringMessageUtil;
+import com.intellij.refactoring.util.classMembers.MemberInfo;
+import com.intellij.ui.RecentsManager;
+import com.intellij.util.IncorrectOperationException;
 
 import javax.swing.*;
-import java.awt.event.*;
-import java.util.*;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.List;
 
 /**
  * @author dsl

diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
index 41bbc173a766dfebb6cd9d5e22364dcef57d68a2..482821ac029653dd0c5c9518e0cf09d3e6fa4b98 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
@@ -15,23 +15,28 @@
  */
 package com.intellij.refactoring.extractSuperclass;
 
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Comparing;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.*;
-import com.intellij.psi.search.*;
-import com.intellij.psi.search.searches.*;
-import com.intellij.psi.util.*;
-import com.intellij.refactoring.*;
-import com.intellij.refactoring.turnRefsToSuper.*;
-import com.intellij.refactoring.util.*;
-import com.intellij.refactoring.util.classMembers.*;
-import com.intellij.usageView.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import com.intellij.psi.codeStyle.JavaCodeStyleManager;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.search.searches.ReferencesSearch;
+import com.intellij.psi.util.InheritanceUtil;
+import com.intellij.psi.util.MethodSignatureUtil;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.refactoring.RefactoringBundle;
+import com.intellij.refactoring.turnRefsToSuper.TurnRefsToSuperProcessorBase;
+import com.intellij.refactoring.util.DocCommentPolicy;
+import com.intellij.refactoring.util.classMembers.MemberInfo;
+import com.intellij.usageView.UsageInfo;
+import com.intellij.usageView.UsageViewDescriptor;
+import com.intellij.usageView.UsageViewUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collection;
 
 /**
  * @author dsl

diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java
index 1633ab297da40054077fe758256ae557787646f3..8eb3f75f071a0dc8ec8e4936bb05296b733ec253 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java
@@ -15,11 +15,11 @@
  */
 package com.intellij.refactoring.extractSuperclass;
 
-import com.intellij.openapi.project.*;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.refactoring.util.*;
-import com.intellij.refactoring.util.classMembers.*;
-import com.intellij.util.*;
+import com.intellij.refactoring.util.DocCommentPolicy;
+import com.intellij.refactoring.util.classMembers.MemberInfo;
+import com.intellij.util.IncorrectOperationException;
 
 /**
  * @author dsl

diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
index d6aef307ab967c1dfcbf722985334a92aea7e782..febe8aa18e27eba74e7695093a26b1aa14a05630 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
@@ -15,18 +15,25 @@
  */
 package com.intellij.refactoring.extractSuperclass;
 
-import com.intellij.openapi.project.*;
-import com.intellij.psi.*;
-import com.intellij.refactoring.*;
-import com.intellij.refactoring.classMembers.*;
-import com.intellij.refactoring.memberPullUp.*;
-import com.intellij.refactoring.ui.*;
-import com.intellij.refactoring.util.*;
-import com.intellij.refactoring.util.classMembers.*;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiMember;
+import com.intellij.psi.PsiMethod;
+import com.intellij.refactoring.HelpID;
+import com.intellij.refactoring.JavaRefactoringSettings;
+import com.intellij.refactoring.RefactoringBundle;
+import com.intellij.refactoring.classMembers.MemberInfoChange;
+import com.intellij.refactoring.classMembers.MemberInfoModel;
+import com.intellij.refactoring.memberPullUp.PullUpHelper;
+import com.intellij.refactoring.ui.MemberSelectionPanel;
+import com.intellij.refactoring.util.DocCommentPolicy;
+import com.intellij.refactoring.util.classMembers.InterfaceContainmentVerifier;
+import com.intellij.refactoring.util.classMembers.MemberInfo;
+import com.intellij.refactoring.util.classMembers.UsesAndInterfacesDependencyMemberInfoModel;
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.*;
+import java.util.ArrayList;
 import java.util.List;
 
 class ExtractSuperclassDialog extends ExtractSuperBaseDialog {

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
index bf1580d5698b0e49e7a4adea18af358e2c11842a..a0e1176346f846b27e1f9c0bd293ee4c200cb77a 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
@@ -39,7 +39,6 @@ import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.markup.RangeHighlighter;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.Pass;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.WindowManager;

diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java
index 202ca16ce9792dc50a708fa1d2d5ee41a9d4e5cf..2bf549eb9c8ea00937f81af06117256767ec715b 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java
@@ -15,25 +15,32 @@
  */
 package com.intellij.refactoring.rename;
 
-import com.intellij.codeInsight.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
+import com.intellij.codeInsight.ChangeContextUtil;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.Pair;
 import com.intellij.psi.*;
-import com.intellij.psi.search.*;
-import com.intellij.psi.search.searches.*;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.search.LocalSearchScope;
+import com.intellij.psi.search.searches.ClassInheritorsSearch;
+import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.psi.util.ClassUtil;
-import com.intellij.refactoring.*;
-import com.intellij.refactoring.listeners.*;
-import com.intellij.refactoring.util.*;
-import com.intellij.usageView.*;
-import com.intellij.util.*;
-import com.intellij.util.containers.*;
-import org.jetbrains.annotations.*;
+import com.intellij.refactoring.HelpID;
+import com.intellij.refactoring.JavaRefactoringSettings;
+import com.intellij.refactoring.RefactoringBundle;
+import com.intellij.refactoring.listeners.RefactoringElementListener;
+import com.intellij.refactoring.util.MoveRenameUsageInfo;
+import com.intellij.refactoring.util.RefactoringUtil;
+import com.intellij.usageView.UsageInfo;
+import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.MultiMap;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
-import java.util.HashSet;
-import java.util.regex.*;
+import java.util.regex.Pattern;
 
 /**
  * @author yole

diff --git a/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java b/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
index 0f51665108ac0dcdcb2da9e48fd3058c5d67dff8..52d34e93eb43591880ed6419185bea74484d5fdb 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
@@ -15,20 +15,26 @@
  */
 package com.intellij.refactoring.util.duplicates;
 
-import com.intellij.codeInsight.*;
-import com.intellij.lang.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.util.*;
+import com.intellij.codeInsight.PsiEquivalenceUtil;
+import com.intellij.lang.ASTNode;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.Pair;
 import com.intellij.psi.*;
 import com.intellij.psi.controlFlow.*;
-import com.intellij.psi.impl.source.*;
-import com.intellij.psi.tree.*;
-import com.intellij.psi.util.*;
-import com.intellij.refactoring.extractMethod.*;
-import com.intellij.refactoring.util.*;
-import com.intellij.util.*;
-import com.intellij.util.containers.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.impl.source.PsiImmediateClassType;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.util.InheritanceUtil;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtil;
+import com.intellij.psi.util.TypeConversionUtil;
+import com.intellij.refactoring.extractMethod.InputVariables;
+import com.intellij.refactoring.util.RefactoringUtil;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.IntArrayList;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 

diff --git a/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java b/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java
index bb27d8b637fb5c7a63e87e3fb3b8797254f53154..8a983be67fa202c46c45f2bb5f211d7d9bbdfe2d 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java
@@ -48,8 +48,8 @@ import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.extractMethod.InputVariables;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
 import com.intellij.refactoring.util.RefactoringUtil;
-import com.intellij.util.VisibilityUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.VisibilityUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java
index 327d062ed71ea4aba2bd1eb6820c16cae046316c..3077be1cc536c110bc62799050c9969a2542b6b5 100644 (file)
--- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java
+++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java
@@ -15,29 +15,32 @@
  */
 package com.intellij.testIntegration.createTest;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInsight.daemon.impl.analysis.*;
-import com.intellij.codeInsight.intention.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.extensions.*;
-import com.intellij.openapi.fileEditor.ex.*;
-import com.intellij.openapi.module.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.roots.*;
-import com.intellij.openapi.ui.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.vfs.*;
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.CodeInsightUtil;
+import com.intellij.codeInsight.daemon.impl.analysis.HighlightNamesUtil;
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.extensions.Extensions;
+import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ProjectRootManager;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.*;
-import com.intellij.psi.search.*;
-import com.intellij.psi.util.*;
-import com.intellij.refactoring.util.classMembers.*;
-import com.intellij.testIntegration.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import com.intellij.psi.impl.source.PostprocessReformattingAspect;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.refactoring.util.classMembers.MemberInfo;
+import com.intellij.testIntegration.TestFrameworkDescriptor;
+import com.intellij.testIntegration.TestIntegrationUtils;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
 
 public class CreateTestAction extends PsiElementBaseIntentionAction {
   @NotNull

diff --git a/java/java-tests/testData/refactoring/inlineLocal/Wildcard.java b/java/java-tests/testData/refactoring/inlineLocal/Wildcard.java
index 581682b6b9a239ad785ce652f6f60455978d4066..fafcde38fb92221477d817774a2936e904755c7c 100644 (file)
--- a/java/java-tests/testData/refactoring/inlineLocal/Wildcard.java
+++ b/java/java-tests/testData/refactoring/inlineLocal/Wildcard.java
@@ -1,4 +1,4 @@
-import java.util.*;
+import java.util.Collection;
 class Test {
   void foo() {
     final Collection<? extends Number> extensions = getExtensions();

diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractEnumTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractEnumTest.java
index 5f181011663ecb580ec1cb9c618817ab848e7cb7..9e143ca9b04d66940ab8e0ad7c63c2bffc20b4d3 100644 (file)
--- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractEnumTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractEnumTest.java
@@ -29,7 +29,10 @@ import com.intellij.refactoring.extractclass.ExtractClassProcessor;
 import com.intellij.refactoring.util.classMembers.MemberInfo;
 import junit.framework.Assert;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.TreeSet;
 
 public class ExtractEnumTest extends MultiFileTestCase {
 

diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
index 1a08474e4d56cebf4feefb48ce06082bd4730003..55813fb2b5026d95d53cbb2c523188e9cd8d5b72 100644 (file)
--- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
@@ -1,5 +1,6 @@
 package com.intellij.refactoring;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.codeInsight.CodeInsightUtil;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
@@ -15,7 +16,6 @@ import com.intellij.refactoring.extractMethod.PrepareFailedException;
 import com.intellij.refactoring.util.duplicates.Match;
 import com.intellij.testFramework.LightCodeInsightTestCase;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.JavaTestUtil;
 import org.jetbrains.annotations.NonNls;
 
 import java.util.List;

diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
index 4f7580b5fa34d7cd7ad1fe53977b5d67216bf710..56fefe62646fcf08ec6e084ca5afa6112e147dfb 100644 (file)
--- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
@@ -1,12 +1,12 @@
 package com.intellij.refactoring;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 import com.intellij.psi.PsiPrimitiveType;
 import com.intellij.psi.PsiType;
 import com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler;
 import com.intellij.testFramework.LightCodeInsightTestCase;
-import com.intellij.JavaTestUtil;
 
 /**
  * @author ven

diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java b/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java
index 0d3b73fdd1ebd72ca3324f0d8da95222b2c5d96c..720983a9c68c0dd9dddd80d4bfd3a35e4d405a37 100644 (file)
--- a/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java
@@ -1,17 +1,18 @@
 package com.intellij.refactoring;
 
-import com.intellij.*;
-import com.intellij.codeInsight.*;
-import com.intellij.openapi.projectRoots.*;
-import com.intellij.openapi.projectRoots.impl.*;
-import com.intellij.psi.*;
-import com.intellij.refactoring.rename.*;
-import com.intellij.refactoring.util.*;
-import com.intellij.testFramework.*;
-import com.intellij.usageView.*;
-import org.junit.*;
-
-import java.util.*;
+import com.intellij.JavaTestUtil;
+import com.intellij.codeInsight.TargetElementUtilBase;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
+import com.intellij.psi.PsiElement;
+import com.intellij.refactoring.rename.RenameProcessor;
+import com.intellij.refactoring.rename.RenameUtil;
+import com.intellij.refactoring.util.MoveRenameUsageInfo;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.usageView.UsageInfo;
+import org.junit.Assert;
+
+import java.util.HashMap;
 
 /**
  * @author sashache

diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java
index e6f4d814c019904ed69734ce80395a5543fc030f..c99b894f6bd1cd17c3ee50b0f5953a34e24e6544 100644 (file)
--- a/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java
@@ -4,6 +4,7 @@
  */
 package com.intellij.refactoring;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -13,7 +14,6 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.refactoring.replaceConstructorWithBuilder.ParameterData;
 import com.intellij.refactoring.replaceConstructorWithBuilder.ReplaceConstructorWithBuilderProcessor;
 import com.intellij.util.containers.HashMap;
-import com.intellij.JavaTestUtil;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

diff --git a/java/openapi/src/com/intellij/codeInsight/intention/AddAnnotationFix.java b/java/openapi/src/com/intellij/codeInsight/intention/AddAnnotationFix.java
index b1ce685924102fc1bdd55c8a8eea789fd868c422..62befe19526b2dee31c061e65c06cbfbfccb3e0e 100644 (file)
--- a/java/openapi/src/com/intellij/codeInsight/intention/AddAnnotationFix.java
+++ b/java/openapi/src/com/intellij/codeInsight/intention/AddAnnotationFix.java
@@ -16,18 +16,28 @@
 
 package com.intellij.codeInsight.intention;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInspection.*;
-import com.intellij.lang.findUsages.*;
-import com.intellij.openapi.command.undo.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
+import com.intellij.codeInsight.AnnotationUtil;
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.ExternalAnnotationsManager;
+import com.intellij.codeInspection.LocalQuickFix;
+import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.lang.findUsages.FindUsagesProvider;
+import com.intellij.lang.findUsages.LanguageFindUsages;
+import com.intellij.openapi.command.undo.UndoUtil;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.CaretModel;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
+import com.intellij.psi.codeStyle.JavaCodeStyleManager;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author ven

diff --git a/java/openapi/src/com/intellij/openapi/vcs/checkin/CodeAnalysisBeforeCheckinHandler.java b/java/openapi/src/com/intellij/openapi/vcs/checkin/CodeAnalysisBeforeCheckinHandler.java
index 1fe23e234384f8be5a87a3da9c7ea51024c633b6..4ada5bfd07f95278243c7c9d4894301e186253e1 100644 (file)
--- a/java/openapi/src/com/intellij/openapi/vcs/checkin/CodeAnalysisBeforeCheckinHandler.java
+++ b/java/openapi/src/com/intellij/openapi/vcs/checkin/CodeAnalysisBeforeCheckinHandler.java
@@ -20,13 +20,17 @@ import com.intellij.CommonBundle;
 import com.intellij.codeInsight.CodeSmellInfo;
 import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.openapi.progress.ProcessCanceledException;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.DumbService;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.vcs.*;
+import com.intellij.openapi.vcs.CheckinProjectPanel;
+import com.intellij.openapi.vcs.CodeSmellDetector;
+import com.intellij.openapi.vcs.VcsBundle;
+import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.changes.CommitExecutor;
 import com.intellij.openapi.vcs.ui.RefreshableOnComponent;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.PairConsumer;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nullable;
 
@@ -115,7 +119,7 @@ public class CodeAnalysisBeforeCheckinHandler extends CheckinHandler {
     return result;
   }
 
-  public ReturnResult beforeCheckin(CommitExecutor executor) {
+  public ReturnResult beforeCheckin(CommitExecutor executor, PairConsumer<Object, Object> additionalDataConsumer) {
     if (getSettings().CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT) {
       if (DumbService.getInstance(myProject).isDumb()) {
         if (Messages.showDialog(myProject,

diff --git a/platform/lang-api/src/com/intellij/codeInsight/intention/PsiElementBaseIntentionAction.java b/platform/lang-api/src/com/intellij/codeInsight/intention/PsiElementBaseIntentionAction.java
index adc150baa41e8150c066b361f39c4811c57ae83f..851bbd62d2819c3edcb369362b3276cec10359a9 100644 (file)
--- a/platform/lang-api/src/com/intellij/codeInsight/intention/PsiElementBaseIntentionAction.java
+++ b/platform/lang-api/src/com/intellij/codeInsight/intention/PsiElementBaseIntentionAction.java
@@ -22,11 +22,13 @@
  */
 package com.intellij.codeInsight.intention;
 
-import com.intellij.codeInsight.intention.impl.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
-import com.intellij.psi.*;
-import org.jetbrains.annotations.*;
+import com.intellij.codeInsight.intention.impl.BaseIntentionAction;
+import com.intellij.openapi.editor.CaretModel;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.NotNull;
 
 public abstract class PsiElementBaseIntentionAction extends BaseIntentionAction {
 

diff --git a/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
index 0cde5d9df65edc6b83dbdae4e9edf9ae7e9b2481..96ee2dd6ee3939aa9b05d1679a23a458bc07ec9f 100644 (file)
--- a/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
@@ -16,14 +16,22 @@
 
 package com.intellij.execution.configurations;
 
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.module.*;
-import com.intellij.openapi.util.*;
-import org.jdom.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleManager;
+import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.InvalidDataException;
+import com.intellij.openapi.util.WriteExternalException;
+import org.jdom.Element;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 public abstract class ModuleBasedConfiguration<ConfigurationModule extends RunConfigurationModule> extends RuntimeConfiguration {
   private static final Logger LOG = Logger.getInstance("#com.intellij.execution.configurations.ModuleBasedConfiguration");

diff --git a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
index 7fc000e917d541b3a58d488602901da9d516974d..bbf73ecb7854ac00bc6c1ff88dd9f6068c00e18a 100644 (file)
--- a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
+++ b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
@@ -16,7 +16,10 @@
 
 package com.intellij.execution.junit;
 
-import com.intellij.execution.*;
+import com.intellij.execution.Location;
+import com.intellij.execution.PsiLocation;
+import com.intellij.execution.RunManager;
+import com.intellij.execution.RunnerAndConfigurationSettings;
 import com.intellij.execution.actions.ConfigurationContext;
 import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.configurations.ConfigurationType;

diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java b/platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java
index c5e1ef4a5db0fa32110cbab18bb678a642b8a512..657b70a306b96d68e87d55217c0d0e3fc99577f5 100644 (file)
--- a/platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java
+++ b/platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java
@@ -19,15 +19,19 @@
  */
 package com.intellij.openapi.module;
 
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.project.*;
+import com.intellij.openapi.application.ReadAction;
+import com.intellij.openapi.application.Result;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.psi.*;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import com.intellij.util.containers.HashSet;
-import com.intellij.util.graph.*;
-import org.jetbrains.annotations.*;
+import com.intellij.util.graph.Graph;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/StatusBarUpdater.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/StatusBarUpdater.java
index 67c7ddebd6359aad61da6763c0b3ac25b8b49291..47bb6a7ec4fd55414f192f1b20b0493d083f3762 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/StatusBarUpdater.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/StatusBarUpdater.java
@@ -19,6 +19,7 @@ package com.intellij.codeInsight.daemon.impl;
 
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
@@ -45,7 +46,7 @@ public class StatusBarUpdater implements Disposable {
 
     CaretListener caretListener = new CaretListener() {
       public void caretPositionChanged(CaretEvent e) {
-        ApplicationManager.getApplication().invokeLater(myUpdateStatusRunnable);
+        updateLater();
       }
     };
     EditorFactory.getInstance().getEventMulticaster().addCaretListener(caretListener, this);
@@ -53,11 +54,21 @@ public class StatusBarUpdater implements Disposable {
     project.getMessageBus().connect().subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new FileEditorManagerAdapter() {
       @Override
       public void selectionChanged(FileEditorManagerEvent event) {
-        ApplicationManager.getApplication().invokeLater(myUpdateStatusRunnable);
+        updateLater();
       }
     });
   }
 
+  private void updateLater() {
+    final Application application = ApplicationManager.getApplication();
+    if (!application.isUnitTestMode()) {
+      application.invokeLater(myUpdateStatusRunnable);
+    }
+    else {
+      myUpdateStatusRunnable.run();
+    }
+  }
+
   public void dispose() {
   }
 
@@ -91,4 +102,4 @@ public class StatusBarUpdater implements Disposable {
       }
     }
   }
-}
\ No newline at end of file
+}

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/AbstractSuppressByNoInspectionCommentFix.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/AbstractSuppressByNoInspectionCommentFix.java
index 1268698df18a8b07a0a1f94aeb87b71c19890737..3818e1e82a9d6892bd5b0f1a1766281a1c19c70d 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/AbstractSuppressByNoInspectionCommentFix.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/AbstractSuppressByNoInspectionCommentFix.java
@@ -16,19 +16,27 @@
 
 package com.intellij.codeInsight.daemon.impl.actions;
 
-import com.intellij.codeInsight.*;
-import com.intellij.codeInspection.*;
-import com.intellij.lang.*;
-import com.intellij.openapi.command.undo.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.fileTypes.*;
-import com.intellij.openapi.project.*;
-import com.intellij.psi.*;
-import com.intellij.psi.util.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInspection.InspectionsBundle;
+import com.intellij.codeInspection.SuppressIntentionAction;
+import com.intellij.codeInspection.SuppressionUtil;
+import com.intellij.lang.Commenter;
+import com.intellij.lang.LanguageCommenters;
+import com.intellij.openapi.command.undo.UndoUtil;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.fileTypes.LanguageFileType;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiComment;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiParserFacade;
+import com.intellij.psi.PsiWhiteSpace;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @author Roman.Chernyatchik

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java
index 24b8df77c3b5736d2566cde94b41aad05529b6a8..d1fd46e0a907b73777d4acca768d34347307bada 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java
@@ -19,6 +19,7 @@ package com.intellij.codeInsight.editorActions;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.CodeInsightSettings;
 import com.intellij.codeInsight.editorActions.enter.EnterHandlerDelegate;
+import com.intellij.injected.editor.DocumentWindow;
 import com.intellij.lang.*;
 import com.intellij.lang.documentation.CodeDocumentationProvider;
 import com.intellij.lang.documentation.CompositeDocumentationProvider;
@@ -39,6 +40,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.impl.source.PostprocessReformattingAspect;
+import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtilBase;
@@ -321,7 +323,16 @@ public class EnterHandler extends BaseEnterHandler {
 
         if (CodeInsightSettings.getInstance().SMART_INDENT_ON_ENTER || myForceIndent || docStart || docAsterisk ||
             slashSlash) {
-          myOffset = CodeStyleManager.getInstance(getProject()).adjustLineIndent(myFile, myOffset);
+          final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(getProject());
+          if (myDocument instanceof DocumentWindow) {
+            DocumentWindow documentWindow = (DocumentWindow)myDocument;
+            final int correctedOffset = codeStyleManager.adjustLineIndent(InjectedLanguageUtil.getTopLevelFile(myFile),
+                                                                          documentWindow.injectedToHost(myOffset));
+            myOffset = documentWindow.hostToInjected(correctedOffset);
+          }
+          else {
+            myOffset = codeStyleManager.adjustLineIndent(myFile, myOffset);
+          }
         }
 
         if (docAsterisk || docStart || slashSlash) {

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/AutoIndentLinesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/AutoIndentLinesHandler.java
index 1c3fd88f7159a590255684d4070ae3f74312838c..581897d7d7bad29b2394df815ca57abd6fa3d419 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/generation/AutoIndentLinesHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/AutoIndentLinesHandler.java
@@ -17,6 +17,7 @@
 package com.intellij.codeInsight.generation;
 
 import com.intellij.codeInsight.CodeInsightActionHandler;
+import com.intellij.injected.editor.DocumentWindow;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.*;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -25,6 +26,7 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
@@ -53,15 +55,17 @@ public class AutoIndentLinesHandler implements CodeInsightActionHandler {
     int line1 = editor.offsetToLogicalPosition(startOffset).line;
     int col = editor.getCaretModel().getLogicalPosition().column;
 
-    CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project);
     try{
-      if (startOffset == endOffset) {
-        int lineStart = document.getLineStartOffset(line1);
-        if (codeStyleManager.isLineToBeIndented(file, lineStart)) {
-          codeStyleManager.adjustLineIndent(file, lineStart);
-        }
-      } else {
-        codeStyleManager.adjustLineIndent(file, new TextRange(startOffset, endOffset));
+      if (document instanceof DocumentWindow) {
+        final DocumentWindow documentWindow = (DocumentWindow)document;
+        int hostLine = documentWindow.injectedToHostLine(line1);
+        int hostStartOffset = documentWindow.injectedToHost(startOffset);
+        int hostEndOffset = documentWindow.injectedToHost(endOffset);
+        adjustLineIndent(InjectedLanguageUtil.getTopLevelFile(file), documentWindow.getDelegate(),
+                         hostStartOffset, hostEndOffset, hostLine, project);
+      }
+      else {
+        adjustLineIndent(file, document, startOffset, endOffset, line1, project);
       }
     }
     catch(IncorrectOperationException e){
@@ -86,6 +90,20 @@ public class AutoIndentLinesHandler implements CodeInsightActionHandler {
     }
   }
 
+  private static void adjustLineIndent(PsiFile file,
+                                Document document,
+                                int startOffset, int endOffset, int line1, Project project) {
+    CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project);
+    if (startOffset == endOffset) {
+      int lineStart = document.getLineStartOffset(line1);
+      if (codeStyleManager.isLineToBeIndented(file, lineStart)) {
+        codeStyleManager.adjustLineIndent(file, lineStart);
+      }
+    } else {
+      codeStyleManager.adjustLineIndent(file, new TextRange(startOffset, endOffset));
+    }
+  }
+
   public boolean startInWriteAction() {
     return true;
   }

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoComponent.java
index a430ebb611288d871915bf8c6d8b9dfc153732dc..f747e3e324d24366ba9cce494eea383e40e7b8d8 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoComponent.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoComponent.java
@@ -16,17 +16,20 @@
 
 package com.intellij.codeInsight.hint;
 
-import com.intellij.lang.parameterInfo.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.psi.*;
-import com.intellij.ui.*;
-import com.intellij.util.ui.*;
-import org.jetbrains.annotations.*;
+import com.intellij.lang.parameterInfo.ParameterInfoHandler;
+import com.intellij.lang.parameterInfo.ParameterInfoUIContextEx;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.psi.PsiElement;
+import com.intellij.ui.SideBorder;
+import com.intellij.ui.StrikeoutLabel;
+import com.intellij.util.ui.UIUtil;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import javax.swing.border.*;
+import javax.swing.border.Border;
+import javax.swing.border.LineBorder;
 import java.awt.*;
-import java.util.*;
+import java.util.EnumSet;
 
 class ParameterInfoComponent extends JPanel{
   private final Object[] myObjects;

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/problems/WolfTheProblemSolverImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/problems/WolfTheProblemSolverImpl.java
index 69624d0e7bb45a768e39381c7dc39832a4d89d33..5a85b0f611832894544defac2278e6f1f2775944 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/problems/WolfTheProblemSolverImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/problems/WolfTheProblemSolverImpl.java
@@ -17,28 +17,42 @@
 package com.intellij.codeInsight.problems;
 
 import com.intellij.codeInsight.daemon.impl.*;
-import com.intellij.codeInsight.daemon.impl.analysis.*;
-import com.intellij.lang.annotation.*;
-import com.intellij.openapi.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.application.impl.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.extensions.*;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.module.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.util.text.*;
-import com.intellij.openapi.vcs.*;
+import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder;
+import com.intellij.lang.annotation.HighlightSeverity;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.impl.LaterInvocator;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.extensions.Extensions;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.fileEditor.FileEditor;
+import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.fileEditor.TextEditor;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.progress.ProcessCanceledException;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vcs.FileStatusListener;
+import com.intellij.openapi.vcs.FileStatusManager;
 import com.intellij.openapi.vfs.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
-import com.intellij.problems.*;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.WindowManager;
+import com.intellij.openapi.wm.ex.StatusBarEx;
+import com.intellij.problems.Problem;
+import com.intellij.problems.WolfTheProblemSolver;
 import com.intellij.psi.*;
-import com.intellij.util.containers.*;
-import gnu.trove.*;
-import org.jetbrains.annotations.*;
+import com.intellij.util.containers.ContainerUtil;
+import gnu.trove.THashMap;
+import gnu.trove.THashSet;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 

diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
index 979da8f2fb4a5d809b887ad003fec21d16d91c14..653553799c9f918f580c23e657a6508712503ca6 100644 (file)
--- a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
@@ -22,8 +22,8 @@ import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.DumbService;
+import com.intellij.openapi.project.Project;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.HashSet;
 import org.jetbrains.annotations.NonNls;

diff --git a/platform/lang-impl/src/com/intellij/execution/actions/RunContextAction.java b/platform/lang-impl/src/com/intellij/execution/actions/RunContextAction.java
index f20e30937280319be63be9fb443ee44c9cb0b94f..81f00caee222d39efb22f08de84661d16f3f7019 100644 (file)
--- a/platform/lang-impl/src/com/intellij/execution/actions/RunContextAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/actions/RunContextAction.java
@@ -18,8 +18,8 @@ package com.intellij.execution.actions;
 
 import com.intellij.execution.*;
 import com.intellij.execution.configurations.RunConfiguration;
-import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.execution.runners.ExecutionEnvironment;
+import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.ui.Messages;
 import org.jetbrains.annotations.NotNull;

diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
index a5c5174a029cb27de0a8667d44754f9078f782b6..53de302b4f2a51e739e102bbf9f2f16ac91743b5 100644 (file)
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
@@ -39,8 +39,10 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /**
  * User: anna

diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
index 6f4786b789f2f4c6d01fc1b66931b28d5d28eae1..d2e407efbd2cc13c677e76a41b1e5ae1df162644 100644 (file)
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
@@ -31,7 +31,10 @@ import com.intellij.openapi.options.ex.SingleConfigurableEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.Splitter;
-import com.intellij.openapi.ui.popup.*;
+import com.intellij.openapi.ui.popup.JBPopupFactory;
+import com.intellij.openapi.ui.popup.ListPopup;
+import com.intellij.openapi.ui.popup.ListPopupStep;
+import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.IconLoader;

diff --git a/platform/lang-impl/src/com/intellij/execution/rmi/RemoteProcessSupport.java b/platform/lang-impl/src/com/intellij/execution/rmi/RemoteProcessSupport.java
index bfea825bf9b6152230f4ab0eb0f5cffc8d888354..53dfcb601fd82648fbb9709a8e00693b2c7f4eb9 100644 (file)
--- a/platform/lang-impl/src/com/intellij/execution/rmi/RemoteProcessSupport.java
+++ b/platform/lang-impl/src/com/intellij/execution/rmi/RemoteProcessSupport.java
@@ -12,7 +12,6 @@ import com.intellij.execution.process.ProcessListener;
 import com.intellij.execution.process.ProcessOutputTypes;
 import com.intellij.execution.runners.DefaultProgramRunner;
 import com.intellij.execution.runners.ProgramRunner;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressManager;

diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java
index 129497e0e2c291c51e0fba62b038568fef382fb6..f1a7fb42c057245bc9a24755cd2d79473fc31328 100644 (file)
--- a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java
+++ b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java
@@ -16,41 +16,56 @@
 
 package com.intellij.find.findUsages;
 
-import com.intellij.codeInsight.hint.*;
-import com.intellij.find.*;
-import com.intellij.lang.findUsages.*;
-import com.intellij.navigation.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.diagnostic.*;
+import com.intellij.codeInsight.hint.HintManager;
+import com.intellij.codeInsight.hint.HintManagerImpl;
+import com.intellij.codeInsight.hint.HintUtil;
+import com.intellij.find.FindBundle;
+import com.intellij.lang.findUsages.LanguageFindUsages;
+import com.intellij.navigation.NavigationItem;
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.IdeActions;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.extensions.*;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.keymap.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.*;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.extensions.Extensions;
+import com.intellij.openapi.fileEditor.FileEditor;
+import com.intellij.openapi.fileEditor.FileEditorLocation;
+import com.intellij.openapi.fileEditor.TextEditor;
+import com.intellij.openapi.keymap.KeymapUtil;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.Task;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.*;
-import com.intellij.openapi.util.text.*;
-import com.intellij.openapi.wm.*;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.wm.StatusBar;
 import com.intellij.psi.*;
-import com.intellij.psi.search.*;
-import com.intellij.ui.*;
+import com.intellij.psi.search.LocalSearchScope;
+import com.intellij.psi.search.SearchScope;
+import com.intellij.ui.LightweightHint;
 import com.intellij.ui.content.Content;
-import com.intellij.usageView.*;
+import com.intellij.usageView.UsageInfo;
 import com.intellij.usageView.UsageViewManager;
+import com.intellij.usageView.UsageViewUtil;
 import com.intellij.usages.*;
-import com.intellij.usages.impl.*;
-import com.intellij.util.*;
-import com.intellij.util.containers.*;
-import org.jdom.*;
-import org.jetbrains.annotations.*;
+import com.intellij.usages.impl.UsageViewManagerImpl;
+import com.intellij.util.Processor;
+import com.intellij.util.containers.ContainerUtil;
+import org.jdom.Element;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class FindUsagesManager implements JDOMExternalizable {
   private static final Logger LOG = Logger.getInstance("#com.intellij.find.findParameterUsages.FindUsagesManager");

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java
index a18530f8c0ee82ce58729ad3e83f4f0f5ed86cde..0001499173ccba31188d39388288d26187eb46ce 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java
@@ -40,7 +40,10 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
 
 public abstract class BaseProjectTreeBuilder extends AbstractTreeBuilder {
   protected final Project myProject;

diff --git a/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java b/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java
index 5de4a5e4f39ebe86ce142343a6ac60b84b072472..332008cb44ee3e5333f18c649d0000d679f92914 100644 (file)
--- a/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java
+++ b/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java
@@ -16,28 +16,34 @@
 
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.codeInsight.daemon.*;
-import com.intellij.codeInsight.daemon.impl.*;
-import com.intellij.codeInsight.daemon.impl.analysis.*;
-import com.intellij.ide.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.fileEditor.ex.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.profile.codeInspection.*;
-import com.intellij.psi.*;
-import com.intellij.ui.*;
-import com.intellij.ui.awt.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
+import com.intellij.codeInsight.daemon.impl.HectorComponent;
+import com.intellij.codeInsight.daemon.impl.analysis.HighlightLevelUtil;
+import com.intellij.ide.DataManager;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.fileEditor.FileEditorManagerAdapter;
+import com.intellij.openapi.fileEditor.FileEditorManagerEvent;
+import com.intellij.openapi.fileEditor.FileEditorManagerListener;
+import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.StatusBarWidget;
+import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import com.intellij.ui.UIBundle;
+import com.intellij.ui.awt.RelativePoint;
+import com.intellij.util.Consumer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
 
 public class TogglePopupHintsPanel implements StatusBarWidget, StatusBarWidget.IconPresentation {
   private static final Icon INSPECTIONS_ICON = IconLoader.getIcon("/ide/hectorOn.png");

diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
index 04c6aa50b38142a73f2c8ac9b2ad614118afa323..43ddae0e7e08676215588e5c39ff96e7ad46a15a 100644 (file)
--- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
@@ -16,44 +16,62 @@
 
 package com.intellij.packageDependencies.ui;
 
-import com.intellij.*;
-import com.intellij.analysis.*;
-import com.intellij.codeInsight.hint.*;
-import com.intellij.ide.*;
-import com.intellij.openapi.*;
+import com.intellij.CommonBundle;
+import com.intellij.analysis.AnalysisScope;
+import com.intellij.analysis.AnalysisScopeBundle;
+import com.intellij.analysis.PerformAnalysisInBackgroundOption;
+import com.intellij.codeInsight.hint.HintUtil;
+import com.intellij.ide.CommonActionsManager;
+import com.intellij.ide.ExporterToTextFile;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.*;
-import com.intellij.openapi.components.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.extensions.*;
-import com.intellij.openapi.help.*;
-import com.intellij.openapi.options.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.roots.*;
-import com.intellij.openapi.ui.*;
-import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.util.text.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.openapi.wm.*;
+import com.intellij.openapi.actionSystem.ex.ComboBoxAction;
+import com.intellij.openapi.components.PathMacroManager;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.extensions.Extensions;
+import com.intellij.openapi.help.HelpManager;
+import com.intellij.openapi.options.ShowSettingsUtil;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ProjectFileIndex;
+import com.intellij.openapi.roots.ProjectRootManager;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.ui.Splitter;
+import com.intellij.openapi.ui.popup.JBPopupFactory;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.util.JDOMUtil;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.wm.StatusBar;
 import com.intellij.packageDependencies.*;
-import com.intellij.packageDependencies.actions.*;
-import com.intellij.psi.*;
-import com.intellij.psi.search.scope.packageSet.*;
+import com.intellij.packageDependencies.actions.AnalyzeDependenciesHandler;
+import com.intellij.packageDependencies.actions.BackwardDependenciesHandler;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import com.intellij.psi.search.scope.packageSet.NamedScope;
+import com.intellij.psi.search.scope.packageSet.PackageSet;
 import com.intellij.ui.*;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.treeStructure.Tree;
-import com.intellij.usageView.*;
+import com.intellij.usageView.UsageViewBundle;
 import com.intellij.util.*;
-import com.intellij.util.ui.*;
-import com.intellij.util.ui.tree.*;
-import org.jdom.*;
-import org.jetbrains.annotations.*;
+import com.intellij.util.ui.UIUtil;
+import com.intellij.util.ui.tree.TreeUtil;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.tree.*;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreePath;
 import java.awt.*;
 import java.util.*;
 import java.util.List;

diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java
index c02a4763989bccb480429bac2e4ff77e34d00ae6..05dde317de71026f58e8fa066662cda4fabc7490 100644 (file)
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java
@@ -15,25 +15,33 @@
  */
 package com.intellij.profile.codeInspection;
 
-import com.intellij.codeInsight.daemon.impl.*;
-import com.intellij.codeInsight.daemon.impl.analysis.*;
-import com.intellij.codeInspection.*;
-import com.intellij.codeInspection.ex.*;
-import com.intellij.openapi.application.*;
+import com.intellij.codeInsight.daemon.impl.SeverityRegistrar;
+import com.intellij.codeInsight.daemon.impl.analysis.HighlightingSettingsPerFile;
+import com.intellij.codeInspection.InspectionProfile;
+import com.intellij.codeInspection.ex.InspectionProfileImpl;
+import com.intellij.codeInspection.ex.InspectionProfileWrapper;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.startup.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
-import com.intellij.openapi.wm.impl.status.*;
-import com.intellij.packageDependencies.*;
-import com.intellij.profile.*;
-import com.intellij.psi.*;
-import org.jdom.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.startup.StartupManager;
+import com.intellij.openapi.util.InvalidDataException;
+import com.intellij.openapi.util.WriteExternalException;
+import com.intellij.openapi.wm.WindowManager;
+import com.intellij.openapi.wm.ex.StatusBarEx;
+import com.intellij.openapi.wm.impl.status.TogglePopupHintsPanel;
+import com.intellij.packageDependencies.DependencyValidationManager;
+import com.intellij.profile.DefaultProjectProfileManager;
+import com.intellij.profile.Profile;
+import com.intellij.psi.PsiElement;
+import org.jdom.Element;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * User: anna

diff --git a/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java b/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java
new file mode 100644 (file)
index 0000000..fba1794
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2000-2010 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.formatter.common;
+
+import com.intellij.formatting.*;
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.Language;
+import com.intellij.lang.LanguageFormatting;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.Ref;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiLanguageInjectionHost;
+import com.intellij.psi.codeStyle.CodeStyleSettings;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * @author nik
+ */
+public abstract class InjectedLanguageBlockBuilder {
+  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.formatter.xml.XmlInjectedLanguageBlockBuilder");
+
+  public Block createInjectedBlock(ASTNode node, Block originalBlock, Indent indent, int offset, TextRange range) {
+    return new InjectedLanguageBlockWrapper(originalBlock, offset, range, indent);
+  }
+
+  public abstract CodeStyleSettings getSettings();
+
+  public abstract boolean canProcessFragment(String text, ASTNode injectionHost);
+
+  public abstract Block createBlockBeforeInjection(ASTNode node, Wrap wrap, Alignment alignment, Indent indent, TextRange range);
+
+  public abstract Block createBlockAfterInjection(ASTNode node, Wrap wrap, Alignment alignment, Indent indent, TextRange range);
+
+  public boolean addInjectedBlocks(List<Block> result, final ASTNode injectionHost, Wrap wrap, Alignment alignment, Indent indent) {
+    final PsiFile[] injectedFile = new PsiFile[1];
+    final Ref<TextRange> injectedRangeInsideHost = new Ref<TextRange>();
+    final Ref<Integer> prefixLength = new Ref<Integer>();
+    final Ref<Integer> suffixLength = new Ref<Integer>();
+
+    final PsiLanguageInjectionHost.InjectedPsiVisitor injectedPsiVisitor = new PsiLanguageInjectionHost.InjectedPsiVisitor() {
+      public void visit(@NotNull final PsiFile injectedPsi, @NotNull final List<PsiLanguageInjectionHost.Shred> places) {
+        if (places.size() == 1) {
+          final PsiLanguageInjectionHost.Shred shred = places.get(0);
+          final TextRange textRange = shred.getRangeInsideHost();
+          String childText;
+
+          if ((injectionHost.getTextLength() == textRange.getEndOffset() && textRange.getStartOffset() == 0) ||
+              (canProcessFragment((childText = injectionHost.getText()).substring(0, textRange.getStartOffset()), injectionHost) &&
+               canProcessFragment(childText.substring(textRange.getEndOffset()), injectionHost))) {
+            injectedFile[0] = injectedPsi;
+            injectedRangeInsideHost.set(textRange);
+            prefixLength.set(shred.prefix != null ? shred.prefix.length() : 0);
+            suffixLength.set(shred.suffix != null ? shred.suffix.length() : 0);
+          }
+        }
+      }
+    };
+    ((PsiLanguageInjectionHost)injectionHost.getPsi()).processInjectedPsi(injectedPsiVisitor);
+
+    if  (injectedFile[0] != null) {
+      final Language childLanguage = injectedFile[0].getLanguage();
+      final FormattingModelBuilder builder = LanguageFormatting.INSTANCE.forContext(childLanguage, injectionHost.getPsi());
+
+      if (builder != null) {
+        final int startOffset = injectedRangeInsideHost.get().getStartOffset();
+        final int endOffset = injectedRangeInsideHost.get().getEndOffset();
+        TextRange range = injectionHost.getTextRange();
+
+        int childOffset = range.getStartOffset();
+        if (startOffset != 0) {
+          final ASTNode leaf = injectionHost.findLeafElementAt(startOffset - 1);
+          result.add(createBlockBeforeInjection(leaf, wrap, alignment, indent, new TextRange(childOffset, childOffset + startOffset)));
+        }
+
+        addInjectedLanguageBlockWrapper(result, injectedFile[0].getNode(), indent, childOffset + startOffset,
+                                        new TextRange(prefixLength.get(), injectedFile[0].getTextLength() - suffixLength.get()));
+
+        if (endOffset != injectionHost.getTextLength()) {
+          final ASTNode leaf = injectionHost.findLeafElementAt(endOffset);
+          result.add(createBlockAfterInjection(leaf, wrap, alignment, indent, new TextRange(childOffset + endOffset, range.getEndOffset())));
+        }
+        return true;
+      }
+    }
+    return false;
+  }
+
+  public void addInjectedLanguageBlockWrapper(final List<Block> result, final ASTNode injectedNode,
+                                              final Indent indent, int offset, @Nullable TextRange range) {
+    final PsiElement childPsi = injectedNode.getPsi();
+    final Language childLanguage = childPsi.getLanguage();
+    final FormattingModelBuilder builder = LanguageFormatting.INSTANCE.forContext(childLanguage, childPsi);
+    LOG.assertTrue(builder != null);
+    final FormattingModel childModel = builder.createModel(childPsi, getSettings());
+    Block original = childModel.getRootBlock();
+
+    if ((original.isLeaf() && injectedNode.getText().trim().length() > 0) || original.getSubBlocks().size() != 0) {
+      result.add(createInjectedBlock(injectedNode, original, indent, offset, range));
+    }
+  }
+}

diff --git a/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockWrapper.java b/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockWrapper.java
new file mode 100644 (file)
index 0000000..5664005
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockWrapper.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2000-2009 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.formatter.common;
+
+import com.intellij.formatting.*;
+import com.intellij.openapi.util.TextRange;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class InjectedLanguageBlockWrapper implements Block {
+  private final Block myOriginal;
+  private final int myOffset;
+  private final TextRange myRange;
+  @Nullable private final Indent myIndent;
+  private List<Block> myBlocks;
+
+  /**
+   *  main code                  prefix    injected code        suffix
+   *     |                         |            |                 |
+   *     |                       xxx!!!!!!!!!!!!!!!!!!!!!!!!!!!!xxx
+   * ...............................!!!!!!!!!!!!!!!!!!!!!!!!!!!!....................
+   *                                ^
+   *                              offset
+   *
+   * @param original block inside injected code
+   * @param offset start offset of injected code inside the main document
+   * @param range range of code inside injected document which is really placed in the main document
+   * @param indent
+   */
+  public InjectedLanguageBlockWrapper(final @NotNull Block original, final int offset, @Nullable TextRange range, @Nullable Indent indent) {
+    myOriginal = original;
+    myOffset = offset;
+    myRange = range;
+    myIndent = indent;
+  }
+
+  public Indent getIndent() {
+    return myIndent != null ? myIndent : myOriginal.getIndent();
+  }
+
+  @Nullable
+  public Alignment getAlignment() {
+    return myOriginal.getAlignment();
+  }
+
+  @NotNull
+  public TextRange getTextRange() {
+    TextRange range = myOriginal.getTextRange();
+    if (myRange != null) {
+      range = range.intersection(myRange);
+    }
+
+    int start = myOffset + range.getStartOffset() - (myRange != null ? myRange.getStartOffset() : 0);
+    return TextRange.from(start, range.getLength());
+  }
+
+  @NotNull
+  public List<Block> getSubBlocks() {
+    if (myBlocks == null) {
+      myBlocks = buildBlocks();
+    }
+    return myBlocks;
+  }
+
+  private List<Block> buildBlocks() {
+    final List<Block> list = myOriginal.getSubBlocks();
+    if (list.size() == 0) return AbstractBlock.EMPTY;
+    if (myOffset == 0 && myRange == null) return list;
+
+    final ArrayList<Block> result = new ArrayList<Block>(list.size());
+    if (myRange == null) {
+      for (Block block : list) {
+        result.add(new InjectedLanguageBlockWrapper(block, myOffset, myRange, null));
+      }
+    }
+    else {
+      collectBlocksIntersectingRange(list, result, myRange);
+    }
+    return result;
+  }
+
+  private void collectBlocksIntersectingRange(final List<Block> list, final List<Block> result, final @NotNull TextRange range) {
+    for (Block block : list) {
+      final TextRange textRange = block.getTextRange();
+      if (range.contains(textRange)) {
+        result.add(new InjectedLanguageBlockWrapper(block, myOffset, range, null));
+      }
+      else if (textRange.intersectsStrict(range)) {
+        collectBlocksIntersectingRange(block.getSubBlocks(), result, range);
+      }
+    }
+  }
+
+  @Nullable
+  public Wrap getWrap() {
+    return myOriginal.getWrap();
+  }
+
+  @Nullable public Spacing getSpacing(Block child1, Block child2) {
+    if (child1 instanceof InjectedLanguageBlockWrapper) child1 = ((InjectedLanguageBlockWrapper)child1).myOriginal;
+    if (child2 instanceof InjectedLanguageBlockWrapper) child2 = ((InjectedLanguageBlockWrapper)child2).myOriginal;
+    return myOriginal.getSpacing(child1,  child2);
+  }
+
+  @NotNull
+  public ChildAttributes getChildAttributes(final int newChildIndex) {
+    return myOriginal.getChildAttributes(newChildIndex);
+  }
+
+  public boolean isIncomplete() {
+    return myOriginal.isIncomplete();
+  }
+
+  public boolean isLeaf() {
+    return myOriginal.isLeaf();
+  }
+}
+class A {
+  private List<Integer> myResult;
+  {
+    m(10, myResult);
+  }
+
+  private void m(int i, List<Integer> result) {
+    if (i > 0) {
+      m(i - 1, result);
+    }
+    result.add(i);
+  }
+}
\ No newline at end of file

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java
index 155c9951d2c8e17823a1dc5959cda07a837d850e..5a99c90b50ea5294c2d6ad010d70be341aaa9ef1 100644 (file)
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java
@@ -43,6 +43,7 @@ import com.intellij.psi.impl.source.PostprocessReformattingAspect;
 import com.intellij.psi.impl.source.PsiFileImpl;
 import com.intellij.psi.impl.source.SourceTreeToPsiMap;
 import com.intellij.psi.impl.source.tree.*;
+import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.util.PsiUtilBase;
 import com.intellij.util.CharTable;
 import com.intellij.util.IncorrectOperationException;
@@ -247,7 +248,7 @@ public class CodeStyleManagerImpl extends CodeStyleManager {
     if (element == null && offset != file.getTextLength()) {
       return offset;
     }
-    if (element instanceof PsiComment && insideElement(element, offset)) {
+    if (element instanceof PsiComment && insideElement(element, offset) && !containsInjections(element)) {
       return CharArrayUtil.shiftForward(file.getViewProvider().getContents(), offset, " \t");
     }
     final FormattingModelBuilder builder = LanguageFormatting.INSTANCE.forContext(file);
@@ -274,6 +275,10 @@ public class CodeStyleManagerImpl extends CodeStyleManager {
     }
   }
 
+  private static boolean containsInjections(PsiElement element) {
+    return element instanceof PsiLanguageInjectionHost && InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)element);
+  }
+
   @Nullable
   public static PsiElement findElementInTreeWithFormatterEnabled(final PsiFile file, final int offset) {
     final PsiElement bottomost = file.findElementAt(offset);

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java
index 7ac99f8257f96825f68d40cdc3e90eef12466f9f..76472f3e5eb98fc45faa1e0dd5f743bfb9f56521 100644 (file)
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java
@@ -403,4 +403,14 @@ public class InjectedLanguageUtil {
 
     return isStartOverflows && isEndOverflows;
   }
+
+  public static boolean hasInjections(@NotNull PsiLanguageInjectionHost host) {
+    final Ref<Boolean> result = Ref.create(false);
+    host.processInjectedPsi(new PsiLanguageInjectionHost.InjectedPsiVisitor() {
+      public void visit(@NotNull final PsiFile injectedPsi, @NotNull final List<PsiLanguageInjectionHost.Shred> places) {
+        result.set(true);
+      }
+    });
+    return result.get().booleanValue();
+  }
 }

diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java
index bd9f6ea921eb0584a18a1a0bf00efbc4bde97c42..ae554b56c0530a912ea6384e5abc91ab6393d1ef 100644 (file)
--- a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java
@@ -36,7 +36,6 @@ import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.ui.IdeBorderFactory;
-import com.intellij.ui.RecentsManager;
 import com.intellij.ui.TextFieldWithStoredHistory;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;

diff --git a/platform/platform-api/src/com/intellij/execution/process/ProcessTerminatedListener.java b/platform/platform-api/src/com/intellij/execution/process/ProcessTerminatedListener.java
index 31cf488773e370255b65fca8d41b51e024465100..06c9c4bfa92adc6e17c093b9e6da9b08c8050967 100644 (file)
--- a/platform/platform-api/src/com/intellij/execution/process/ProcessTerminatedListener.java
+++ b/platform/platform-api/src/com/intellij/execution/process/ProcessTerminatedListener.java
@@ -15,12 +15,12 @@
  */
 package com.intellij.execution.process;
 
-import com.intellij.ide.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.wm.*;
-import org.jetbrains.annotations.*;
+import com.intellij.ide.IdeBundle;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.wm.StatusBar;
+import org.jetbrains.annotations.NonNls;
 
 /**
  * @author dyoma

diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java
index 897acdb0ba9d12e62b4c444793353ab65c89a15a..b0ab02fd1bfba796bf539b2ad3aa6d77f859f37c 100644 (file)
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Progressive;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.util.AsyncResult;
-import com.intellij.openapi.util.registry.Registry;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.update.MergingUpdateQueue;

diff --git a/platform/platform-api/src/com/intellij/notification/Notification.java b/platform/platform-api/src/com/intellij/notification/Notification.java
index 1e0b655a107c52b65eb18339e541b1b547aac335..f8e4827da41a853424d1dbccdce692efdfc223fb 100644 (file)
--- a/platform/platform-api/src/com/intellij/notification/Notification.java
+++ b/platform/platform-api/src/com/intellij/notification/Notification.java
@@ -15,12 +15,13 @@
  */
 package com.intellij.notification;
 
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.ui.popup.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.ui.popup.Balloon;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.lang.ref.*;
+import java.lang.ref.WeakReference;
 
 /**
  * @author spleaner

diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java b/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java
index 65a83aad84d28c7147e80720f42ba555f464f233..4d73cd8938142aab9073a7713c241d2855c09c31 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java
+++ b/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java
@@ -680,27 +680,46 @@ public class VfsUtil {
 
   public static void processFilesRecursively(@NotNull VirtualFile root, @NotNull Processor<VirtualFile> processor,
                                              @NotNull Convertor<VirtualFile, Boolean> directoryFilter) {
-    final LinkedList<VirtualFile> queue = new LinkedList<VirtualFile>();
-    queue.add(root);
-    while (!queue.isEmpty()) {
-      final VirtualFile file = queue.removeFirst();
-      if (!processor.process(file)) return;
-      if (file.isDirectory() && directoryFilter.convert(file)) {
-        queue.addAll(Arrays.asList(file.getChildren()));
-      }
+    if (!processor.process(root)) return;
+
+    if (root.isDirectory() && directoryFilter.convert(root)) {
+      final LinkedList<VirtualFile[]> queue = new LinkedList<VirtualFile[]>();
+
+      queue.add(root.getChildren());
+
+      do {
+        final VirtualFile[] files = queue.removeFirst();
+
+        for (VirtualFile file : files) {
+          if (!processor.process(file)) return;
+          if (file.isDirectory() && directoryFilter.convert(file)) {
+            queue.add(file.getChildren());
+          }
+        }
+      } while (!queue.isEmpty());
     }
   }
 
   public static boolean processFilesRecursively(@NotNull VirtualFile root, @NotNull Processor<VirtualFile> processor) {
-    final LinkedList<VirtualFile> queue = new LinkedList<VirtualFile>();
-    queue.add(root);
-    while (!queue.isEmpty()) {
-      final VirtualFile file = queue.removeFirst();
-      if (!processor.process(file)) return false;
-      if (file.isDirectory()) {
-        queue.addAll(Arrays.asList(file.getChildren()));
-      }
+    if (!processor.process(root)) return false;
+
+    if (root.isDirectory()) {
+      final LinkedList<VirtualFile[]> queue = new LinkedList<VirtualFile[]>();
+
+      queue.add(root.getChildren());
+
+      do {
+        final VirtualFile[] files = queue.removeFirst();
+
+        for (VirtualFile file : files) {
+          if (!processor.process(file)) return false;
+          if (file.isDirectory()) {
+            queue.add(file.getChildren());
+          }
+        }
+      } while (!queue.isEmpty());
     }
+
     return true;
   }
 

diff --git a/platform/platform-api/src/com/intellij/openapi/wm/StatusBar.java b/platform/platform-api/src/com/intellij/openapi/wm/StatusBar.java
index 8ac121f0642d0131134f68ceafda76a8c57586d0..9037bf52a414408c9b328f7904580f672a65d29a 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/wm/StatusBar.java
+++ b/platform/platform-api/src/com/intellij/openapi/wm/StatusBar.java
@@ -15,12 +15,14 @@
  */
 package com.intellij.openapi.wm;
 
-import com.intellij.openapi.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.startup.*;
-import com.intellij.util.messages.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.startup.StartupManager;
+import com.intellij.util.messages.MessageBus;
+import com.intellij.util.messages.Topic;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/platform/platform-api/src/com/intellij/openapi/wm/StatusBarCustomComponentFactory.java b/platform/platform-api/src/com/intellij/openapi/wm/StatusBarCustomComponentFactory.java
index d61be79530268dfddeec84838d7b673cbfa954d4..511fed53674ae7ae8d6f0fedf435f10c2b310a6c 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/wm/StatusBarCustomComponentFactory.java
+++ b/platform/platform-api/src/com/intellij/openapi/wm/StatusBarCustomComponentFactory.java
@@ -15,11 +15,11 @@
  */
 package com.intellij.openapi.wm;
 
-import com.intellij.openapi.extensions.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.extensions.ExtensionPointName;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import java.util.*;
+import java.util.EventListener;
 
 /**
  * @deprecated use StatusBarWidget instead

diff --git a/platform/platform-api/src/com/intellij/openapi/wm/StatusBarInfo.java b/platform/platform-api/src/com/intellij/openapi/wm/StatusBarInfo.java
index 61285dc62b58f3f85d9f489f9d006c21478218a3..78d2ecc3cab93af6c2040ad1d041b283d9c175dd 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/wm/StatusBarInfo.java
+++ b/platform/platform-api/src/com/intellij/openapi/wm/StatusBarInfo.java
@@ -15,7 +15,7 @@
  */
 package com.intellij.openapi.wm;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * User: spLeaner

diff --git a/platform/platform-api/src/com/intellij/openapi/wm/StatusBarWidget.java b/platform/platform-api/src/com/intellij/openapi/wm/StatusBarWidget.java
index 1860eb2c07b020c3e3096d598f5c8af18f40a7f8..8e2a987192c524612e123f010be47fc1f4b1c448 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/wm/StatusBarWidget.java
+++ b/platform/platform-api/src/com/intellij/openapi/wm/StatusBarWidget.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.Consumer;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -88,7 +89,7 @@ public interface StatusBarWidget extends Disposable {
     private static final Color PIXEL = LEFT1_FROM_INACTIVE;
     private static final Color LEFT1_TO_INACTIVE = new Color(180, 180, 180);
 
-    private static final Color SEPARATOR_COLOR = new Color(215, 215, 215);
+    private static final Color SEPARATOR_COLOR = UIUtil.getPanelBackgound().darker().darker().darker();
 
     public void paintBorder(final Component c, final Graphics g, final int x, final int y, final int width, final int height) {
       final Graphics2D g2 = (Graphics2D)g.create();

diff --git a/platform/platform-api/src/com/intellij/ui/ListScrollingUtil.java b/platform/platform-api/src/com/intellij/ui/ListScrollingUtil.java
index 205369d8a8b11b91b72660dba812e5e02bf8870b..9694bcc20b5fd12d53794fe1410cc9f0abfcbf0c 100644 (file)
--- a/platform/platform-api/src/com/intellij/ui/ListScrollingUtil.java
+++ b/platform/platform-api/src/com/intellij/ui/ListScrollingUtil.java
@@ -27,8 +27,8 @@ import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
 
 public class ListScrollingUtil {
   private static final Logger LOG = Logger.getInstance("#com.intellij.ui.ListScrollingUtil");

diff --git a/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java b/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java
index 9eb23857245028213c9c6e6a4e8f5215c0274877..112ce102b8a70aef9ff0f1b30baeae94848601ee 100644 (file)
--- a/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java
+++ b/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java
@@ -15,18 +15,22 @@
  */
 package com.intellij.ui.components.labels;
 
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.ui.*;
-import com.intellij.util.ui.*;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.ui.UI;
+import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
-import javax.swing.border.*;
+import javax.swing.border.Border;
 import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author kir

diff --git a/platform/platform-api/src/com/intellij/util/ui/AnimatedIcon.java b/platform/platform-api/src/com/intellij/util/ui/AnimatedIcon.java
index 73db90d39e97d817ae68bfc54c8e422aa697a2c0..833fde1174ba3b15145e01890eb1a20e82420eca 100644 (file)
--- a/platform/platform-api/src/com/intellij/util/ui/AnimatedIcon.java
+++ b/platform/platform-api/src/com/intellij/util/ui/AnimatedIcon.java
@@ -16,7 +16,7 @@
 
 package com.intellij.util.ui;
 
-import com.intellij.openapi.*;
+import com.intellij.openapi.Disposable;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/platform/platform-impl/src/com/intellij/application/options/PathMacrosCollector.java b/platform/platform-impl/src/com/intellij/application/options/PathMacrosCollector.java
index e48d1a70d67d220e13e510f9550bfab6b42efa33..cef04a6b2f3db138273877066fb1cfe4d36ed355 100644 (file)
--- a/platform/platform-impl/src/com/intellij/application/options/PathMacrosCollector.java
+++ b/platform/platform-impl/src/com/intellij/application/options/PathMacrosCollector.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.application.PathMacros;
 import com.intellij.openapi.components.PathMacroMap;
 import com.intellij.util.NotNullFunction;
 import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
@@ -45,24 +46,24 @@ public class PathMacrosCollector extends PathMacroMap {
     myMatcher = MACRO_PATTERN.matcher("");
   }
 
-  public static Set<String> getMacroNames(Element root) {
-    return getMacroNames(root, null);
-  }
-
   public static Set<String> getMacroNames(Element root, @Nullable final NotNullFunction<Object, Boolean> filter) {
     return getMacroNames(root, filter, null);
   }
 
-  public static Set<String> getMacroNames(Element root, @Nullable final NotNullFunction<Object, Boolean> filter, @Nullable final NotNullFunction<Object, Boolean> recursiveFilter) {
+  public static Set<String> getMacroNames(Element root, @Nullable final NotNullFunction<Object, Boolean> filter, @Nullable final NotNullFunction<Object, Boolean> recursiveFilter, @NotNull final PathMacros pathMacros) {
     final PathMacrosCollector collector = new PathMacrosCollector();
     collector.substitute(root, true, false, filter, recursiveFilter);
     final HashSet<String> result = new HashSet<String>(collector.myMacroMap.keySet());
     result.removeAll(ourSystemMacroNames);
     result.removeAll(PathMacrosImpl.getToolMacroNames());
-    result.removeAll(PathMacros.getInstance().getIgnoredMacroNames());
+    result.removeAll(pathMacros.getIgnoredMacroNames());
     return result;
   }
 
+  public static Set<String> getMacroNames(Element root, @Nullable final NotNullFunction<Object, Boolean> filter, @Nullable final NotNullFunction<Object, Boolean> recursiveFilter) {
+    return getMacroNames(root, filter, recursiveFilter, PathMacros.getInstance());
+  }
+
   @Override
   public String substituteRecursively(String text, boolean caseSensitive) {
     if (text == null || text.length() == 0) return text;
@@ -84,7 +85,7 @@ public class PathMacrosCollector extends PathMacroMap {
       protocol = FILE_PROTOCOL;
     } else if (text.length() > 6 && text.charAt(0) == 'j') {
       protocol = JAR_PROTOCOL;
-    } else if (!('$' == text.charAt(0))) {
+    } else if ('$' != text.charAt(0)) {
       return text;
     }
 

diff --git a/platform/platform-impl/src/com/intellij/diagnostic/IdeMessagePanel.java b/platform/platform-impl/src/com/intellij/diagnostic/IdeMessagePanel.java
index 70d7d437ac9f676f6b8ddcdcb56c68362b3ce649..cdbe815d8a61121a28430f9234256928e7548eec 100644 (file)
--- a/platform/platform-impl/src/com/intellij/diagnostic/IdeMessagePanel.java
+++ b/platform/platform-impl/src/com/intellij/diagnostic/IdeMessagePanel.java
@@ -15,18 +15,22 @@
  */
 package com.intellij.diagnostic;
 
-import com.intellij.concurrency.*;
-import com.intellij.ide.util.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.ui.*;
-import com.intellij.ui.popup.*;
-import org.jetbrains.annotations.*;
+import com.intellij.concurrency.JobScheduler;
+import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.wm.CustomStatusBarWidget;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.ui.LightColors;
+import com.intellij.ui.popup.NotificationPopup;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.util.concurrent.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.concurrent.TimeUnit;
 
 public class IdeMessagePanel extends JPanel implements MessagePoolListener, CustomStatusBarWidget {
   private final IconPane myIdeFatal;

diff --git a/platform/platform-impl/src/com/intellij/ide/util/GotoLineNumberDialog.java b/platform/platform-impl/src/com/intellij/ide/util/GotoLineNumberDialog.java
index d0a2f8b9b8c1693b570fe354b16525ee3c5b4f8c..4025ff4bc4afed9f5bec18b2aa058c963ab1754f 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ide/util/GotoLineNumberDialog.java
+++ b/platform/platform-impl/src/com/intellij/ide/util/GotoLineNumberDialog.java
@@ -15,11 +15,13 @@
  */
 package com.intellij.ide.util;
 
-import com.intellij.ide.*;
-import com.intellij.openapi.application.ex.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.*;
+import com.intellij.ide.IdeBundle;
+import com.intellij.openapi.application.ex.ApplicationManagerEx;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.LogicalPosition;
+import com.intellij.openapi.editor.ScrollType;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.DialogWrapper;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java b/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java
index dde5ca627468ebea5ae53c45731af139b5626d0d..3760b008a4396352baa035263a85cc237fb3b41a 100644 (file)
--- a/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java
+++ b/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java
@@ -15,21 +15,24 @@
  */
 package com.intellij.notification.impl;
 
-import com.intellij.ide.*;
-import com.intellij.notification.*;
-import com.intellij.notification.impl.ui.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.ide.DataManager;
+import com.intellij.notification.Notification;
+import com.intellij.notification.NotificationType;
+import com.intellij.notification.impl.ui.NotificationsListPanel;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.popup.JBPopup;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.StatusBarWidget;
+import com.intellij.util.Consumer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.lang.ref.*;
+import java.awt.event.MouseEvent;
+import java.lang.ref.WeakReference;
 
 /**
  * @author spleaner

diff --git a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
index 1cdbd388400cd5dab2b7cf0cd28397211bdfdff3..15506dab5db8708240d4c13528d614d5b3f47fdd 100644 (file)
--- a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
@@ -16,24 +16,29 @@
 package com.intellij.notification.impl;
 
 import com.intellij.notification.*;
-import com.intellij.notification.impl.ui.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.components.*;
-import com.intellij.openapi.project.*;
+import com.intellij.notification.impl.ui.NotificationsUtil;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.components.ApplicationComponent;
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.impl.*;
-import com.intellij.ui.*;
-import com.intellij.ui.components.panels.*;
-import com.intellij.util.*;
-import com.intellij.util.ui.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.wm.WindowManager;
+import com.intellij.openapi.wm.impl.IdeFrameImpl;
+import com.intellij.ui.BalloonLayout;
+import com.intellij.ui.SystemNotifications;
+import com.intellij.ui.components.panels.NonOpaquePanel;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.PairFunction;
+import com.intellij.util.ui.UIUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.HyperlinkListener;
 import java.awt.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 /**

diff --git a/platform/platform-impl/src/com/intellij/notification/impl/ProjectNotificationsComponent.java b/platform/platform-impl/src/com/intellij/notification/impl/ProjectNotificationsComponent.java
index 2920f3cdb7f00487307fd561c0e24666137fd1b1..517b458485e4f6a61914ff9ac8c94067207355c8 100644 (file)
--- a/platform/platform-impl/src/com/intellij/notification/impl/ProjectNotificationsComponent.java
+++ b/platform/platform-impl/src/com/intellij/notification/impl/ProjectNotificationsComponent.java
@@ -15,16 +15,19 @@
  */
 package com.intellij.notification.impl;
 
-import com.intellij.notification.*;
-import com.intellij.openapi.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.components.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.notification.Notification;
+import com.intellij.notification.NotificationDisplayType;
+import com.intellij.notification.Notifications;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.components.ProjectComponent;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.popup.Balloon;
+import com.intellij.openapi.util.Disposer;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.Collection;
 
 /**
  * @author spleaner

diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/DocumentReferenceManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/DocumentReferenceManagerImpl.java
index 2fe3bdf3d4fa9aadb58dc90fb78e2249e9e73bd5..a5ac724fa76d359adf4d2dd80d7dee9c4cd6c795 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/DocumentReferenceManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/DocumentReferenceManagerImpl.java
@@ -22,7 +22,10 @@ import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.vfs.*;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.VirtualFileAdapter;
+import com.intellij.openapi.vfs.VirtualFileEvent;
+import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
 import com.intellij.util.containers.WeakValueHashMap;
 import com.intellij.util.io.fs.FilePath;

diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java
index 4bc0f9240a657c1a83529c2162e66669e3558ed2..351e8c9e3d5cc76ea2a1b4523abe53d9dc9c8221 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java
@@ -240,6 +240,9 @@ public class StorageUtil {
             return false; // do not proceed environment variables from run configurations
           }
 
+          if ("MESSAGE".equals(parentName) && "value".equals(attribute.getName())) return false;
+          if ("option".equals(parentName) && "LAST_COMMIT_MESSAGE".equals(parent.getAttributeValue("name"))) return false;
+
           // do not proceed macros in searchConfigurations (structural search)
           if ("replaceConfiguration".equals(parentName) || "searchConfiguration".equals(parentName)) return false;
         }

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
index ae9c89fc0cef3a9ed3ff96c20f8c67e4368e3dd8..eadf60dd387a9443ee64472603ae2a7b9370b4fa 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
@@ -15,48 +15,68 @@
  */
 package com.intellij.openapi.fileEditor.impl;
 
-import com.intellij.*;
-import com.intellij.ide.*;
-import com.intellij.ide.plugins.*;
-import com.intellij.ide.ui.*;
-import com.intellij.injected.editor.*;
-import com.intellij.openapi.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.application.ex.*;
-import com.intellij.openapi.application.impl.*;
+import com.intellij.AppTopics;
+import com.intellij.ProjectTopics;
+import com.intellij.ide.IdeBundle;
+import com.intellij.ide.plugins.PluginManager;
+import com.intellij.ide.ui.UISettings;
+import com.intellij.ide.ui.UISettingsListener;
+import com.intellij.injected.editor.VirtualFileWindow;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
+import com.intellij.openapi.application.ex.ApplicationManagerEx;
+import com.intellij.openapi.application.impl.LaterInvocator;
 import com.intellij.openapi.command.CommandProcessor;
-import com.intellij.openapi.components.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.editor.ex.*;
-import com.intellij.openapi.extensions.*;
+import com.intellij.openapi.components.ProjectComponent;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.ex.EditorEx;
+import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.fileEditor.FileEditorProvider;
-import com.intellij.openapi.fileEditor.ex.*;
-import com.intellij.openapi.fileEditor.impl.text.*;
-import com.intellij.openapi.fileTypes.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.project.impl.*;
-import com.intellij.openapi.roots.*;
-import com.intellij.openapi.startup.*;
+import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
+import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager;
+import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory;
+import com.intellij.openapi.fileEditor.impl.text.TextEditorImpl;
+import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
+import com.intellij.openapi.fileTypes.FileTypeEvent;
+import com.intellij.openapi.fileTypes.FileTypeListener;
+import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.DumbAwareRunnable;
+import com.intellij.openapi.project.DumbService;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.impl.ProjectImpl;
+import com.intellij.openapi.roots.ModuleRootEvent;
+import com.intellij.openapi.roots.ModuleRootListener;
+import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.util.*;
-import com.intellij.openapi.vcs.*;
+import com.intellij.openapi.vcs.FileStatus;
+import com.intellij.openapi.vcs.FileStatusListener;
+import com.intellij.openapi.vcs.FileStatusManager;
 import com.intellij.openapi.vfs.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
-import com.intellij.openapi.wm.impl.*;
-import com.intellij.util.containers.*;
-import com.intellij.util.messages.*;
-import com.intellij.util.messages.impl.*;
-import com.intellij.util.ui.update.*;
-import org.jdom.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.openapi.wm.WindowManager;
+import com.intellij.openapi.wm.ex.StatusBarEx;
+import com.intellij.openapi.wm.ex.WindowManagerEx;
+import com.intellij.openapi.wm.impl.FrameTitleBuilder;
+import com.intellij.openapi.wm.impl.IdeFrameImpl;
+import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.messages.MessageBusConnection;
+import com.intellij.util.messages.impl.MessageListenerList;
+import com.intellij.util.ui.update.MergingUpdateQueue;
+import com.intellij.util.ui.update.Update;
+import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.beans.*;
-import java.io.*;
-import java.util.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 /**

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
index 24a42e3b6fd40cfa7fb5a5add51609d99ce13e02..31c6b173e532c63bbb86194484847f7ddf65f18a 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
@@ -15,32 +15,44 @@
  */
 package com.intellij.openapi.fileEditor.impl.text;
 
-import com.intellij.*;
-import com.intellij.ide.ui.customization.*;
+import com.intellij.AppTopics;
+import com.intellij.ide.ui.customization.CustomActionsSchema;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.editor.colors.*;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorFactory;
+import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.event.*;
-import com.intellij.openapi.editor.ex.*;
-import com.intellij.openapi.editor.highlighter.*;
-import com.intellij.openapi.editor.impl.*;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.fileEditor.impl.*;
-import com.intellij.openapi.fileTypes.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
-import com.intellij.util.*;
-import com.intellij.util.messages.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.editor.ex.EditorEx;
+import com.intellij.openapi.editor.ex.EditorMarkupModel;
+import com.intellij.openapi.editor.highlighter.EditorHighlighter;
+import com.intellij.openapi.editor.highlighter.EditorHighlighterFactory;
+import com.intellij.openapi.editor.impl.EditorImpl;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.fileEditor.FileEditor;
+import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl;
+import com.intellij.openapi.fileTypes.FileTypeEvent;
+import com.intellij.openapi.fileTypes.FileTypeListener;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.VirtualFileAdapter;
+import com.intellij.openapi.vfs.VirtualFileEvent;
+import com.intellij.openapi.vfs.VirtualFilePropertyEvent;
+import com.intellij.openapi.wm.WindowManager;
+import com.intellij.openapi.wm.ex.StatusBarEx;
+import com.intellij.util.EditorPopupHandler;
+import com.intellij.util.messages.MessageBusConnection;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 /**
  * @author Anton Katilin

diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
index 7f5af334afcb1d51435fa533882ced46cff95836..069a00250519519027ecb3030e7a9b4adaad9569 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
@@ -15,34 +15,51 @@
  */
 package com.intellij.openapi.keymap.impl;
 
-import com.intellij.ide.*;
-import com.intellij.ide.impl.*;
-import com.intellij.openapi.*;
+import com.intellij.ide.DataManager;
+import com.intellij.ide.IdeEventQueue;
+import com.intellij.ide.impl.DataManagerImpl;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.*;
-import com.intellij.openapi.actionSystem.impl.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.keymap.*;
-import com.intellij.openapi.keymap.impl.keyGestures.*;
-import com.intellij.openapi.keymap.impl.ui.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.util.registry.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
-import com.intellij.openapi.wm.impl.*;
-import com.intellij.ui.popup.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
+import com.intellij.openapi.actionSystem.ex.ActionUtil;
+import com.intellij.openapi.actionSystem.impl.PresentationFactory;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
+import com.intellij.openapi.keymap.KeyMapBundle;
+import com.intellij.openapi.keymap.Keymap;
+import com.intellij.openapi.keymap.KeymapManager;
+import com.intellij.openapi.keymap.KeymapUtil;
+import com.intellij.openapi.keymap.impl.keyGestures.KeyboardGestureProcessor;
+import com.intellij.openapi.keymap.impl.ui.ShortcutTextField;
+import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.DumbService;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.popup.JBPopup;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.registry.Registry;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.WindowManager;
+import com.intellij.openapi.wm.ex.StatusBarEx;
+import com.intellij.openapi.wm.impl.FloatingDecorator;
+import com.intellij.openapi.wm.impl.IdeFrameImpl;
+import com.intellij.openapi.wm.impl.IdeGlassPaneEx;
+import com.intellij.ui.popup.AbstractPopup;
+import com.intellij.util.Alarm;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.plaf.basic.*;
+import javax.swing.plaf.basic.ComboPopup;
 import java.awt.*;
-import java.awt.event.*;
-import java.awt.im.*;
-import java.lang.reflect.*;
-import java.util.*;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.im.InputContext;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.List;
 
 /**

diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
index 96e11e646bc0201be36fb5a38e00c5b5cbc2f10f..e94bf582ad5dbc1b4298ebbb99c73470a3921ea5 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
@@ -39,7 +39,10 @@ import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author Eugene Belyaev

diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/impl/BackgroundableProcessIndicator.java b/platform/platform-impl/src/com/intellij/openapi/progress/impl/BackgroundableProcessIndicator.java
index 6443fa76b7a0d7bd9f78c563a676257fe844fd7f..019ee60922fabb680fe6f693fcca51a9556c86be 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/progress/impl/BackgroundableProcessIndicator.java
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/impl/BackgroundableProcessIndicator.java
@@ -22,12 +22,18 @@
  */
 package com.intellij.openapi.progress.impl;
 
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.progress.util.*;
+import com.intellij.openapi.progress.PerformInBackgroundOption;
+import com.intellij.openapi.progress.Task;
+import com.intellij.openapi.progress.TaskInfo;
+import com.intellij.openapi.progress.util.ProgressWindow;
 import com.intellij.openapi.project.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.wm.IdeFrame;
+import com.intellij.openapi.wm.WindowManager;
+import com.intellij.openapi.wm.ex.StatusBarEx;
+import com.intellij.openapi.wm.ex.WindowManagerEx;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class BackgroundableProcessIndicator extends ProgressWindow {
   protected StatusBarEx myStatusBar;

diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshProgress.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshProgress.java
index 83868e75c1b9bd7599fcdf1a5029b8b941eacf7a..29ab48778657364a0e266802f7e83357e9a95f7b 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshProgress.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshProgress.java
@@ -19,11 +19,12 @@
  */
 package com.intellij.openapi.vfs.newvfs;
 
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.progress.util.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.progress.util.ProgressIndicatorBase;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
+import com.intellij.openapi.wm.WindowManager;
+import com.intellij.openapi.wm.ex.StatusBarEx;
 
 import javax.swing.*;
 

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/ex/StatusBarEx.java b/platform/platform-impl/src/com/intellij/openapi/wm/ex/StatusBarEx.java
index d0f7dcb278d81688de42d96e0c29329ea7601f41..2121ff821575a698f737071c2348a28cd44ea160 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/ex/StatusBarEx.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/ex/StatusBarEx.java
@@ -15,15 +15,16 @@
  */
 package com.intellij.openapi.wm.ex;
 
-import com.intellij.openapi.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.ui.*;
-import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.wm.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.progress.TaskInfo;
+import com.intellij.openapi.ui.MessageType;
+import com.intellij.openapi.ui.popup.BalloonHandler;
+import com.intellij.openapi.wm.StatusBar;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.HyperlinkListener;
 
 /**
  * @author spleaner

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
index b4d0879f55b0dfc36dadfb27683bb4bcf38663ad..b82168df8c62336a17b707e3c05880459ac2a6aa 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
@@ -15,28 +15,48 @@
  */
 package com.intellij.openapi.wm.impl;
 
-import com.intellij.ide.*;
+import com.intellij.ide.AppLifecycleListener;
+import com.intellij.ide.DataManager;
 import com.intellij.ide.impl.ProjectUtil;
-import com.intellij.ide.ui.*;
-import com.intellij.openapi.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.application.ex.*;
-import com.intellij.openapi.keymap.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.util.registry.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
-import com.intellij.openapi.wm.impl.status.*;
-import com.intellij.ui.*;
-import com.intellij.util.ui.*;
-import org.jetbrains.annotations.*;
+import com.intellij.ide.ui.UISettings;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.MnemonicHelper;
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationInfo;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
+import com.intellij.openapi.application.ex.ApplicationInfoEx;
+import com.intellij.openapi.application.ex.ApplicationManagerEx;
+import com.intellij.openapi.keymap.KeymapManager;
+import com.intellij.openapi.project.DumbAwareRunnable;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.registry.Registry;
+import com.intellij.openapi.wm.IdeFrame;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.ex.LayoutFocusTraversalPolicyExt;
+import com.intellij.openapi.wm.ex.StatusBarEx;
+import com.intellij.openapi.wm.impl.status.EncodingPanel;
+import com.intellij.openapi.wm.impl.status.InsertOverwritePanel;
+import com.intellij.openapi.wm.impl.status.PositionPanel;
+import com.intellij.openapi.wm.impl.status.ToggleReadOnlyAttributePanel;
+import com.intellij.ui.AppUIUtil;
+import com.intellij.ui.BalloonLayout;
+import com.intellij.ui.FocusTrackback;
+import com.intellij.util.ui.UIUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.File;
 
 /**
  * @author Anton Katilin

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java
index 38c6329fac67900615b472763184d364ae71bdc3..d6ff7e350323670d4bae7cedf0d6c43fbfca657f 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java
@@ -15,29 +15,40 @@
  */
 package com.intellij.openapi.wm.impl;
 
-import com.intellij.diagnostic.*;
-import com.intellij.ide.*;
-import com.intellij.ide.actions.*;
-import com.intellij.ide.plugins.*;
-import com.intellij.ide.ui.*;
-import com.intellij.ide.ui.customization.*;
-import com.intellij.notification.impl.*;
+import com.intellij.diagnostic.IdeMessagePanel;
+import com.intellij.diagnostic.MessagePool;
+import com.intellij.ide.AppLifecycleListener;
+import com.intellij.ide.DataManager;
+import com.intellij.ide.actions.CustomizeUIAction;
+import com.intellij.ide.actions.ViewToolbarAction;
+import com.intellij.ide.plugins.PluginManager;
+import com.intellij.ide.ui.UISettings;
+import com.intellij.ide.ui.UISettingsListener;
+import com.intellij.ide.ui.customization.CustomActionsSchema;
+import com.intellij.notification.impl.IdeNotificationArea;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.extensions.*;
-import com.intellij.openapi.keymap.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.impl.status.*;
-import com.intellij.openapi.wm.impl.welcomeScreen.*;
-import com.intellij.ui.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.extensions.Extensions;
+import com.intellij.openapi.keymap.KeymapManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.Ref;
+import com.intellij.openapi.wm.CustomStatusBarWidget;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.StatusBarCustomComponentFactory;
+import com.intellij.openapi.wm.impl.status.IdeStatusBarImpl;
+import com.intellij.openapi.wm.impl.status.MemoryUsagePanel;
+import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeScreen;
+import com.intellij.ui.PopupHandler;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/TestWindowManager.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/TestWindowManager.java
index a1edce391e21267a3fb5bdec3ed1e5f9183aa595..9fa6fa16096c3d0b86065c62d56cef07ee357962 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/TestWindowManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/TestWindowManager.java
@@ -15,20 +15,26 @@
  */
 package com.intellij.openapi.wm.impl;
 
-import com.intellij.openapi.*;
-import com.intellij.openapi.components.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.*;
-import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.components.ApplicationComponent;
+import com.intellij.openapi.progress.TaskInfo;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.MessageType;
+import com.intellij.openapi.ui.popup.BalloonHandler;
+import com.intellij.openapi.wm.IdeFrame;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.StatusBarWidget;
+import com.intellij.openapi.wm.WindowManagerListener;
+import com.intellij.openapi.wm.ex.ProgressIndicatorEx;
+import com.intellij.openapi.wm.ex.StatusBarEx;
+import com.intellij.openapi.wm.ex.WindowManagerEx;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.HyperlinkListener;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ComponentEvent;
 
 /**
  * @author Anton Katilin

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
index 0108add7f40ebfe64b9cc32b053d66f8356471f1..d71841977b531bcc678fcae0bb09a033fdde6e36 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
@@ -15,31 +15,49 @@
  */
 package com.intellij.openapi.wm.impl;
 
-import com.intellij.*;
-import com.intellij.ide.*;
-import com.intellij.ide.impl.*;
-import com.intellij.ide.ui.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.application.ex.*;
-import com.intellij.openapi.components.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.keymap.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
-import com.intellij.util.*;
-import com.intellij.util.ui.*;
-import com.sun.jna.examples.*;
-import org.jdom.*;
-import org.jetbrains.annotations.*;
+import com.intellij.Patches;
+import com.intellij.ide.DataManager;
+import com.intellij.ide.IdeEventQueue;
+import com.intellij.ide.impl.DataManagerImpl;
+import com.intellij.ide.ui.UISettings;
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.application.ApplicationInfo;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ex.ApplicationInfoEx;
+import com.intellij.openapi.components.ApplicationComponent;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.keymap.KeymapManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.NamedJDOMExternalizable;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.wm.IdeFrame;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.WindowManagerListener;
+import com.intellij.openapi.wm.ex.StatusBarEx;
+import com.intellij.openapi.wm.ex.WindowManagerEx;
+import com.intellij.util.Alarm;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.EventDispatcher;
+import com.intellij.util.ui.UIUtil;
+import com.sun.jna.examples.WindowUtils;
+import org.jdom.Element;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.util.*;
+import java.awt.event.ComponentEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author Anton Katilin

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java
index b6b680e0cec8716c207ac8f8f4d243f6932db52b..7de4893f367a93ae6a9fb311c1f4a3029e912757 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java
@@ -15,22 +15,28 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.ide.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.impl.*;
-import com.intellij.openapi.editor.*;
+import com.intellij.ide.DataManager;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.openapi.vfs.encoding.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.popup.JBPopupFactory;
+import com.intellij.openapi.ui.popup.ListPopup;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.encoding.ChooseFileEncodingAction;
+import com.intellij.openapi.vfs.encoding.EncodingManager;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.StatusBarWidget;
+import com.intellij.util.Consumer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
-import java.awt.event.*;
-import java.nio.charset.*;
+import java.awt.event.MouseEvent;
+import java.nio.charset.Charset;
 
 /**
  * @author cdr

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java
index 93aad7ed8bb41400ed0ddf3b081732699e4aa6ca..869771a037600ffc45ce50246f1b6bafdc70da40 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java
@@ -15,27 +15,37 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.openapi.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.ui.*;
-import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.util.text.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
-import com.intellij.ui.awt.*;
-import com.intellij.ui.popup.*;
-import com.intellij.util.*;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.progress.TaskInfo;
+import com.intellij.openapi.ui.MessageType;
+import com.intellij.openapi.ui.popup.BalloonHandler;
+import com.intellij.openapi.ui.popup.ListPopup;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.wm.CustomStatusBarWidget;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.StatusBarWidget;
+import com.intellij.openapi.wm.ex.ProgressIndicatorEx;
+import com.intellij.openapi.wm.ex.StatusBarEx;
+import com.intellij.ui.awt.RelativePoint;
+import com.intellij.ui.popup.NotificationPopup;
+import com.intellij.util.Consumer;
 import com.intellij.util.containers.HashMap;
-import com.intellij.util.ui.*;
-import org.jetbrains.annotations.*;
+import com.intellij.util.ui.UIUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.HyperlinkListener;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.*;
+import java.util.Map;
+import java.util.Random;
 
 /**
  * User: spLeaner

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
index 38de0902bb4955a5676da0c6f631dbdbb52e3594..b132a519865b8f03e8c3aa2f617c5dd7671d5314 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
@@ -15,30 +15,42 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.idea.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.application.ex.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.progress.impl.*;
-import com.intellij.openapi.ui.*;
-import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.ex.*;
-import com.intellij.ui.awt.*;
-import com.intellij.ui.components.labels.*;
-import com.intellij.ui.components.panels.*;
-import com.intellij.util.*;
-import com.intellij.util.ui.*;
-import com.intellij.util.ui.update.*;
-import org.jetbrains.annotations.*;
+import com.intellij.idea.ActionsBundle;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ex.ApplicationManagerEx;
+import com.intellij.openapi.progress.TaskInfo;
+import com.intellij.openapi.progress.impl.ProgressManagerImpl;
+import com.intellij.openapi.ui.MessageType;
+import com.intellij.openapi.ui.popup.Balloon;
+import com.intellij.openapi.ui.popup.BalloonHandler;
+import com.intellij.openapi.ui.popup.JBPopupFactory;
+import com.intellij.openapi.util.MultiValuesMap;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.wm.CustomStatusBarWidget;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.StatusBarWidget;
+import com.intellij.openapi.wm.ex.ProgressIndicatorEx;
+import com.intellij.ui.awt.RelativePoint;
+import com.intellij.ui.components.labels.LinkLabel;
+import com.intellij.ui.components.labels.LinkListener;
+import com.intellij.ui.components.panels.Wrapper;
+import com.intellij.util.Alarm;
+import com.intellij.util.ui.AbstractLayoutManager;
+import com.intellij.util.ui.AsyncProcessIcon;
+import com.intellij.util.ui.EmptyIcon;
+import com.intellij.util.ui.UIUtil;
+import com.intellij.util.ui.update.MergingUpdateQueue;
+import com.intellij.util.ui.update.Update;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.HyperlinkListener;
 import java.awt.*;
-import java.awt.event.*;
-import java.text.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.List;
 

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java
index c863892114ddc7d66a294645f6fa227c49413e3f..adf3812b3191f2a1dc3b0699cc8be9fad40a445d 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java
@@ -15,22 +15,27 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.ide.*;
-import com.intellij.ide.ui.*;
-import com.intellij.openapi.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.progress.util.*;
-import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.wm.impl.content.*;
-import com.intellij.ui.*;
-import com.intellij.ui.components.panels.*;
-import com.intellij.util.ui.*;
+import com.intellij.ide.IdeBundle;
+import com.intellij.ide.ui.LafManager;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.progress.TaskInfo;
+import com.intellij.openapi.progress.util.ProgressIndicatorBase;
+import com.intellij.openapi.ui.popup.IconButton;
+import com.intellij.openapi.util.EmptyRunnable;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.wm.impl.content.GraphicsConfig;
+import com.intellij.ui.InplaceButton;
+import com.intellij.ui.components.panels.NonOpaquePanel;
+import com.intellij.ui.components.panels.Wrapper;
+import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
-import javax.swing.border.*;
+import javax.swing.border.EmptyBorder;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 public class InlineProgressIndicator extends ProgressIndicatorBase implements Disposable {
 

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InsertOverwritePanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InsertOverwritePanel.java
index cb24d475082260e1d7e65425c88445bbd5160f6a..27a6e4e1104b38a00ecbcadf24760847698dc1fb 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InsertOverwritePanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InsertOverwritePanel.java
@@ -15,18 +15,20 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.ide.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.ui.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.ide.DataManager;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.StatusBarWidget;
+import com.intellij.ui.UIBundle;
+import com.intellij.util.Consumer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
 
 /**
  * @author cdr

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MacStatusBarUI.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MacStatusBarUI.java
index 13685ef654aeb16a784cb56de5429d4e565cebc9..3b38d6c9e0c5ca9272b285f8f55f4cc16f9af4d1 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MacStatusBarUI.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MacStatusBarUI.java
@@ -15,13 +15,16 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.util.ui.*;
-import com.intellij.util.ui.update.*;
+import com.intellij.util.ui.UIUtil;
+import com.intellij.util.ui.update.Activatable;
+import com.intellij.util.ui.update.UiNotifyConnector;
 
 import javax.swing.*;
-import javax.swing.border.*;
+import javax.swing.border.Border;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
 
 /**
  * User: spLeaner

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MemoryUsagePanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MemoryUsagePanel.java
index 95010417f1afd67beef0f1a4af487f332ce1182c..846231437692f102a6c880f01dfe884c35f28914 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MemoryUsagePanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MemoryUsagePanel.java
@@ -15,17 +15,23 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.concurrency.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.ui.*;
-import com.intellij.util.ui.*;
-import org.jetbrains.annotations.*;
+import com.intellij.concurrency.JobScheduler;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.wm.CustomStatusBarWidget;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.StatusBarWidget;
+import com.intellij.ui.UIBundle;
+import com.intellij.util.ui.UIUtil;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.util.concurrent.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 public class MemoryUsagePanel extends JButton implements CustomStatusBarWidget {
   @NonNls

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PositionPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PositionPanel.java
index 692a796c47cf97937923aa4108617a6bcde60791..9e7334d3cf24f1972bfaecbc21b090ecf2983029 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PositionPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PositionPanel.java
@@ -15,23 +15,31 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.ide.*;
-import com.intellij.ide.util.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.command.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.editor.event.*;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.fileEditor.ex.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.ui.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.ide.DataManager;
+import com.intellij.ide.util.GotoLineNumberDialog;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorFactory;
+import com.intellij.openapi.editor.LogicalPosition;
+import com.intellij.openapi.editor.SelectionModel;
+import com.intellij.openapi.editor.event.CaretEvent;
+import com.intellij.openapi.editor.event.CaretListener;
+import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.fileEditor.FileEditorManagerAdapter;
+import com.intellij.openapi.fileEditor.FileEditorManagerListener;
+import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.StatusBarWidget;
+import com.intellij.ui.UIBundle;
+import com.intellij.util.Consumer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
 
 public class PositionPanel implements StatusBarWidget, StatusBarWidget.TextPresentation, CaretListener {
   private String myText;

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ShowProcessWindowAction.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ShowProcessWindowAction.java
index 3c9f351a0a3c68116150118cf7c66ac19269ee9a..ea9150abb3abd8272817c82400dedb6d0fc19bc3 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ShowProcessWindowAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ShowProcessWindowAction.java
@@ -15,12 +15,13 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.idea.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.wm.ex.*;
-import com.intellij.openapi.wm.impl.*;
-import org.jetbrains.annotations.*;
+import com.intellij.idea.ActionsBundle;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.ToggleAction;
+import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.wm.ex.StatusBarEx;
+import com.intellij.openapi.wm.impl.IdeFrameImpl;
+import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
 

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUI.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUI.java
index 93ca3d6b78958321a47eec0d8bf7c681be8e8cdf..1f87fd6dcc6f9ee1e31c349864d991e711cc4be2 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUI.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUI.java
@@ -15,11 +15,11 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.util.ui.*;
+import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.plaf.*;
+import javax.swing.border.Border;
+import javax.swing.plaf.ComponentUI;
 import java.awt.*;
 
 /**

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/TextPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/TextPanel.java
index 74de6754f904919885bec7717613c33dfe4b78ac..535f0ef6cc817d6383ebdd977a3fc195f2852bb2 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/TextPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/TextPanel.java
@@ -15,9 +15,9 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.openapi.util.*;
-import com.intellij.util.ui.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.util.ui.UIUtil;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java
index d2c9905e15854f1c81d4b9ee5db05a6cada8b0a7..6e905a35fc5f84897882c20e1a1ed91e1eb0eab6 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java
@@ -15,24 +15,27 @@
  */
 package com.intellij.openapi.wm.impl.status;
 
-import com.intellij.ide.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.ui.*;
-import com.intellij.util.*;
-import com.intellij.util.io.*;
-import org.jetbrains.annotations.*;
+import com.intellij.ide.DataManager;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.wm.StatusBar;
+import com.intellij.openapi.wm.StatusBarWidget;
+import com.intellij.ui.UIBundle;
+import com.intellij.util.Consumer;
+import com.intellij.util.io.ReadOnlyAttributeUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.awt.event.*;
-import java.io.*;
+import java.awt.event.MouseEvent;
+import java.io.IOException;
 
 public class ToggleReadOnlyAttributePanel implements StatusBarWidget, StatusBarWidget.IconPresentation {
   private static final Icon myLockedIcon = IconLoader.getIcon("/ide/readonly.png");

diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
index f98e932bd2835bf06203dd7449f80d78fc89cde4..f478155c40caae6027e6c5df6728dddfb0edcfe9 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
@@ -144,6 +144,7 @@ public class AbstractPopup implements JBPopup {
 
   private JTextField mySpeedSearchPatternField;
   private boolean myNativePopup;
+  private boolean myMayBeParent;
 
 
   AbstractPopup() {
@@ -181,7 +182,8 @@ public class AbstractPopup implements JBPopup {
                      final boolean headerAlwaysFocusable,
                      @NotNull List<Pair<ActionListener, KeyStroke>> keyboardActions,
                      Component settingsButtons,
-                     @Nullable final Processor<JBPopup> pinCallback) {
+                     @Nullable final Processor<JBPopup> pinCallback,
+                     boolean mayBeParent) {
 
     if (requestFocus && !focusable) {
       assert false : "Incorrect argument combination: requestFocus=" + requestFocus + " focusable=" + focusable;
@@ -192,6 +194,7 @@ public class AbstractPopup implements JBPopup {
     myPopupBorder = PopupBorder.Factory.create(true);
     myShadowed = !movable  && !resizable && Registry.is("ide.popup.dropShadow");
     myContent = createContentPanel(resizable, myPopupBorder, isToDrawMacCorner());
+    myMayBeParent = mayBeParent;
 
     myContent.add(component, BorderLayout.CENTER);
     if (adText != null) {
@@ -692,6 +695,12 @@ public class AbstractPopup implements JBPopup {
       ((JWindow)myWindow).getRootPane().putClientProperty(KEY, this);
     }
 
+    if (myWindow != null) {
+      if (!myMayBeParent) {
+        WindowManager.getInstance().doNotSuggestAsParent(myWindow);  
+      }
+    }
+
     SwingUtilities.invokeLater(new Runnable() {
       public void run() {
         if (isDisposed()) return;

diff --git a/platform/platform-impl/src/com/intellij/ui/popup/ComponentPopupBuilderImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/ComponentPopupBuilderImpl.java
index a7cac6f3b1e9e73052d2bfb859e4314e04404769..9deb4a6f25e5e9dbc46800f638069e36a9f3c8d9 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ui/popup/ComponentPopupBuilderImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/ComponentPopupBuilderImpl.java
@@ -77,6 +77,7 @@ public class ComponentPopupBuilderImpl implements ComponentPopupBuilder {
   private InplaceButton myCommandButton;
   private List<Pair<ActionListener, KeyStroke>> myKeyboardActions = Collections.emptyList();
   private Component mySettingsButtons;
+  private boolean myMayBeParent;
 
   public ComponentPopupBuilderImpl(final JComponent component,
                                    final JComponent prefferedFocusedComponent) {
@@ -84,6 +85,11 @@ public class ComponentPopupBuilderImpl implements ComponentPopupBuilder {
     myPrefferedFocusedComponent = prefferedFocusedComponent;
   }
 
+  public ComponentPopupBuilder setMayBeParent(boolean mayBeParent) {
+    myMayBeParent = mayBeParent;
+    return this;
+  }
+
   @NotNull
   public ComponentPopupBuilder setTitle(String title) {
     myTitle = title;
@@ -201,7 +207,7 @@ public class ComponentPopupBuilderImpl implements ComponentPopupBuilder {
                                               myCancelButton,
                                               myCancelOnMouseOutCallback, myCancelOnWindow, myTitleIcon, myCancelKeyEnabled, myLocateByContent,
                                               myPlacewithinScreen, myMinSize, myAlpha, myMaskProvider, myInStack, myModalContext, myFocusOwners, myAd,
-                                              myHeaderAlwaysFocusable, myKeyboardActions, mySettingsButtons, myPinCallback);
+                                              myHeaderAlwaysFocusable, myKeyboardActions, mySettingsButtons, myPinCallback, myMayBeParent);
     if (myUserData != null) {
       popup.setUserData(myUserData);
     }

diff --git a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
index d303d074ea1a7d61e8a07afd1f2ea2683c689334..fbb5bdecdc3de8169b9c1cfe4084baa919c1a951 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
@@ -88,7 +88,7 @@ public abstract class WizardPopup extends AbstractPopup implements ActionListene
     final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext());
     init(project, scrollPane, getPreferredFocusableComponent(), true, true, true, true, null,
          false, aStep.getTitle(), null, true, null, false, null, null, null, false, null, true, false, true, null, 0f,
-         null, true, false, new Component[0], null, true, Collections.<Pair<ActionListener, KeyStroke>>emptyList(), null, null);
+         null, true, false, new Component[0], null, true, Collections.<Pair<ActionListener, KeyStroke>>emptyList(), null, null, false);
 
     registerAction("disposeAll", KeyEvent.VK_ESCAPE, InputEvent.SHIFT_MASK, new AbstractAction() {
       public void actionPerformed(ActionEvent e) {

diff --git a/platform/platform-impl/testSrc/com/intellij/ide/util/treeView/BaseTreeTestCase.java b/platform/platform-impl/testSrc/com/intellij/ide/util/treeView/BaseTreeTestCase.java
index 3521617483248ab2ed43c61667b155ccd231d4cf..295b70c409545a508336bfa09d09befeeb885da6 100644 (file)
--- a/platform/platform-impl/testSrc/com/intellij/ide/util/treeView/BaseTreeTestCase.java
+++ b/platform/platform-impl/testSrc/com/intellij/ide/util/treeView/BaseTreeTestCase.java
@@ -1,6 +1,5 @@
 package com.intellij.ide.util.treeView;
 
-import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Ref;

diff --git a/platform/platform-impl/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java b/platform/platform-impl/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java
index a388ca31a8da7f53b25d8339a22aec1a65a7bb57..02e58872708b2bfe2cc31eebd3828972f95b62b6 100644 (file)
--- a/platform/platform-impl/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java
+++ b/platform/platform-impl/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java
@@ -5,7 +5,6 @@ import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Progressive;
 import com.intellij.openapi.util.*;
-import com.intellij.testFramework.TestLogger;
 import com.intellij.util.Time;
 import com.intellij.util.WaitFor;
 import junit.framework.TestSuite;

diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
index 633e864898d6a259d454e2fe390c308afa82ecc3..1121d25a850be3ee8976cbd28778062f93121144 100644 (file)
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -29,6 +29,8 @@
 
     <extensionPoint name="webBrowserUrlProvider"
                     interface="com.intellij.ide.browsers.WebBrowserUrlProvider"/>
+    <extensionPoint name="remoteFileUpdater"
+                    interface="com.intellij.ide.browsers.RemoteFileUpdater"/>
 
     <extensionPoint name="standardResourceProvider" interface="com.intellij.javaee.StandardResourceProvider"/>
 
@@ -229,7 +231,7 @@
 
     <psi.includeHandler implementation="com.intellij.xml.util.XmlIncludeHandler"/>
 
-    <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.EnterBetweenXmlTagsHandler"/>
+    <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.EnterBetweenXmlTagsHandler" id="xmlEnter"/>
 
     <declarationRangeHandler key="com.intellij.psi.xml.XmlTag"
                              implementationClass="com.intellij.codeInsight.hint.TagDeclarationRangeHandler"/>

diff --git a/platform/testFramework/src/com/intellij/testFramework/FlyIdeaTestCase.java b/platform/testFramework/src/com/intellij/testFramework/FlyIdeaTestCase.java
index c6583ea0bebc9a156eed469fe85499a9892df1a0..b39f8956261d01edf5c89733ab60b466926cdb21 100644 (file)
--- a/platform/testFramework/src/com/intellij/testFramework/FlyIdeaTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/FlyIdeaTestCase.java
@@ -2,6 +2,7 @@ package com.intellij.testFramework;
 
 import com.intellij.mock.MockApplication;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.io.FileUtil;
@@ -9,6 +10,7 @@ import junit.framework.TestCase;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.concurrent.Future;
 
 public abstract class FlyIdeaTestCase extends TestCase {
 
@@ -16,7 +18,13 @@ public abstract class FlyIdeaTestCase extends TestCase {
   private File myTempDir;
 
   protected void setUp() throws Exception {
-    MockApplication app = new MockApplication();
+    final Application old = ApplicationManagerEx.getApplication();
+    MockApplication app = new MockApplication() {
+      @Override
+      public Future<?> executeOnPooledThread(Runnable action) {
+        return old != null ? old.executeOnPooledThread(action) : super.executeOnPooledThread(action);
+      }
+    };
     myRootDisposable = Disposer.newDisposable();
     ApplicationManagerEx.setApplication(app, myRootDisposable);
 

diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
index 46aee4ee5ff27ba151ee443eb2d85f67b897ab0e..ec9d28a4065e9227d73808bd99125f0742f27985 100644 (file)
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
@@ -400,7 +400,9 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
 
     return new WriteCommandAction<List<IntentionAction>>(myProjectFixture.getProject()) {
       protected void run(final Result<List<IntentionAction>> result) throws Exception {
-        configureByFilesInner(filePaths);
+        if (filePaths.length > 0) {
+          configureByFilesInner(filePaths);
+        }
         result.setResult(getAvailableIntentions());
       }
     }.execute().getResultObject();

diff --git a/platform/util/src/com/intellij/openapi/diagnostic/Log.java b/platform/util/src/com/intellij/openapi/diagnostic/Log.java
index e42bd16dec6d8ae8bbda1dcda850856e5d8ebf04..512d143f31e2450dc9d2c7f2e62c2b2a27f52eeb 100644 (file)
--- a/platform/util/src/com/intellij/openapi/diagnostic/Log.java
+++ b/platform/util/src/com/intellij/openapi/diagnostic/Log.java
@@ -16,7 +16,8 @@
 package com.intellij.openapi.diagnostic;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This is a very primitive fast logging class, primary for race-conditions debugging 

diff --git a/platform/util/src/com/intellij/util/lang/UrlClassLoader.java b/platform/util/src/com/intellij/util/lang/UrlClassLoader.java
index ce55ecf2e5a6c50628faf75411f318f4bc0f298c..3672ba530810f75a933aceeb0760624b58fe8c7c 100644 (file)
--- a/platform/util/src/com/intellij/util/lang/UrlClassLoader.java
+++ b/platform/util/src/com/intellij/util/lang/UrlClassLoader.java
@@ -16,11 +16,14 @@
 
 package com.intellij.util.lang;
 
-import org.jetbrains.annotations.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.net.*;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.Nullable;
+import sun.misc.Resource;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.*;
 
 public class UrlClassLoader extends ClassLoader {

diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java
index 7d88a6c3ed2f71f9b1868c6e9c642e131c239a81..6f09d119233b19f2beacc64fb055c823945c772c 100644 (file)
--- a/platform/util/src/com/intellij/util/ui/UIUtil.java
+++ b/platform/util/src/com/intellij/util/ui/UIUtil.java
@@ -15,30 +15,40 @@
  */
 package com.intellij.util.ui;
 
-import com.intellij.openapi.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.util.text.*;
-import com.intellij.ui.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.ui.SideBorder;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.ReflectionUtil;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
 
 import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-import javax.swing.text.html.*;
-import javax.swing.tree.*;
+import javax.swing.border.Border;
+import javax.swing.border.LineBorder;
+import javax.swing.plaf.ProgressBarUI;
+import javax.swing.plaf.basic.BasicTreeUI;
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.StyleSheet;
+import javax.swing.tree.TreePath;
 import java.awt.*;
 import java.awt.event.*;
-import java.awt.font.*;
+import java.awt.font.FontRenderContext;
 import java.awt.geom.Rectangle2D;
-import java.lang.reflect.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.*;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.*;
-import java.util.regex.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.regex.Pattern;
 
 /**
  * @author max

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/QuantitySelection.java b/platform/vcs-api/src/com/intellij/openapi/vcs/QuantitySelection.java
index 98081fb1d389bd11da31913c0147fbcef4f360ad..0abf20bc76835230554d2f6ee74e4811775cbbc6 100644 (file)
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/QuantitySelection.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/QuantitySelection.java
@@ -15,7 +15,8 @@
  */
 package com.intellij.openapi.vcs;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 public class QuantitySelection<T> implements SelectionManipulation<T>, SelectionState<T> {
   private final Group<T> mySelected;

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/SelectionResult.java b/platform/vcs-api/src/com/intellij/openapi/vcs/SelectionResult.java
index c109062e1d1051f50c00e8c3226d7d5adcee50c5..12644fde972cc478a31ab317bcc20e805cdd9ca7 100644 (file)
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/SelectionResult.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/SelectionResult.java
@@ -15,7 +15,7 @@
  */
 package com.intellij.openapi.vcs;
 
-import java.util.*;
+import java.util.Set;
 
 public interface SelectionResult<T> {
   Set<T> getMarked();

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/PseudoMap.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/PseudoMap.java
new file mode 100644 (file)
index 0000000..c967af4
--- /dev/null
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/PseudoMap.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2000-2010 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.openapi.vcs.changes;
+
+import com.intellij.util.NullableFunction;
+import com.intellij.util.PairConsumer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PseudoMap<Key, Value> implements PairConsumer<Key, Value>, NullableFunction<Key, Value> {
+  private final Map<Key, Value> myMap;
+
+  public PseudoMap() {
+    myMap = createMap();
+  }
+
+  protected Map<Key, Value> createMap() {
+    return new HashMap<Key, Value>();
+  }
+
+  public Value fun(Key key) {
+    return myMap.get(key);
+  }
+
+  public void consume(Key key, Value value) {
+    myMap.put(key, value);
+  }
+}

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinChangeListSpecificComponent.java b/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinChangeListSpecificComponent.java
index 83212e6d8cdf7dfb9ccb2a86723c0060b2bf018e..414c0685f0fe0994bedc3cf9355c7a682adb2ae2 100644 (file)
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinChangeListSpecificComponent.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinChangeListSpecificComponent.java
@@ -20,5 +20,4 @@ import com.intellij.openapi.vcs.ui.RefreshableOnComponent;
 
 public interface CheckinChangeListSpecificComponent extends RefreshableOnComponent {
   void onChangeListSelected(final LocalChangeList list);
-  Object getDataForCommit();
 }

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinEnvironment.java b/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinEnvironment.java
index 0aeb8b78de89a884c880bf40a107dd5f326a0f91..caca9db1d3981092b49c14e49bc77cc4326065db 100644 (file)
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinEnvironment.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinEnvironment.java
@@ -23,7 +23,10 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeList;
 import com.intellij.openapi.vcs.ui.RefreshableOnComponent;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.NullableFunction;
+import com.intellij.util.PairConsumer;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -36,7 +39,7 @@ import java.util.List;
  */
 public interface CheckinEnvironment extends VcsProviderMarker {
   @Nullable
-  RefreshableOnComponent createAdditionalOptionsPanel(CheckinProjectPanel panel);
+  RefreshableOnComponent createAdditionalOptionsPanel(CheckinProjectPanel panel, PairConsumer<Object, Object> additionalDataConsumer);
 
   @Nullable
   String getDefaultMessageFor(FilePath[] filesToCheckin);
@@ -51,7 +54,7 @@ public interface CheckinEnvironment extends VcsProviderMarker {
   List<VcsException> commit(List<Change> changes, String preparedComment);
 
   @Nullable
-  List<VcsException> commit(List<Change> changes, String preparedComment, final Object parameters);
+  List<VcsException> commit(List<Change> changes, String preparedComment, @NotNull NullableFunction<Object, Object> parametersHolder);
 
   @Nullable
   List<VcsException> scheduleMissingFileForDeletion(List<FilePath> files);

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinHandler.java b/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinHandler.java
index 6df09a6b2a47bf87483d3f883d3673212682d145..d7d444fea6e9e22c3d6deea325180a1f62bb2248 100644 (file)
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinHandler.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinHandler.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.CommitExecutor;
 import com.intellij.openapi.vcs.ui.RefreshableOnComponent;
+import com.intellij.util.PairConsumer;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -70,10 +71,11 @@ public abstract class CheckinHandler {
    * {@link CheckinHandlerFactory#createHandler(com.intellij.openapi.vcs.CheckinProjectPanel)} to
    * get information about the files to be checked in.
    *
-   * @param executor the commit executor, or null if the standard commit operation is executed. 
+   * @param executor the commit executor, or null if the standard commit operation is executed.
+   * @param additionalDataConsumer
    * @return the code indicating whether the check-in operation should be performed or aborted.
    */
-  public ReturnResult beforeCheckin(@Nullable CommitExecutor executor) {
+  public ReturnResult beforeCheckin(@Nullable CommitExecutor executor, PairConsumer<Object, Object> additionalDataConsumer) {
     return beforeCheckin();
   }
 

diff --git a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
index 9b5776e082b52332a04789518d7ad6adbad7ba71..22940290ee0ec20f283bcb608d4f2ef6ab16e157 100644 (file)
--- a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
+++ b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
@@ -15,28 +15,38 @@
  */
 package com.intellij.vcsUtil;
 
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.editor.*;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.fileTypes.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.util.io.*;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.fileTypes.FileTypeManager;
+import com.intellij.openapi.fileTypes.FileTypes;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.Ref;
+import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.*;
-import com.intellij.openapi.vcs.FilePath;
-import com.intellij.openapi.vcs.actions.*;
-import com.intellij.openapi.vcs.changes.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.openapi.vfs.newvfs.*;
-import com.intellij.openapi.wm.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.vcs.actions.VcsContextFactory;
+import com.intellij.openapi.vcs.changes.Change;
+import com.intellij.openapi.vcs.changes.ContentRevision;
+import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.newvfs.RefreshQueue;
+import com.intellij.openapi.wm.StatusBar;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.util.*;
 
 @SuppressWarnings({"UtilityClassWithoutPrivateConstructor"})

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesPanel.java
index 684f36be061f336059c53158569c84c135e0d778..5bc6854939f78bceeba532ea862ca05b320db4bc 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesPanel.java
@@ -22,26 +22,36 @@
  */
 package com.intellij.openapi.vcs.changes.committed;
 
-import com.intellij.openapi.*;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.*;
-import com.intellij.openapi.util.text.*;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.Task;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.*;
-import com.intellij.openapi.vcs.changes.*;
-import com.intellij.openapi.vcs.versionBrowser.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.ui.*;
-import com.intellij.util.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.vcs.changes.BackgroundFromStartOption;
+import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings;
+import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.ui.FilterComponent;
+import com.intellij.util.AsynchConsumer;
+import com.intellij.util.BufferedListConsumer;
+import com.intellij.util.Consumer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import java.awt.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
 public class CommittedChangesPanel extends JPanel implements TypeSafeDataProvider, Disposable {

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java
index 400df91ebadc6f3027856120dfbcd4ee133db8a3..c6d728b745b77ecd4a08729f32782ca468fdcb7e 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java
@@ -15,25 +15,29 @@
  */
 package com.intellij.openapi.vcs.changes.committed;
 
-import com.intellij.ide.*;
-import com.intellij.openapi.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.components.*;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.*;
-import com.intellij.openapi.vcs.*;
-import com.intellij.openapi.vcs.changes.ui.*;
-import com.intellij.openapi.vcs.versionBrowser.*;
+import com.intellij.ide.DataManager;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.components.ProjectComponent;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.vcs.VcsBundle;
+import com.intellij.openapi.vcs.changes.ui.ChangesViewContentManager;
+import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.openapi.wm.*;
-import com.intellij.util.*;
-import com.intellij.util.messages.*;
-import org.jetbrains.annotations.*;
+import com.intellij.util.Consumer;
+import com.intellij.util.messages.MessageBus;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
 import java.util.List;
 
 /**

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
index e0d1e379da2d0f0a2d225cbb4835bc71ff98e2bb..67c54a808d26052d1499286b9da34a3cf04eab31 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
@@ -90,6 +90,8 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
   private String myLastSelectedListName;
   private CommitLegendPanel.ChangeInfoCalculator myChangesInfoCalculator;
 
+  private final PseudoMap<Object, Object> myAdditionalData;
+
   private static class MyUpdateButtonsRunnable implements Runnable {
     private CommitChangeListDialog myDialog;
 
@@ -191,6 +193,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     myShowVcsCommit = showVcsCommit;
     myVcs = singleVcs;
     myListComments = new HashMap<String, String>();
+    myAdditionalData = new PseudoMap<Object, Object>();
 
     if (!myShowVcsCommit && ((myExecutors == null) || myExecutors.size() == 0)) {
       throw new IllegalArgumentException("nothing found to execute commit with");
@@ -270,7 +273,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     for (AbstractVcs vcs : vcses) {
       final CheckinEnvironment checkinEnvironment = vcs.getCheckinEnvironment();
       if (checkinEnvironment != null) {
-        final RefreshableOnComponent options = checkinEnvironment.createAdditionalOptionsPanel(this);
+        final RefreshableOnComponent options = checkinEnvironment.createAdditionalOptionsPanel(this, myAdditionalData);
         if (options != null) {
           JPanel vcsOptions = new JPanel(new BorderLayout());
           vcsOptions.add(options.getComponent(), BorderLayout.CENTER);
@@ -598,7 +601,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
         FileDocumentManager.getInstance().saveAllDocuments();
 
         for (CheckinHandler handler : myHandlers) {
-          final CheckinHandler.ReturnResult result = handler.beforeCheckin(executor);
+          final CheckinHandler.ReturnResult result = handler.beforeCheckin(executor, myAdditionalData);
           if (result == CheckinHandler.ReturnResult.COMMIT) continue;
           if (result == CheckinHandler.ReturnResult.CANCEL) {
             restartUpdate();
@@ -718,17 +721,6 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     super.doCancelAction();
   }
 
-  private Map<String, Object> getAdditionalDataForSubmit() {
-    final Map<String, Object> result = new HashMap<String, Object>();
-    for (Map.Entry<String, CheckinChangeListSpecificComponent> entry : myCheckinChangeListSpecificComponents.entrySet()) {
-      final Object data = entry.getValue().getDataForCommit();
-      if (data != null) {
-        result.put(entry.getKey(), data);
-      }
-    }
-    return result;
-  }
-
   private void doCommit() {
     final CommitHelper helper = new CommitHelper(
       myProject,
@@ -737,7 +729,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
       myActionName,
       getCommitMessage(),
       myHandlers,
-      myAllOfDefaultChangeListChangesIncluded, false, getAdditionalDataForSubmit());
+      myAllOfDefaultChangeListChangesIncluded, false, myAdditionalData);
 
     if (myIsAlien) {
       helper.doAlienCommit(myVcs);

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
index eb57d74cf55ce908a10711c5f654342d39ac970d..c9359fb459996fe969103a6371eeff6b76c47269 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
@@ -37,6 +37,7 @@ import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
 import com.intellij.openapi.vcs.checkin.CheckinHandler;
 import com.intellij.openapi.vcs.update.RefreshVFsSynchronously;
 import com.intellij.util.Consumer;
+import com.intellij.util.NullableFunction;
 import com.intellij.util.ui.ConfirmationDialog;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -44,7 +45,6 @@ import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
 public class CommitHelper {
   private final static Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.ui.CommitHelper");
@@ -59,7 +59,7 @@ public class CommitHelper {
   private final List<CheckinHandler> myHandlers;
   private final boolean myAllOfDefaultChangeListChangesIncluded;
   private final boolean myForceSyncCommit;
-  private final Map<String, Object> myAdditionalData;
+  private final NullableFunction<Object, Object> myAdditionalData;
   private final List<Document> myCommittingDocuments = new ArrayList<Document>();
   private final VcsConfiguration myConfiguration;
   private final VcsDirtyScopeManager myDirtyScopeManager;
@@ -71,7 +71,7 @@ public class CommitHelper {
                       final String commitMessage,
                       final List<CheckinHandler> handlers,
                       final boolean allOfDefaultChangeListChangesIncluded,
-                      final boolean synchronously, final Map<String, Object> additionalData) {
+                      final boolean synchronously, final NullableFunction<Object, Object> additionalDataHolder) {
     myProject = project;
     myChangeList = changeList;
     myIncludedChanges = includedChanges;
@@ -80,7 +80,7 @@ public class CommitHelper {
     myHandlers = handlers;
     myAllOfDefaultChangeListChangesIncluded = allOfDefaultChangeListChangesIncluded;
     myForceSyncCommit = synchronously;
-    myAdditionalData = additionalData;
+    myAdditionalData = additionalDataHolder;
     myConfiguration = VcsConfiguration.getInstance(myProject);
     myDirtyScopeManager = VcsDirtyScopeManager.getInstance(myProject);
   }
@@ -208,9 +208,7 @@ public class CommitHelper {
           Collection<FilePath> paths = ChangesUtil.getPaths(items);
           myPathsToRefresh.addAll(paths);
 
-          final Object addData = (myAdditionalData == null) ? null : myAdditionalData.get(vcs.getName());
-
-          final List<VcsException> exceptions = environment.commit(items, myCommitMessage, addData);
+          final List<VcsException> exceptions = environment.commit(items, myCommitMessage, myAdditionalData);
           if (exceptions != null && exceptions.size() > 0) {
             myVcsExceptions.addAll(exceptions);
             myChangesFailedToCommit.addAll(items);
@@ -314,8 +312,7 @@ public class CommitHelper {
         if (environment.keepChangeListAfterCommit(myChangeList)) {
           myKeepChangeListAfterCommit = true;
         }
-        final Object addData = (myAdditionalData == null) ? null : myAdditionalData.get(vcs.getName());
-        final List<VcsException> exceptions = environment.commit(items, myCommitMessage, addData);
+        final List<VcsException> exceptions = environment.commit(items, myCommitMessage, myAdditionalData);
         if (exceptions != null && exceptions.size() > 0) {
           myVcsExceptions.addAll(exceptions);
           myChangesFailedToCommit.addAll(items);

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
index 15b58452d9ef28e1c047789ecbdc540b3000ffa2..c13e85eeaed83be16ad90e6cc9e184c4a7327e2b 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
@@ -15,39 +15,71 @@
  */
 package com.intellij.openapi.vcs.impl;
 
-import com.intellij.ide.actions.*;
-import com.intellij.ide.errorTreeView.*;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.*;
-import com.intellij.openapi.command.*;
-import com.intellij.openapi.diagnostic.*;
+import com.intellij.ide.actions.CloseTabToolbarAction;
+import com.intellij.ide.errorTreeView.ErrorTreeElementKind;
+import com.intellij.ide.errorTreeView.HotfixData;
+import com.intellij.ide.errorTreeView.SimpleErrorData;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.diff.*;
-import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.fileTypes.*;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.project.*;
-import com.intellij.openapi.ui.*;
-import com.intellij.openapi.util.*;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.fileTypes.FileTypeManager;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.Task;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.ui.MessageType;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.Getter;
 import com.intellij.openapi.vcs.*;
-import com.intellij.openapi.vcs.FilePath;
-import com.intellij.openapi.vcs.annotate.*;
-import com.intellij.openapi.vcs.changes.*;
+import com.intellij.openapi.vcs.annotate.Annotater;
+import com.intellij.openapi.vcs.annotate.AnnotationProvider;
+import com.intellij.openapi.vcs.annotate.FileAnnotation;
+import com.intellij.openapi.vcs.changes.BackgroundFromStartOption;
+import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.committed.*;
 import com.intellij.openapi.vcs.changes.ui.*;
-import com.intellij.openapi.vcs.ex.*;
+import com.intellij.openapi.vcs.ex.ProjectLevelVcsManagerEx;
 import com.intellij.openapi.vcs.history.*;
-import com.intellij.openapi.vcs.merge.*;
-import com.intellij.openapi.vcs.versionBrowser.*;
-import com.intellij.openapi.vfs.*;
-import com.intellij.openapi.wm.*;
-import com.intellij.ui.content.*;
-import com.intellij.util.*;
-import com.intellij.util.ui.*;
-import org.jetbrains.annotations.*;
+import com.intellij.openapi.vcs.merge.MergeProvider;
+import com.intellij.openapi.vcs.merge.MultipleFileMergeDialog;
+import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings;
+import com.intellij.openapi.vcs.versionBrowser.ChangesBrowserSettingsEditor;
+import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.wm.ToolWindow;
+import com.intellij.openapi.wm.ToolWindowId;
+import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.openapi.wm.WindowManager;
+import com.intellij.ui.content.Content;
+import com.intellij.ui.content.ContentFactory;
+import com.intellij.ui.content.ContentManager;
+import com.intellij.ui.content.MessageView;
+import com.intellij.util.AsynchConsumer;
+import com.intellij.util.BufferedListConsumer;
+import com.intellij.util.Consumer;
+import com.intellij.util.ContentsUtil;
+import com.intellij.util.ui.ConfirmationDialog;
+import com.intellij.util.ui.ErrorTreeView;
+import com.intellij.util.ui.MessageCategory;